diff options
| author | Yong He <yonghe@outlook.com> | 2024-09-27 19:27:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-27 19:27:20 -0700 |
| commit | c55805e9c6dc3a44e3983fea4245cb00d4e318d5 (patch) | |
| tree | b0904f55df01e3ca524cfb375350c6a23deafa37 | |
| parent | 5a84e520a808e28e0cc60f86981e4d8db81f8ad3 (diff) | |
Fix bug in `translateGlslGlobalVar()`. (#5181)
| -rw-r--r-- | source/slang/slang-ir-translate-glsl-global-var.cpp | 7 | ||||
| -rw-r--r-- | tests/bugs/gh-5027.slang | 16 |
2 files changed, 21 insertions, 2 deletions
diff --git a/source/slang/slang-ir-translate-glsl-global-var.cpp b/source/slang/slang-ir-translate-glsl-global-var.cpp index 8cb7fa8e9..4b2196e37 100644 --- 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 new file mode 100644 index 000000000..ade58564b --- /dev/null +++ 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; +}
\ No newline at end of file |