Various fixes to enable some WGSL graphics tests (#5548)

* Update Slang-RHI to get WGPU backend fixes * render-test: Use device local memory type for vertex buffers This helps to avoid shader-slang/slang-rhi#104 * Fix bug in WGSL emitter layout code. There was a "kinds" vs. "kind flags" mismatch, and also getBindingOffsetForKinds was not being used. This patch enables a bunch of tests for WGPU. This helps to address issue #4943. * format code --------- Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
shader-slang · Nov 13, 2024 · 91f19be · 91f19be
1 parent 2be4fa4
commit 91f19be
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 10 deletions.
diff --git a/external/slang-rhi b/external/slang-rhi
diff --git a/source/slang/slang-emit-wgsl.cpp b/source/slang/slang-emit-wgsl.cpp
@@ -135,13 +135,13 @@ 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);
+                auto space = getBindingSpaceForKinds(&containerChain, 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

diff --git a/tests/compute/discard-stmt.slang b/tests/compute/discard-stmt.slang
@@ -3,7 +3,6 @@
 //TEST_INPUT: Texture2D(size=4, content = one):name tex
 //TEST_INPUT: Sampler:name samp
 //TEST_INPUT: ubuffer(data=[0 0], stride=4):out,name outputBuffer
-//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu
 
 
 Texture2D tex;

diff --git a/tests/compute/texture-sampling.slang b/tests/compute/texture-sampling.slang
@@ -12,6 +12,7 @@
 //TEST_INPUT: TextureCube(size=4, content = one, arrayLength=2):name=tCubeArray
 //TEST_INPUT: Sampler:name=samplerState
 //TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer
+// There is no texture_1d_array type in WGSL https://github.com/shader-slang/slang/issues/5223
 //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu
 
 Texture1D t1D;

diff --git a/tests/expected-failure-github.txt b/tests/expected-failure-github.txt
@@ -19,10 +19,8 @@ tests/compute/atomics (wgpu)
 tests/compute/atomics-buffer (wgpu)
 tests/compute/atomics-groupshared (wgpu)
 tests/compute/buffer-type-splitting (wgpu)
-tests/compute/compile-time-loop.slang.2 syn (wgpu)
 tests/compute/constant-buffer-memory-packing.slang.6 syn (wgpu)
 tests/compute/constexpr.slang.2 syn (wgpu)
-tests/compute/discard-stmt.slang.2 syn (wgpu)
 tests/compute/func-cbuffer-param.slang.4 syn (wgpu)
 tests/compute/interface-shader-param-in-struct.slang.4 syn (wgpu)
 tests/compute/interface-shader-param.slang.5 syn (wgpu)

diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp
@@ -597,7 +597,7 @@ SlangResult RenderTestApp::initialize(
 
                 BufferDesc vertexBufferDesc;
                 vertexBufferDesc.size = kVertexCount * sizeof(Vertex);
-                vertexBufferDesc.memoryType = MemoryType::Upload;
+                vertexBufferDesc.memoryType = MemoryType::DeviceLocal;
                 vertexBufferDesc.usage = BufferUsage::VertexBuffer;
                 vertexBufferDesc.defaultState = ResourceState::VertexBuffer;
+1 −1		include/slang-rhi.h
+4 −1		src/cpu/cpu-command.cpp
+1 −1		src/cpu/cpu-command.h
+3 −3		src/cuda/cuda-command.cpp
+1 −1		src/cuda/cuda-command.h
+4 −1		src/d3d11/d3d11-command.cpp
+1 −1		src/d3d11/d3d11-command.h
+2 −1		src/d3d12/d3d12-command.cpp
+1 −1		src/d3d12/d3d12-command.h
+1 −1		src/d3d12/d3d12-query.cpp
+2 −2		src/debug-layer/debug-command-queue.cpp
+1 −1		src/debug-layer/debug-command-queue.h
+3 −9		src/debug-layer/debug-helper-functions.h
+2 −1		src/metal/metal-command.cpp
+1 −1		src/metal/metal-command.h
+25 −45		src/rhi-shared.cpp
+3 −34		src/rhi-shared.h
+2 −1		src/vulkan/vk-command.cpp
+1 −1		src/vulkan/vk-command.h
+11 −11		src/wgpu/wgpu-buffer.cpp
+15 −9		src/wgpu/wgpu-command.cpp
+1 −1		src/wgpu/wgpu-command.h
+23 −22		src/wgpu/wgpu-device.cpp
+11 −11		src/wgpu/wgpu-texture.cpp