Skip to content

Commit e1c3c4a

Browse files
aleino-nvaleino-nv
authored
Update Slang-RHI again to get more WGPU fixes (#5475)
This fixes a teardown crash, and a buffer usage mismatch issue during bind group creation. These Slang-RHI fixes allow several WGPU tests to be enabled: - tests/compute/column-major.slang - tests/compute/constant-buffer-memory-packing.slang - tests/compute/matrix-layout.hlsl - tests/compute/non-square-column-major.slang - tests/compute/row-major.slang - tests/hlsl/packoffset.slang This helps to address issue #5222.
1 parent c044ec2 commit e1c3c4a

8 files changed

+1
-14
lines changed

‎external/slang-rhi

‎tests/compute/column-major.slang

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute -emit-spirv-via-glsl -Xslang -matrix-layout-column-major
88
//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-cuda -compute -shaderobj -Xslang -matrix-layout-column-major
99
//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-mtl -compute -shaderobj -Xslang -matrix-layout-column-major
10-
//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu
1110

1211
// This data is in column major layout order....
1312
//TEST_INPUT:cbuffer(data=[1.0 0.0 0.0 10.0 0.0 1.0 0.0 20.0 0.0 0.0 1.0 30.0 0.0 0.0 0.0 1.0]):name matrixBuffer

‎tests/compute/constant-buffer-memory-packing.slang

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
//TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute
1010
//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-mtl -compute
1111

12-
//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu
13-
1412
// CPP/CUDA due to natural layout rules will recieve the following ROW matrix:
1513
// {1,2,3}
1614
// {0,4,5}

‎tests/compute/matrix-layout.hlsl

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -xslang -matrix-layout-row-major -shaderobj
1111
//TEST(compute,compatibility-issue):COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -xslang -matrix-layout-row-major -shaderobj
1212
//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl
13-
//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu
1413

1514
// Not testing on Vulkan because of lack of support
1615
// for integer matrices in GLSL. Slang needs to

‎tests/compute/non-square-column-major.slang

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -xslang -matrix-layout-column-major -shaderobj
1010
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type -xslang -matrix-layout-column-major -shaderobj
1111
//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=METAL):-slang -output-using-type -shaderobj -mtl
12-
//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu
1312

1413
// matrix<R, C>
1514
//TEST_INPUT:cbuffer(data=[1.0 0.0 10.0 0.0 0.0 1.0 20.0 0.0]):name matrixBuffer

‎tests/compute/row-major.slang

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -xslang -matrix-layout-row-major -shaderobj
55
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -output-using-type -xslang -matrix-layout-row-major -shaderobj
66
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -xslang -matrix-layout-row-major -shaderobj
7-
//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu
87

98
//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
109
ConstantBuffer<float4x4> matrixBuffer;

‎tests/expected-failure-github.txt

-6
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ tests/compute/atomics-groupshared (wgpu)
4646
tests/compute/buffer-type-splitting (wgpu)
4747
tests/compute/byte-address-buffer (wgpu)
4848
tests/compute/cbuffer-legalize.slang.2 syn (wgpu)
49-
tests/compute/column-major (wgpu)
5049
tests/compute/compile-time-loop.slang.2 syn (wgpu)
51-
tests/compute/constant-buffer-memory-packing (wgpu)
5250
tests/compute/constexpr.slang.2 syn (wgpu)
5351
tests/compute/discard-stmt.slang.2 syn (wgpu)
5452
tests/compute/func-cbuffer-param (wgpu)
@@ -59,11 +57,8 @@ tests/compute/interface-shader-param-in-struct.slang.4 syn (wgpu)
5957
tests/compute/interface-shader-param.slang.5 syn (wgpu)
6058
tests/compute/kernel-context-threading.slang.6 syn (wgpu)
6159
tests/compute/loop-unroll.slang.7 syn (wgpu)
62-
tests/compute/matrix-layout.hlsl.3 syn (wgpu)
63-
tests/compute/non-square-column-major.slang.6 syn (wgpu)
6460
tests/compute/non-square-row-major.slang.6 syn (wgpu)
6561
tests/compute/parameter-block (wgpu)
66-
tests/compute/row-major.slang.4 syn (wgpu)
6762
tests/compute/texture-get-dimensions (wgpu)
6863
tests/compute/texture-sampling (wgpu)
6964
tests/compute/texture-simple (wgpu)
@@ -77,7 +72,6 @@ tests/hlsl-intrinsic/matrix-int.slang.6 syn (wgpu)
7772
tests/hlsl-intrinsic/scalar-double-simple.slang.7 syn (wgpu)
7873
tests/hlsl-intrinsic/scalar-float.slang.5 syn (wgpu)
7974
tests/hlsl-intrinsic/vector-float.slang.5 syn (wgpu)
80-
tests/hlsl/packoffset.slang.5 syn (wgpu)
8175
tests/ir/string-literal-hash.slang.2 syn (wgpu)
8276
tests/language-feature/anonymous-struct.slang.1 syn (wgpu)
8377
tests/language-feature/constants/constexpr-loop.slang.2 syn (wgpu)

‎tests/hlsl/packoffset.slang

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type
33
//TEST:SIMPLE(filecheck=HLSL): -target hlsl -profile cs_5_0 -entry computeMain -line-directive-mode none
44
//TEST:SIMPLE(filecheck=GLSL): -target glsl -profile glsl_450 -stage compute -entry computeMain -line-directive-mode none
5-
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu
65

76
// Metal does not support custom data layout.
87
//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl

0 commit comments

Comments
 (0)