summaryrefslogtreecommitdiffstats
path: root/tests/compute
diff options
context:
space:
mode:
authorAnders Leino <aleino@nvidia.com>2024-11-01 15:18:54 +0200
committerGitHub <noreply@github.com>2024-11-01 15:18:54 +0200
commite1c3c4ae39b27cf378e7217d111b9a92e298b7ce (patch)
treeb788b39e683fb17be8340078b3c9ea9b93ded018 /tests/compute
parentc044ec220d87cfe38d69ecb954ecc4125ee11877 (diff)
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.
Diffstat (limited to 'tests/compute')
-rw-r--r--tests/compute/column-major.slang1
-rw-r--r--tests/compute/constant-buffer-memory-packing.slang2
-rw-r--r--tests/compute/matrix-layout.hlsl1
-rw-r--r--tests/compute/non-square-column-major.slang1
-rw-r--r--tests/compute/row-major.slang1
5 files changed, 0 insertions, 6 deletions
diff --git a/tests/compute/column-major.slang b/tests/compute/column-major.slang
index 6fc978ba6..1cd08434b 100644
--- a/tests/compute/column-major.slang
+++ b/tests/compute/column-major.slang
@@ -7,7 +7,6 @@
//TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute -emit-spirv-via-glsl -Xslang -matrix-layout-column-major
//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-cuda -compute -shaderobj -Xslang -matrix-layout-column-major
//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-mtl -compute -shaderobj -Xslang -matrix-layout-column-major
-//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu
// This data is in column major layout order....
//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
diff --git a/tests/compute/constant-buffer-memory-packing.slang b/tests/compute/constant-buffer-memory-packing.slang
index 93d4331fd..fb7a78fc1 100644
--- a/tests/compute/constant-buffer-memory-packing.slang
+++ b/tests/compute/constant-buffer-memory-packing.slang
@@ -9,8 +9,6 @@
//TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute
//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-mtl -compute
-//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu
-
// CPP/CUDA due to natural layout rules will recieve the following ROW matrix:
// {1,2,3}
// {0,4,5}
diff --git a/tests/compute/matrix-layout.hlsl b/tests/compute/matrix-layout.hlsl
index 2e9b4389f..4a2d3f014 100644
--- a/tests/compute/matrix-layout.hlsl
+++ b/tests/compute/matrix-layout.hlsl
@@ -10,7 +10,6 @@
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -xslang -matrix-layout-row-major -shaderobj
//TEST(compute,compatibility-issue):COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -xslang -matrix-layout-row-major -shaderobj
//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl
-//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu
// Not testing on Vulkan because of lack of support
// for integer matrices in GLSL. Slang needs to
diff --git a/tests/compute/non-square-column-major.slang b/tests/compute/non-square-column-major.slang
index c5688da2e..fd3ce6406 100644
--- a/tests/compute/non-square-column-major.slang
+++ b/tests/compute/non-square-column-major.slang
@@ -9,7 +9,6 @@
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -xslang -matrix-layout-column-major -shaderobj
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type -xslang -matrix-layout-column-major -shaderobj
//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=METAL):-slang -output-using-type -shaderobj -mtl
-//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu
// matrix<R, C>
//TEST_INPUT:cbuffer(data=[1.0 0.0 10.0 0.0 0.0 1.0 20.0 0.0]):name matrixBuffer
diff --git a/tests/compute/row-major.slang b/tests/compute/row-major.slang
index 6114e6dab..d0e76475b 100644
--- a/tests/compute/row-major.slang
+++ b/tests/compute/row-major.slang
@@ -4,7 +4,6 @@
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -xslang -matrix-layout-row-major -shaderobj
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -output-using-type -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;