From e15c91a8b744d585fc0c0dad4146addc1dacd259 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Sun, 13 Feb 2022 01:45:57 -0700
Subject: [PATCH] gpu-dawn: use source scanning for dawn_native_gen target

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 gpu-dawn/build.zig                                  | 11 +++++++++--
 gpu-dawn/src/dawn/sources/dawn_native_utils_gen.cpp |  6 ------
 2 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 gpu-dawn/src/dawn/sources/dawn_native_utils_gen.cpp

diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig
index 9d6654c3..b2dade2f 100644
--- a/gpu-dawn/build.zig
+++ b/gpu-dawn/build.zig
@@ -531,8 +531,15 @@ fn buildLibDawnNative(b: *Builder, step: *std.build.LibExeObjStep, options: Opti
         &.{ "test", "benchmark", "mock", "SpirvValidation.cpp", "XlibXcbFunctions.cpp" },
     ) catch unreachable;
 
-    // dawn_native_utils_gen
-    sources.append(thisDir() ++ "/src/dawn/sources/dawn_native_utils_gen.cpp") catch unreachable;
+    // dawn_native_gen
+    scanSources(
+        b,
+        &sources,
+        "libs/dawn/out/Debug/gen/src/dawn_native/",
+        &.{ ".cpp", ".c", ".cc" },
+        &.{},
+        &.{ "test", "benchmark", "mock" },
+    ) catch unreachable;
 
     // TODO(build-system): could allow enable_vulkan_validation_layers here. See src/dawn_native/BUILD.gn
     // TODO(build-system): allow use_angle here. See src/dawn_native/BUILD.gn
diff --git a/gpu-dawn/src/dawn/sources/dawn_native_utils_gen.cpp b/gpu-dawn/src/dawn/sources/dawn_native_utils_gen.cpp
deleted file mode 100644
index 88312b2b..00000000
--- a/gpu-dawn/src/dawn/sources/dawn_native_utils_gen.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "out/Debug/gen/src/dawn_native/ChainUtils_autogen.cpp"
-#include "out/Debug/gen/src/dawn_native/ProcTable.cpp"
-#include "out/Debug/gen/src/dawn_native/wgpu_structs_autogen.cpp"
-#include "out/Debug/gen/src/dawn_native/ValidationUtils_autogen.cpp"
-#include "out/Debug/gen/src/dawn_native/webgpu_absl_format_autogen.cpp"
-#include "out/Debug/gen/src/dawn_native/ObjectType_autogen.cpp"