From 3368fa9da0db1ff10b7c8151c86e633063616aaf Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 13 Feb 2022 01:28:29 -0700 Subject: [PATCH] gpu-dawn: use source scanning for spirv_tools target Signed-off-by: Stephen Gutekanst --- gpu-dawn/build.zig | 16 ++++++++++----- gpu-dawn/src/dawn/sources/spirv_tools.cpp | 24 ----------------------- 2 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 gpu-dawn/src/dawn/sources/spirv_tools.cpp diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig index 0f268fa8..27675c4c 100644 --- a/gpu-dawn/build.zig +++ b/gpu-dawn/build.zig @@ -984,11 +984,17 @@ fn buildLibSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep, options: Opti // spvtools var sources = std.ArrayList([]const u8).init(b.allocator); - sources.appendSlice(&.{ - thisDir() ++ "/src/dawn/sources/spirv_tools.cpp", - thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/operand.cpp", - thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/spirv_reducer_options.cpp", - }) catch unreachable; + inline for (&[_][]const u8{ + "third_party/vulkan-deps/spirv-tools/src/source/", + "third_party/vulkan-deps/spirv-tools/src/source/util/", + }) |dir| scanSources( + b, + &sources, + "libs/dawn/" ++ dir, + &.{ ".cpp", ".c", ".cc" }, + &.{}, + &.{ "test", "benchmark" }, + ) catch unreachable; // spvtools_val sources.append(thisDir() ++ "/src/dawn/sources/spirv_tools_val.cpp") catch unreachable; diff --git a/gpu-dawn/src/dawn/sources/spirv_tools.cpp b/gpu-dawn/src/dawn/sources/spirv_tools.cpp deleted file mode 100644 index 7118cab7..00000000 --- a/gpu-dawn/src/dawn/sources/spirv_tools.cpp +++ /dev/null @@ -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"