From 32b1e25e359f8daf5254301dca8be308e8e1e2ab Mon Sep 17 00:00:00 2001
From: Jay Kwak <82421531+jkwak-work@users.noreply.github.com>
Date: Wed, 17 Jul 2024 17:00:05 -0700
Subject: Use slang-glslang.dll for spirv-validation (#4642)

* Use slang-glslang.dll for spirv-validation

This change replaces the use of "spirv-val.exe" with an API call to
"spvtools::SpirvTools::Validate()".

Closes #4610
---
 source/slang/slang-emit.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'source/slang/slang-emit.cpp')

diff --git a/source/slang/slang-emit.cpp b/source/slang/slang-emit.cpp
index cb8460173..679d8ce88 100644
--- a/source/slang/slang-emit.cpp
+++ b/source/slang/slang-emit.cpp
@@ -1704,6 +1704,22 @@ SlangResult emitSPIRVForEntryPointsDirectly(
         PassThroughMode::SpirvOpt, codeGenContext->getSink());
     if (compiler)
     {
+        if (!codeGenContext->shouldSkipSPIRVValidation())
+        {
+            StringBuilder runSpirvValEnvVar;
+            PlatformUtil::getEnvironmentVariable(UnownedStringSlice("SLANG_RUN_SPIRV_VALIDATION"), runSpirvValEnvVar);
+            if (runSpirvValEnvVar.getUnownedSlice() == "1")
+            {
+                if (SLANG_FAILED(compiler->validate((uint32_t*)spirv.getBuffer(), int(spirv.getCount()/4))))
+                {
+                    codeGenContext->getSink()->diagnoseWithoutSourceView(
+                        SourceLoc{},
+                        Diagnostics::spirvValidationFailed
+                    );
+                }
+            }
+        }
+
         ComPtr<IArtifact> optimizedArtifact;
         DownstreamCompileOptions downstreamOptions;
         downstreamOptions.sourceArtifacts = makeSlice(artifact.readRef(), 1);
-- 
cgit v1.2.3