Fix bug in WGSL emitter layout code.

There was a "kinds" vs. "kind flags" mismatch, and also getBindingOffsetForKinds was not being used. This helps to address issue shader-slang#4943.
aleino-nv · Nov 13, 2024 · 2333306 · 2333306
1 parent 0f20fd5
commit 2333306
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/source/slang/slang-emit-wgsl.cpp b/source/slang/slang-emit-wgsl.cpp
@@ -135,13 +135,17 @@ void WGSLSourceEmitter::emitParameterGroupImpl(
         case LayoutResourceKind::SamplerState:
         case LayoutResourceKind::DescriptorTableSlot:
             {
+                auto kinds = LayoutResourceKindFlag::make(LayoutResourceKind::DescriptorTableSlot);
                 m_writer->emit("@binding(");
-                m_writer->emit(attr->getOffset());
+                auto index = getBindingOffsetForKinds(
+                    &containerChain,
+                    kinds);
+                m_writer->emit(index);
                 m_writer->emit(") ");
                 m_writer->emit("@group(");
                 auto space = getBindingSpaceForKinds(
                     &containerChain,
-                    LayoutResourceKind::DescriptorTableSlot);
+                    kinds);
                 m_writer->emit(space);
                 m_writer->emit(") ");
             }

diff --git a/tests/compute/compile-time-loop.slang b/tests/compute/compile-time-loop.slang
@@ -1,6 +1,5 @@
 //TEST(compute):COMPARE_RENDER_COMPUTE: -shaderobj
 //TEST(compute):COMPARE_RENDER_COMPUTE: -mtl -shaderobj
-//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu
 
 //TEST_INPUT: Texture2D(size=4, content = one):name t
 //TEST_INPUT: Sampler:name s