summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/expected-failure-github.txt3
-rw-r--r--tests/hlsl-intrinsic/texture/partial-resident-texture-combined.slang6
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/expected-failure-github.txt b/tests/expected-failure-github.txt
index 8d918ff8f..78ae5cf92 100644
--- a/tests/expected-failure-github.txt
+++ b/tests/expected-failure-github.txt
@@ -13,6 +13,5 @@ tests/compute/interface-shader-param.slang.5 syn (wgpu)
tests/language-feature/shader-params/interface-shader-param-ordinary.slang.4 syn (wgpu)
tests/glsl-intrinsic/shader-subgroup/shader-subgroup-builtin-variables.slang.8 (mtl)
tests/glsl-intrinsic/shader-subgroup/shader-subgroup-builtin-variables-2.slang.3 (mtl)
-tests/hlsl-intrinsic/texture/partial-resident-texture-combined.slang (dx12)
tests/compute/cbuffer-legalize.slang.2 syn (mtl)
-tests/hlsl-intrinsic/classify-float.slang.5 syn (wgpu) \ No newline at end of file
+tests/hlsl-intrinsic/classify-float.slang.5 syn (wgpu)
diff --git a/tests/hlsl-intrinsic/texture/partial-resident-texture-combined.slang b/tests/hlsl-intrinsic/texture/partial-resident-texture-combined.slang
index 3deddb504..018f220f2 100644
--- a/tests/hlsl-intrinsic/texture/partial-resident-texture-combined.slang
+++ b/tests/hlsl-intrinsic/texture/partial-resident-texture-combined.slang
@@ -1,5 +1,5 @@
-// TODO: There are issues running tests combined texture samplers in DX12.
-//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=CHK):-slang -compute -shaderobj -output-using-type -use-dxil -profile cs_6_7 -dx12
+// TODO: There are issues running tests combined texture samplers in DX12. (Github issue #6982)
+//DISABLE_TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=CHK):-slang -compute -shaderobj -output-using-type -use-dxil -profile cs_6_7 -dx12 -Xslang -DTARGET_DX12
//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=CHK):-vk -compute -shaderobj -output-using-type -emit-spirv-directly -render-feature hardware-device -xslang -DVK
@@ -220,7 +220,9 @@ void computeMain(int3 dispatchThreadID: SV_DispatchThreadID)
st2DArray_f32v4,
)
&& TEST_combinedDepth()
+#if !defined(TARGET_DX12) // HLSL doesn't support samplers for `Load` functions.
&& TEST_sparse(st2D_f32v4, st2DMS_f32v4)
+#endif
;
//CHK:1