diff options
Diffstat (limited to 'tests')
10 files changed, 26 insertions, 25 deletions
diff --git a/tests/autodiff/global-param-hoisting.slang b/tests/autodiff/global-param-hoisting.slang index 7e9c9e971..54d275974 100644 --- a/tests/autodiff/global-param-hoisting.slang +++ b/tests/autodiff/global-param-hoisting.slang @@ -7,7 +7,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +//TEST(compute):COMPARE_COMPUTE:-slang -compute -mtl -output-using-type -render-features argument-buffer-tier-2 //TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; diff --git a/tests/bindings/nested-parameter-block-2.slang b/tests/bindings/nested-parameter-block-2.slang index 59580f17d..790e3d060 100644 --- a/tests/bindings/nested-parameter-block-2.slang +++ b/tests/bindings/nested-parameter-block-2.slang @@ -1,6 +1,7 @@ //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -d3d12 -use-dxil -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -vk -shaderobj -output-using-type +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -metal -shaderobj -output-using-type -render-features argument-buffer-tier-2 // nested-parameter-block-2.slang struct CB diff --git a/tests/bugs/buffer-swizzle-store.slang b/tests/bugs/buffer-swizzle-store.slang index 5850cd3c0..3cfcf6e59 100644 --- a/tests/bugs/buffer-swizzle-store.slang +++ b/tests/bugs/buffer-swizzle-store.slang @@ -1,6 +1,6 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type -//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +//TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl -output-using-type //TEST_INPUT: RWTexture2D(format=R16G16_FLOAT, size=4, content = one, mipMaps = 1):name g_test [format("rg16f")] diff --git a/tests/compute/entry-point-uniform-params.slang b/tests/compute/entry-point-uniform-params.slang index 65da103b6..87a21a2e6 100644 --- a/tests/compute/entry-point-uniform-params.slang +++ b/tests/compute/entry-point-uniform-params.slang @@ -9,8 +9,7 @@ //TEST(compute):COMPARE_COMPUTE: -dx11 -shaderobj //TEST(compute):COMPARE_COMPUTE: -cuda -shaderobj //TEST(compute):COMPARE_COMPUTE: -cpu -shaderobj - - +//TEST(compute):COMPARE_COMPUTE: -metal -shaderobj struct Signs { diff --git a/tests/compute/parameter-block.slang b/tests/compute/parameter-block.slang index 27cfed716..2922f0813 100644 --- a/tests/compute/parameter-block.slang +++ b/tests/compute/parameter-block.slang @@ -2,7 +2,7 @@ //TEST(compute):COMPARE_COMPUTE:-cuda -shaderobj //TEST(compute):COMPARE_COMPUTE:-vk -shaderobj //TEST(compute):COMPARE_COMPUTE:-shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +//TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl -render-features argument-buffer-tier-2 // Ensure that Slang `ParameterBlock` type is lowered // to HLSL in the fashion that we expect. diff --git a/tests/compute/texture-subscript.slang b/tests/compute/texture-subscript.slang index 9251f49f1..c15a0824b 100644 --- a/tests/compute/texture-subscript.slang +++ b/tests/compute/texture-subscript.slang @@ -2,7 +2,7 @@ //TEST:SIMPLE(filecheck=METALLIB): -target metallib -entry computeMain -stage compute // Metal lacks RWTexture GFX backend support. // Due to this, Metal compute test is disabled -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF): -slang -output-using-type -shaderobj -mtl +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF): -slang -output-using-type -shaderobj -mtl //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF): -slang -output-using-type -shaderobj -vk //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF): -slang -output-using-type -shaderobj -vk -glsl @@ -28,18 +28,22 @@ RWStructuredBuffer<uint> outputBuffer; [numthreads(1,1,1)] void computeMain() { - outputTexture1D[0].xz = int2(1,2).xx; - outputTexture1D[1].x = int2(3,4).y; - - outputTexture2D[0].xz = int2(1,2).xx; - outputTexture2D[int2(0, 1)].x = int2(3,4).y; - - outputTexture3D[0].xz = int2(1,2).xx; - outputTexture3D[int3(0, 0, 1)].x = int2(3,4).y; - - outputTexture2DArray[0].xz = int2(1,2); - outputTexture2DArray[int3(0, 0, 1)].xz = int2(3,4); - + outputTexture1D[0].xz = int2(1, 2).xx; + AllMemoryBarrier(); + outputTexture1D[1].x = int2(3, 4).y; + AllMemoryBarrier(); + outputTexture2D[0].xz = int2(1, 2).xx; + AllMemoryBarrier(); + outputTexture2D[int2(0, 1)].x = int2(3, 4).y; + AllMemoryBarrier(); + outputTexture3D[0].xz = int2(1, 2).xx; + AllMemoryBarrier(); + outputTexture3D[int3(0, 0, 1)].x = int2(3, 4).y; + AllMemoryBarrier(); + outputTexture2DArray[0].xz = int2(1, 2); + AllMemoryBarrier(); + outputTexture2DArray[int3(0, 0, 1)].xz = int2(3, 4); + AllMemoryBarrier(); outputBuffer[0] = uint(true && all(outputTexture1D[0] == int4(1, 0, 1, 0)) == true && all(outputTexture1D[1] == int4(4, 0, 0, 0)) == true diff --git a/tests/language-feature/shader-params/entry-point-uniform-params.slang b/tests/language-feature/shader-params/entry-point-uniform-params.slang index e150d3982..4b0b0e6a4 100644 --- a/tests/language-feature/shader-params/entry-point-uniform-params.slang +++ b/tests/language-feature/shader-params/entry-point-uniform-params.slang @@ -3,7 +3,7 @@ //TEST(compute):COMPARE_COMPUTE: -shaderobj //TEST(compute):COMPARE_COMPUTE:-cuda -shaderobj //TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +//TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl // Test that a shader can be written that // only uses entry point `uniform` parameters, diff --git a/tests/language-feature/types/opaque/inout-param-opaque-type-in-struct.slang b/tests/language-feature/types/opaque/inout-param-opaque-type-in-struct.slang index 3fc28812f..37e2585cd 100644 --- a/tests/language-feature/types/opaque/inout-param-opaque-type-in-struct.slang +++ b/tests/language-feature/types/opaque/inout-param-opaque-type-in-struct.slang @@ -4,8 +4,7 @@ // aggregate type that includes an opaque type //TEST(compute):COMPARE_COMPUTE: -// GFX backend fails -//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +//TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl struct Things { diff --git a/tests/language-feature/types/opaque/out-param-opaque-type-in-struct.slang b/tests/language-feature/types/opaque/out-param-opaque-type-in-struct.slang index c778e56fa..846dfb76f 100644 --- a/tests/language-feature/types/opaque/out-param-opaque-type-in-struct.slang +++ b/tests/language-feature/types/opaque/out-param-opaque-type-in-struct.slang @@ -4,8 +4,7 @@ // aggregate type that includes an opaque type //TEST(compute):COMPARE_COMPUTE: -// GFX backend fails -//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +//TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl struct Things { diff --git a/tests/language-feature/types/opaque/return-opaque-type-in-struct.slang b/tests/language-feature/types/opaque/return-opaque-type-in-struct.slang index a53551d4a..3af17a0b4 100644 --- a/tests/language-feature/types/opaque/return-opaque-type-in-struct.slang +++ b/tests/language-feature/types/opaque/return-opaque-type-in-struct.slang @@ -4,8 +4,7 @@ // aggregate type that includes an opaque type //TEST(compute):COMPARE_COMPUTE: -// GFX backend fails -//DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +//TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl struct Things { |