From 37ab51bec1b4e52447f8b6c934aadd06ee4da70e Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 13 Feb 2022 01:10:31 -0700 Subject: [PATCH] gpu-dawn: use source scanning for tint_spv_reader target Signed-off-by: Stephen Gutekanst --- gpu-dawn/build.zig | 9 ++++++++- gpu-dawn/src/dawn/sources/tint_spv_reader_src.cc | 9 --------- 2 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 gpu-dawn/src/dawn/sources/tint_spv_reader_src.cc diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig index a5e98f7d..bf0cba81 100644 --- a/gpu-dawn/build.zig +++ b/gpu-dawn/build.zig @@ -869,7 +869,14 @@ fn buildLibTint(b: *Builder, step: *std.build.LibExeObjStep, options: Options) * }) catch unreachable; // libtint_spv_reader_src - sources.append(thisDir() ++ "/src/dawn/sources/tint_spv_reader_src.cc") catch unreachable; + scanSources( + b, + &sources, + "libs/dawn/third_party/tint/src/reader/spirv/", + &.{ ".cpp", ".c", ".cc" }, + &.{}, + &.{"test", "benchmark"}, + ) catch unreachable; // libtint_spv_writer_src scanSources( diff --git a/gpu-dawn/src/dawn/sources/tint_spv_reader_src.cc b/gpu-dawn/src/dawn/sources/tint_spv_reader_src.cc deleted file mode 100644 index 2fab7246..00000000 --- a/gpu-dawn/src/dawn/sources/tint_spv_reader_src.cc +++ /dev/null @@ -1,9 +0,0 @@ -#include "third_party/tint/src/reader/spirv/construct.cc" -#include "third_party/tint/src/reader/spirv/entry_point_info.cc" -#include "third_party/tint/src/reader/spirv/enum_converter.cc" -#include "third_party/tint/src/reader/spirv/function.cc" -#include "third_party/tint/src/reader/spirv/namer.cc" -#include "third_party/tint/src/reader/spirv/parser.cc" -#include "third_party/tint/src/reader/spirv/parser_impl.cc" -#include "third_party/tint/src/reader/spirv/parser_type.cc" -#include "third_party/tint/src/reader/spirv/usage.cc"