From 9b57f7331916bbb4664ed6f92df9e58c271cd8d1 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 13 Feb 2022 01:30:21 -0700 Subject: [PATCH] gpu-dawn: use source scanning for spvtools_val target Signed-off-by: Stephen Gutekanst --- gpu-dawn/build.zig | 9 ++++- gpu-dawn/src/dawn/sources/spirv_tools_val.cpp | 40 ------------------- 2 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 gpu-dawn/src/dawn/sources/spirv_tools_val.cpp diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig index 27675c4c..abecfa5b 100644 --- a/gpu-dawn/build.zig +++ b/gpu-dawn/build.zig @@ -997,7 +997,14 @@ fn buildLibSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep, options: Opti ) catch unreachable; // spvtools_val - sources.append(thisDir() ++ "/src/dawn/sources/spirv_tools_val.cpp") catch unreachable; + scanSources( + b, + &sources, + "libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/val/", + &.{ ".cpp", ".c", ".cc" }, + &.{}, + &.{ "test", "benchmark" }, + ) catch unreachable; // spvtools_opt sources.appendSlice(&.{ diff --git a/gpu-dawn/src/dawn/sources/spirv_tools_val.cpp b/gpu-dawn/src/dawn/sources/spirv_tools_val.cpp deleted file mode 100644 index a36eb573..00000000 --- a/gpu-dawn/src/dawn/sources/spirv_tools_val.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include "third_party/vulkan-deps/spirv-tools/src/source/val/basic_block.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/construct.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/function.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/instruction.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_adjacency.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_annotation.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_arithmetics.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_atomics.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_barriers.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_bitwise.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_builtins.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_capability.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_cfg.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_composites.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_constants.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_conversion.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_debug.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_decorations.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_derivatives.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_execution_limitations.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_extensions.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_function.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_id.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_image.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_instruction.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_interfaces.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_layout.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_literals.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_logicals.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_memory.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_memory_semantics.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_misc.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_mode_setting.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_non_uniform.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_primitives.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_scopes.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_small_type_uses.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_type.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/val/validation_state.cpp"