Move global variable initialization into entry points for WGSL (#6106)

* Add test that reproduces the issue in #5986 * Call moveGlobalVarInitializationToEntryPoints for WGSL as well This closes #5986. --------- Co-authored-by: Yong He <[email protected]>
shader-slang · Jan 17, 2025 · dfb369e · dfb369e
1 parent 1b7c242
commit dfb369e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/source/slang/slang-emit.cpp b/source/slang/slang-emit.cpp
@@ -1471,6 +1471,7 @@ Result linkAndOptimizeIR(
     default:
         break;
     case CodeGenTarget::GLSL:
+    case CodeGenTarget::WGSL:
         moveGlobalVarInitializationToEntryPoints(irModule);
         break;
     // For SPIR-V to SROA across 2 entry-points a value must not be a global

diff --git a/tests/wgsl/global-call.slang b/tests/wgsl/global-call.slang
@@ -0,0 +1,20 @@
+//TEST(compute):COMPARE_COMPUTE:-shaderobj
+
+//TEST_INPUT:ubuffer(data=[3 7 8 10], stride=4):name=inputBuffer
+RWStructuredBuffer<uint> inputBuffer;
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer
+RWStructuredBuffer<uint> outputBuffer;
+
+uint f(uint a)
+{
+    return a*inputBuffer[0];
+}
+
+static uint b = f(2);
+
+[numthreads(1,1,1)]
+void computeMain()
+{
+    outputBuffer[0] = b;
+}
diff --git a/tests/wgsl/global-call.slang.expected.txt b/tests/wgsl/global-call.slang.expected.txt
@@ -0,0 +1,4 @@
+6
+0
+0
+0