Fix WGSL parameter block binding.

source/slang/slang-emit-wgsl.cpp

@@ -87,9 +87,23 @@ void WGSLSourceEmitter::emitParameterGroupImpl(
     auto varLayout = getVarLayout(varDecl);
     SLANG_RELEASE_ASSERT(varLayout);
 
-    for (auto attr : varLayout->getOffsetAttrs())
+    EmitVarChain blockChain(varLayout);
+
+    EmitVarChain containerChain = blockChain;
+    EmitVarChain elementChain = blockChain;
+
+    auto typeLayout = varLayout->getTypeLayout()->unwrapArray();
+    if (auto parameterGroupTypeLayout = as<IRParameterGroupTypeLayout>(typeLayout))
     {
+        containerChain =
+            EmitVarChain(parameterGroupTypeLayout->getContainerVarLayout(), &blockChain);
+        elementChain = EmitVarChain(parameterGroupTypeLayout->getElementVarLayout(), &blockChain);
+
+        typeLayout = parameterGroupTypeLayout->getElementVarLayout()->getTypeLayout();
+    }
 
+    for (auto attr : containerChain.varLayout->getOffsetAttrs())
+    {
         const LayoutResourceKind kind = attr->getResourceKind();
         switch (kind)
         {
@@ -120,12 +134,17 @@ void WGSLSourceEmitter::emitParameterGroupImpl(
         case LayoutResourceKind::UnorderedAccess:
         case LayoutResourceKind::SamplerState:
         case LayoutResourceKind::DescriptorTableSlot:
-            m_writer->emit("@binding(");
-            m_writer->emit(attr->getOffset());
-            m_writer->emit(") ");
-            m_writer->emit("@group(");
-            m_writer->emit(attr->getSpace());
-            m_writer->emit(") ");
+            {
+                m_writer->emit("@binding(");
+                m_writer->emit(attr->getOffset());
+                m_writer->emit(") ");
+                m_writer->emit("@group(");
+                auto space = getBindingSpaceForKinds(
+                    &containerChain,
+                    LayoutResourceKind::DescriptorTableSlot);
+                m_writer->emit(space);
+                m_writer->emit(") ");
+            }
             break;
         }
     }
@@ -607,8 +626,12 @@ void WGSLSourceEmitter::emitLayoutQualifiersImpl(IRVarLayout* layout)
             m_writer->emit("@binding(");
             m_writer->emit(attr->getOffset());
             m_writer->emit(") ");
+
+            EmitVarChain chain = {};
+            chain.varLayout = layout;
+            auto space = getBindingSpaceForKinds(&chain, kind);
             m_writer->emit("@group(");
-            m_writer->emit(attr->getSpace());
+            m_writer->emit(space);
             m_writer->emit(") ");
 
             return;

source/slang/slang-type-layout.cpp

@@ -2546,7 +2546,7 @@ static bool shouldAllocateRegisterSpaceForParameterBlock(TypeLayoutContext const
     // If we know that we are targetting Vulkan, then
     // the only way to effectively use parameter blocks
     // is by using descriptor sets.
-    if (isVulkanTarget(targetReq))
+    if (isVulkanTarget(targetReq) || isWGPUTarget(targetReq))
         return true;
 
     // If none of the above passed, then it seems like we

tests/autodiff/global-param-hoisting.slang

@@ -8,7 +8,6 @@
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type
 //TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type -shaderobj
 //TEST(compute):COMPARE_COMPUTE:-slang -compute -mtl -output-using-type -render-features argument-buffer-tier-2
-//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer
 RWStructuredBuffer<float> outputBuffer;

tests/bindings/nested-parameter-block-2.slang

@@ -2,7 +2,6 @@
 //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -d3d12 -use-dxil -shaderobj -output-using-type
 //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -vk -shaderobj -output-using-type
 //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -metal -shaderobj -output-using-type -render-features argument-buffer-tier-2
-//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu
 // nested-parameter-block-2.slang
 
 struct CB

tests/bugs/static-var.slang

@@ -1,6 +1,5 @@
 // gh-775-ext.slang
 //TEST(compute):COMPARE_COMPUTE: -shaderobj
-//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu
 
 int test(int inVal)
 {

tests/compute/cbuffer-legalize.slang

@@ -1,6 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj
 //TEST(compute):COMPARE_COMPUTE:-shaderobj
-//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu
 
 //TEST_INPUT: uniform(data=[1 2 3 4]):name=C.p.c
 //TEST_INPUT: Texture2D(size=4, content = one):name=C.p.t

tests/compute/kernel-context-threading.slang

@@ -10,7 +10,6 @@
 //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -xslang -matrix-layout-row-major -shaderobj
 //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -dx12 -xslang -matrix-layout-row-major -shaderobj
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -xslang -matrix-layout-row-major -shaderobj
-//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu
 
 //TEST_INPUT:cbuffer(data=[1.0 0.0 0.0 0.0  0.0 1.0 0.0 0.0  0.0 0.0 1.0 0.0 10.0 20.0 30.0 1.0]):name matrixBuffer
 ConstantBuffer<float4x4> matrixBuffer;

tests/compute/parameter-block.slang

@@ -3,7 +3,7 @@
 //TEST(compute):COMPARE_COMPUTE:-vk -shaderobj
 //TEST(compute):COMPARE_COMPUTE:-shaderobj
 //TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl -render-features argument-buffer-tier-2
-//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu
+//TEST(compute):COMPARE_COMPUTE:-wgpu
 
 // Ensure that Slang `ParameterBlock` type is lowered
 // to HLSL in the fashion that we expect.

tests/expected-failure-github.txt

@@ -5,21 +5,17 @@ tests/language-feature/saturated-cooperation/fuse-product.slang (vk)
 tests/language-feature/saturated-cooperation/fuse.slang (vk)
 tests/bugs/byte-address-buffer-interlocked-add-f32.slang (vk)
 tests/serialization/obfuscated-serialized-module-test.slang.2 syn (mtl)
-tests/autodiff-dstdlib/dstdlib-abs.slang.2 syn (wgpu)
-tests/autodiff/bug-1.slang.1 syn (wgpu)
 tests/autodiff/custom-intrinsic.slang.2 syn (wgpu)
 tests/autodiff/diff-ptr-type-call.slang.2 syn (wgpu)
 tests/autodiff/diff-ptr-type-loop.slang.2 syn (wgpu)
 tests/autodiff/diff-ptr-type-smoke.slang.2 syn (wgpu)
 tests/autodiff/existential-1.slang.2 syn (wgpu)
 tests/autodiff/existential-2.slang.2 syn (wgpu)
-tests/autodiff/global-param-hoisting.slang.4 syn (wgpu)
 tests/autodiff/material/diff-bwd-falcor-material-system.slang.2 syn (wgpu)
 tests/autodiff/material2/diff-bwd-falcor-material-system.slang.2 syn (wgpu)
 tests/autodiff/matrix-arithmetic-fwd.slang.2 syn (wgpu)
 tests/autodiff/no-diff-strip.slang.3 syn (wgpu)
 tests/autodiff/reverse-loop-checkpoint-test.slang.3 syn (wgpu)
-tests/bindings/nested-parameter-block-2.slang.4 syn (wgpu)
 tests/bindings/nested-parameter-block-3.slang.4 syn (wgpu)
 tests/bugs/atomic-coerce.slang.3 syn (wgpu)
 tests/bugs/buffer-swizzle-store.slang.3 syn (wgpu)
@@ -37,30 +33,30 @@ tests/bugs/obfuscate-specialization-naming.slang.2 syn (wgpu)
 tests/bugs/op-assignment-unify-mat.slang.4 syn (wgpu)
 tests/bugs/shadowed-lookup.slang.1 syn (wgpu)
 tests/bugs/specialize-function-array-args.slang.2 syn (wgpu)
-tests/bugs/static-var.slang.1 syn (wgpu)
 tests/bugs/texture2d-gather.hlsl.2 syn (wgpu)
 tests/bugs/user-attribute-lookup.slang.2 syn (wgpu)
 tests/compute/atomics (wgpu)
 tests/compute/atomics-buffer (wgpu)
 tests/compute/atomics-groupshared (wgpu)
 tests/compute/buffer-type-splitting (wgpu)
 tests/compute/byte-address-buffer (wgpu)
-tests/compute/cbuffer-legalize.slang.2 syn (wgpu)
 tests/compute/compile-time-loop.slang.2 syn (wgpu)
 tests/compute/constexpr.slang.2 syn (wgpu)
 tests/compute/discard-stmt.slang.2 syn (wgpu)
 tests/compute/func-param-legalize.slang.1 syn (wgpu)
-tests/compute/global-init.slang.2 syn (wgpu)
 tests/compute/interface-shader-param-in-struct.slang.4 syn (wgpu)
 tests/compute/interface-shader-param.slang.5 syn (wgpu)
-tests/compute/kernel-context-threading.slang.6 syn (wgpu)
 tests/compute/loop-unroll.slang.7 syn (wgpu)
 tests/compute/parameter-block (wgpu)
 tests/compute/texture-get-dimensions (wgpu)
 tests/compute/texture-sampling (wgpu)
 tests/compute/texture-simple (wgpu)
 tests/compute/texture-simpler (wgpu)
 tests/compute/transcendental-double (wgpu)
+tests/compute/constant-buffer-memory-packing.slang.6 syn (wgpu)
+tests/compute/func-cbuffer-param.slang.4 syn (wgpu)
+tests/compute/matrix-layout.hlsl.3 syn (wgpu)
+tests/hlsl/packoffset.slang.5 syn (wgpu)
 tests/hlsl-intrinsic/byte-address-buffer/byte-address-struct.slang.5 syn (wgpu)
 tests/hlsl-intrinsic/classify-double.slang.6 syn (wgpu)
 tests/hlsl-intrinsic/classify-float.slang.5 syn (wgpu)
@@ -74,14 +70,10 @@ tests/language-feature/constants/static-const-in-generic-interface.slang.1 syn (
 tests/language-feature/enums/nested-enum.slang.1 syn (wgpu)
 tests/language-feature/enums/strongly-typed-id.slang.1 syn (wgpu)
 tests/language-feature/generics/irwarray.slang.2 syn (wgpu)
-tests/language-feature/generics/parameter-block-unify.slang.3 syn (wgpu)
 tests/language-feature/generics/tuple.slang.1 syn (wgpu)
 tests/language-feature/generics/variadic-0.slang.4 syn (wgpu)
 tests/language-feature/generics/variadic-void.slang.3 syn (wgpu)
 tests/language-feature/higher-order-functions/simple.slang.4 syn (wgpu)
-tests/language-feature/inheritance/struct-inheritance.slang.1 syn (wgpu)
-tests/language-feature/shader-params/entry-point-uniform-params-implicit.slang.3 syn (wgpu)
-tests/language-feature/shader-params/entry-point-uniform-params.slang.4 syn (wgpu)
 tests/language-feature/shader-params/interface-shader-param-ordinary.slang.4 syn (wgpu)
 tests/language-feature/swizzles/matrix-swizzle-write-array.slang.3 syn (wgpu)
 tests/language-feature/swizzles/matrix-swizzle-write-single.slang.3 syn (wgpu)

tests/language-feature/generics/parameter-block-unify.slang

@@ -1,7 +1,6 @@
 //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=CHECK):-slang -compute -shaderobj -output-using-type
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=CHECK):-vk -compute -shaderobj -output-using-type
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=CHECK):-mtl -compute -shaderobj -output-using-type -render-features argument-buffer-tier-2
-//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu
 
 struct TestStruct<Format:__BuiltinIntegerType, let count : int>
 {

tests/language-feature/inheritance/struct-inheritance.slang

@@ -1,7 +1,6 @@
 // struct-inheritance.slang
 
 //TEST(compute):COMPARE_COMPUTE: -shaderobj
-//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu
 
 // Test that we can define a `struct` type
 // that inherits from another `struct`.

tests/language-feature/shader-params/entry-point-uniform-params-implicit.slang

@@ -5,7 +5,6 @@
 //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -shaderobj  -xslang -Wno-38040
 //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -vk -shaderobj -xslang -Wno-38040
 //TEST:SIMPLE(filecheck=WARNING): -target spirv
-//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu
 
 struct Data
 {

tests/language-feature/shader-params/entry-point-uniform-params.slang

@@ -1,11 +1,9 @@
 // entry-point-uniform-params.slang
-
+//TEST(compute):COMPARE_COMPUTE:-wgpu -shaderobj
 //TEST(compute):COMPARE_COMPUTE: -shaderobj
 //TEST(compute):COMPARE_COMPUTE:-cuda -shaderobj
 //TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj
 //TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl
-//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu
-
 // Test that a shader can be written that
 // only uses entry point `uniform` parameters,
 // without any global parameters.