commit 9028311fbb09c06779a614c733f28af07843edec
author André Cruz <andre@cabine.org> Sun Sep 10 14:44:48 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Sun Sep 10 14:44:48 2023 +0000
tree 98d884b896af4bb1597f89129c0b796527d4c281
parent 7541f3b9eaf1b35aba01f476b0e6925b508e3554

Include SPIR-V validation only when needed

Ensure that SPIR-V validation related headers are only included if the
respective flag was set.

Change-Id: I441bb88280527b6250d47521359b7ac64957216e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/150601
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Auto-Submit: André Cruz <andre@cabine.org>
Reviewed-by: André Cruz <andre@cabine.org>

src/dawn/native/vulkan/ShaderModuleVk.cpp

diff --git a/src/dawn/native/vulkan/ShaderModuleVk.cpp b/src/dawn/native/vulkan/ShaderModuleVk.cpp
index 7251ba7..641303e 100644
--- a/src/dawn/native/vulkan/ShaderModuleVk.cpp
+++ b/src/dawn/native/vulkan/ShaderModuleVk.cpp
@@ -14,15 +14,12 @@
 
 #include "dawn/native/vulkan/ShaderModuleVk.h"
 
-#include <spirv-tools/libspirv.hpp>
-
 #include <map>
 #include <string>
 #include <vector>
 
 #include "dawn/native/CacheRequest.h"
 #include "dawn/native/Serializable.h"
-#include "dawn/native/SpirvValidation.h"
 #include "dawn/native/TintUtils.h"
 #include "dawn/native/vulkan/BindGroupLayoutVk.h"
 #include "dawn/native/vulkan/DeviceVk.h"
@@ -35,6 +32,10 @@
 #include "dawn/platform/tracing/TraceEvent.h"
 #include "tint/tint.h"
 
+#ifdef DAWN_ENABLE_SPIRV_VALIDATION
+#include "dawn/native/SpirvValidation.h"
+#endif
+
 namespace dawn::native::vulkan {
 
 #define COMPILED_SPIRV_MEMBERS(X)   \