zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpu-dawn: use source scanning for spirv_tools target

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-02-13 01:28:29 -07:00 • committed by Stephen Gutekanst
parent a0b513f0da
commit 3368fa9da0
2 changed files with 11 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gpu-dawn/build.zig
View file

@ -984,11 +984,17 @@ fn buildLibSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep, options: Opti
// spvtools // spvtools
var sources = std.ArrayList([]const u8).init(b.allocator); var sources = std.ArrayList([]const u8).init(b.allocator);
sources.appendSlice(&.{ inline for (&[_][]const u8{
thisDir() ++ "/src/dawn/sources/spirv_tools.cpp", "third_party/vulkan-deps/spirv-tools/src/source/",
thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/operand.cpp", "third_party/vulkan-deps/spirv-tools/src/source/util/",
thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/spirv_reducer_options.cpp", }) |dir| scanSources(
}) catch unreachable; b,
&sources,
"libs/dawn/" ++ dir,
&.{ ".cpp", ".c", ".cc" },
&.{},
&.{ "test", "benchmark" },
) catch unreachable;
// spvtools_val // spvtools_val
sources.append(thisDir() ++ "/src/dawn/sources/spirv_tools_val.cpp") catch unreachable; sources.append(thisDir() ++ "/src/dawn/sources/spirv_tools_val.cpp") catch unreachable;

24
gpu-dawn/src/dawn/sources/spirv_tools.cpp
View file

@ -1,24 +0,0 @@
#include "third_party/vulkan-deps/spirv-tools/src/source/assembly_grammar.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/binary.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/diagnostic.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/disassemble.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/enum_string_mapping.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/ext_inst.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/extensions.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/libspirv.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/name_mapper.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/opcode.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/parsed_operand.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/print.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/spirv_endian.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/spirv_fuzzer_options.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/spirv_optimizer_options.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/spirv_target_env.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/spirv_validator_options.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/table.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/text.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/text_handler.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/util/bit_vector.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/util/parse_number.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/util/string_utils.cpp"
#include "third_party/vulkan-deps/spirv-tools/src/source/util/timer.cpp"