Fix bug in translateGlslGlobalVar(). (#5181)

shader-slang · Sep 28, 2024 · c55805e · c55805e
1 parent 5a84e52
commit c55805e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/source/slang/slang-ir-translate-glsl-global-var.cpp b/source/slang/slang-ir-translate-glsl-global-var.cpp
@@ -17,6 +17,8 @@ namespace Slang
             buildEntryPointReferenceGraph(referencingEntryPoints, module);
 
             List<IRInst*> entryPoints;
+            List<IRInst*> getWorkGroupSizeInsts;
+
             // Traverse the module to find all entry points.
             // If we see a `GetWorkGroupSize` instruction, we will materialize it.
             // 
@@ -25,9 +27,10 @@ namespace Slang
                 if (inst->getOp() == kIROp_Func && inst->findDecoration<IREntryPointDecoration>())
                     entryPoints.add(inst);
                 else if (inst->getOp() == kIROp_GetWorkGroupSize)
-                    materializeGetWorkGroupSize(module, referencingEntryPoints, inst);
+                    getWorkGroupSizeInsts.add(inst);
             }
-
+            for (auto inst : getWorkGroupSizeInsts)
+                materializeGetWorkGroupSize(module, referencingEntryPoints, inst);
             IRBuilder builder(module);
 
             for (auto entryPoint : entryPoints)

diff --git a/tests/bugs/gh-5027.slang b/tests/bugs/gh-5027.slang
@@ -0,0 +1,16 @@
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -output-using-type
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-d3d11 -output-using-type
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer
+RWStructuredBuffer<uint> outputBuffer;
+
+in uint3 gid : SV_GroupID;
+
+[numthreads(1,1,1)]
+void computeMain()
+{
+    uint expr = WorkgroupSize().x + gid.x;
+    // CHECK: type: uint32_t
+    // CHECK: 2
+    outputBuffer[0] = expr + 1;
+}