diff options
| author | James Helferty (NVIDIA) <jhelferty@nvidia.com> | 2025-06-12 14:29:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-12 18:29:56 +0000 |
| commit | 3ffeaf4c7f22bfe95702da76d710362b277e15ac (patch) | |
| tree | fb1f77b36ebe3008f8f0d2a172707c408794e559 | |
| parent | 0cb89b3062f89ec5f5c5812f0164f8c90f3f9aba (diff) | |
Fix argument to float3 cbuffer tests (#7391)
Results of these tests had been marked ignored, because they failed on
VK with the GLSL backend. This change removes them from the
expected-failure.txt file and adds the correct command line option to
avoid using the GLSL target.
Addresses concern raised on #7282
| -rw-r--r-- | tests/expected-failure.txt | 2 | ||||
| -rw-r--r-- | tests/hlsl/cbuffer-float3-offsets-aligned.slang | 4 | ||||
| -rw-r--r-- | tests/hlsl/cbuffer-float3-offsets-unaligned.slang | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/tests/expected-failure.txt b/tests/expected-failure.txt index 22142e31d..7283c8d97 100644 --- a/tests/expected-failure.txt +++ b/tests/expected-failure.txt @@ -5,5 +5,3 @@ tests/language-feature/saturated-cooperation/fuse.slang (vk) tests/bugs/byte-address-buffer-interlocked-add-f32.slang (vk) tests/ir/loop-unroll-0.slang.1 (vk) tests/hlsl-intrinsic/texture/float-atomics.slang (vk) -tests/hlsl/cbuffer-float3-offsets-aligned.slang.2 (vk) -tests/hlsl/cbuffer-float3-offsets-unaligned.slang.2 (vk) diff --git a/tests/hlsl/cbuffer-float3-offsets-aligned.slang b/tests/hlsl/cbuffer-float3-offsets-aligned.slang index 7c548546a..b1ae566b4 100644 --- a/tests/hlsl/cbuffer-float3-offsets-aligned.slang +++ b/tests/hlsl/cbuffer-float3-offsets-aligned.slang @@ -1,6 +1,6 @@ -//TEST:SIMPLE(filecheck=SPIRV): -target spirv -profile cs_6_2 -entry computeMain -line-directive-mode none -fvk-use-dx-layout +//TEST:SIMPLE(filecheck=SPIRV): -target spirv -emit-spirv-directly -profile cs_6_2 -entry computeMain -line-directive-mode none -fvk-use-dx-layout //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -dx12 -use-dxil -profile cs_6_2 -Xslang... -Xdxc -fvk-use-dx-layout -Xdxc -enable-16bit-types -X. -output-using-type -//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -vk -profile cs_6_2 -Xslang... -fvk-use-dx-layout -X. -output-using-type +//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -vk -profile cs_6_2 -emit-spirv-directly -Xslang... -fvk-use-dx-layout -X. -output-using-type //TEST:REFLECTION(filecheck=REFLECT):-stage compute -entry computeMain -target spirv -profile cs_6_2 -no-codegen -line-directive-mode none -fvk-use-dx-layout //TEST_INPUT:ubuffer(stride=4, count=17):out,name=outputBuffer diff --git a/tests/hlsl/cbuffer-float3-offsets-unaligned.slang b/tests/hlsl/cbuffer-float3-offsets-unaligned.slang index c3824d1a2..920987343 100644 --- a/tests/hlsl/cbuffer-float3-offsets-unaligned.slang +++ b/tests/hlsl/cbuffer-float3-offsets-unaligned.slang @@ -1,6 +1,6 @@ -//TEST:SIMPLE(filecheck=SPIRV): -target spirv -profile cs_6_2 -entry computeMain -line-directive-mode none -fvk-use-dx-layout +//TEST:SIMPLE(filecheck=SPIRV): -target spirv -emit-spirv-directly -profile cs_6_2 -entry computeMain -line-directive-mode none -fvk-use-dx-layout //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -dx12 -use-dxil -Xslang... -Xdxc -fvk-use-dx-layout -Xdxc -enable-16bit-types -X. -output-using-type -//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -vk -Xslang... -fvk-use-dx-layout -X. -output-using-type +//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -vk -emit-spirv-directly -Xslang... -fvk-use-dx-layout -X. -output-using-type //TEST:REFLECTION(filecheck=REFLECT):-stage compute -entry computeMain -target spirv -profile cs_6_2 -no-codegen -line-directive-mode none -fvk-use-dx-layout // dxc: -T cs_6_2 -E computeMain -spirv -fvk-use-dx-layout -enable-16bit-types |