Skip to content

Commit fa565f9

Browse files
csyonghecsyonghe
authored
Enable testing with Swiftshader. (shader-slang#1906)
1 parent 09a251e commit fa565f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+306
-217
lines changed

‎.github/workflows/windows.yml

+2
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,6 @@ jobs:
4747
}
4848
$slangTestBinDir = ".\bin\windows-$testPlatform\${{matrix.configuration}}\";
4949
$env:Path += ";$slangTestBinDir";
50+
Invoke-WebRequest -uri "https://github.com/shader-slang/swiftshader/releases/download/v1.0/vk_swiftshader_windows_$testPlatform.zip" -Method "GET" -Outfile "swiftshader.zip";
51+
Expand-Archive "swiftshader.zip" -DestinationPath $slangTestBinDir;
5052
& "$slangTestBinDir\slang-test.exe" -api all-dx12 -appveyor -bindir "$slangTestBinDir\" -platform $testPlatform -configuration ${{matrix.configuration}} -category $testCategory;

‎external/slang-binaries

‎source/core/slang-render-api-util.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ static bool _canLoadSharedLibrary(const char* libName)
265265
switch (type)
266266
{
267267
case RenderApiType::OpenGl: return _canLoadSharedLibrary("opengl32");
268-
case RenderApiType::Vulkan: return _canLoadSharedLibrary("vulkan-1");
268+
case RenderApiType::Vulkan: return _canLoadSharedLibrary("vulkan-1") || _canLoadSharedLibrary("vk_swiftshader");
269269
case RenderApiType::D3D11: return _canLoadSharedLibrary("d3d11");
270270
case RenderApiType::D3D12: return _canLoadSharedLibrary("d3d12");
271271
case RenderApiType::CPU: return true;

‎tests/bugs/dxbc-double-problem.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -shaderobj
2-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj
2+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj -render-feature double
33
//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type -shaderobj
44
//TEST(compute):COMPARE_COMPUTE_EX:-dx12 -compute -use-dxil -output-using-type -shaderobj
55
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-dx12 -compute -output-using-type -shaderobj

‎tests/compute/ray-tracing-inline.slang

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//TEST(compute):COMPARE_COMPUTE:-d3d12 -output-using-type -use-dxil -profile sm_6_5 -render-feature ray-tracing
2-
//TEST(compute):COMPARE_COMPUTE:-vk -output-using-type -render-feature ray-tracing
1+
//TEST(compute):COMPARE_COMPUTE:-d3d12 -output-using-type -use-dxil -profile sm_6_5 -render-feature ray-query
2+
//TEST(compute):COMPARE_COMPUTE:-vk -output-using-type -render-feature ray-query
33

44
//TEST_INPUT: set scene = AccelerationStructure
55
uniform RaytracingAccelerationStructure scene;

‎tests/compute/texture-sample-grad-offset-clamp.slang

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//TEST(compute, vulkan):COMPARE_RENDER_COMPUTE:-vk -shaderobj
2-
//TEST(compute):COMPARE_RENDER_COMPUTE:-shaderobj
1+
//TEST(compute, vulkan):COMPARE_RENDER_COMPUTE:-vk -shaderobj -render-feature shader-resource-min-lod
2+
//TEST(compute):COMPARE_RENDER_COMPUTE:-shaderobj -render-feature shader-resource-min-lod
33

44
//TEST_INPUT: Texture2D(size=4, content = one):name=t2D
55
//TEST_INPUT: Sampler:name=samplerState

‎tests/compute/texture-simple.slang

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
2-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj
3-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -shaderobj
4-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile cs_6_0 -use-dxil -shaderobj
5-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
6-
//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
1+
//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -shaderobj -output-using-type
2+
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type
3+
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -shaderobj -output-using-type
4+
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile cs_6_0 -use-dxil -shaderobj -output-using-type
5+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type -render-feature hardware-device
6+
//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj -output-using-type
77

88
// Doesn't work on CUDA, not clear why yet
99
//DISABLE_TEST_INPUT: Texture1D(format=R_Float32, size=4, content = one, mipMaps=1):name tLoad1D

‎tests/compute/texture-simple.slang.expected.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
40E00000
2-
40E00000
3-
40E00000
4-
40E00000
1+
type: float
2+
7.000000
3+
7.000000
4+
7.000000
5+
7.000000

‎tests/hlsl-intrinsic/bit-cast-double.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -cpu -shaderobj
22
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj
33
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -shaderobj
4-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-slang -vk -compute -shaderobj
4+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-slang -vk -compute -shaderobj -render-feature double
55
//TEST(compute):COMPARE_COMPUTE_EX:-slang -cuda -compute -shaderobj
66

77
//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer

‎tests/hlsl-intrinsic/bit-cast/bit-cast-16-bit.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// bit-cast-16-bit.slang
22

33
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile sm_6_2 -shaderobj
4-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
4+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature int16,half
55
//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
66

77
//TEST_INPUT:ubuffer(data=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16], stride=4):name inputBuffer

‎tests/hlsl-intrinsic/classify-double.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
22
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj
33
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -shaderobj
4-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
4+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature double
55
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
66

77
// inf, -inf, nan, finite

‎tests/hlsl-intrinsic/literal-int64.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// No support with Dx12 with dxbc. Needs SM6.0 + dxil
55
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -shaderobj
66
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -profile cs_6_0 -dx12 -use-dxil -shaderobj
7-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
7+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature int64
88
//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
99

1010
// Note that the behavior we expect here, is a int without suffix is assumed to

‎tests/hlsl-intrinsic/matrix-double-reduced-intrinsic.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -shaderobj
66
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -output-using-type -shaderobj
77
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil -output-using-type -shaderobj
8-
//DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj
8+
//DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj -render-feature double
99
//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type -shaderobj
1010

1111
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/matrix-double.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type
88
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type
99
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -output-using-type
10-
//DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type
10+
//DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -render-feature double
1111
//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type
1212

1313
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/scalar-double-d3d-intrinsic.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// This is disabled because Dx12/DXBC doing double writes to a structured buffer can fail
55
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -output-using-type -shaderobj
66
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil -output-using-type -shaderobj
7-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj
7+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj -render-feature double
88
//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type -shaderobj
99

1010
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/scalar-double-simple.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj
66
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -shaderobj
77
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil -shaderobj
8-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
8+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature double
99
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
1010

1111
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/scalar-double-vk-intrinsic.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// This test is to see what intrinsics are available on VK
22

33
//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type -shaderobj
4-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj
4+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj -render-feature double
55

66
// We don't want to run a cuda test here...
77
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj

‎tests/hlsl-intrinsic/scalar-double.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute
44
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
55
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
6-
//DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
6+
//DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -render-feature double
77
//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute
88

99
//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/scalar-int64.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// No support with Dx12 with dxbc. Needs SM6.0 + dxil
55
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -shaderobj
66
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -profile cs_6_0 -dx12 -use-dxil -shaderobj
7-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
7+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature int64
88
//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
99

1010
//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/scalar-uint64.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// https://docs.microsoft.com/en-us/windows/win32/direct3dhlsl/hlsl-shader-model-6-0-features-for-direct3d-12
66
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -shaderobj
77
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile cs_6_0 -use-dxil -shaderobj
8-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
8+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature int64
99
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
1010

1111
//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/vector-double-reduced-intrinsic.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// On CI systems DX11 test failed, so disable for now
44
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -shaderobj
55
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -output-using-type -shaderobj
6-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj
6+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj -render-feature double
77
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type -shaderobj
88

99
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/wave-active-count-bits.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
33
//DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
5-
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
5+
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature hardware-device
66
//TEST:COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0 -shaderobj
77

88
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/wave-active-product.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
33
//DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
5-
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
5+
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature hardware-device
66
//TEST:COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0 -shaderobj
77

88
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/wave-is-first-lane.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
33
//DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
5-
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
5+
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature hardware-device
66
//TEST:COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0 -shaderobj
77

88
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/wave-mask/wave-is-first-lane.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
33
//DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
5-
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
5+
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature hardware-device
66
//TEST:COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
77

88
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/wave-mask/wave-prefix-product.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
33
//DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
5-
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
5+
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature hardware-device
66
//TEST:COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
77

88
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/wave-mask/wave-prefix-sum.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
33
//DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
5-
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
5+
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature hardware-device
66
//TEST:COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
77

88
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/wave-mask/wave-vector.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
33
//DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
5-
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
5+
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature hardware-device
66
//TEST:COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
77

88
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/wave-mask/wave.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
33
//DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
5-
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
5+
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature hardware-device
66
//TEST:COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
77

88
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/wave-prefix-count-bits.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
33
//DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
5-
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
5+
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature hardware-device
66
//TEST:COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0 -shaderobj
77

88
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/wave-prefix-product.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
33
//DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
5-
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
5+
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature hardware-device
66
//TEST:COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0 -shaderobj
77

88
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/wave-prefix-sum.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
33
//DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
5-
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
5+
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature hardware-device
66
//TEST:COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0 -shaderobj
77

88
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/hlsl-intrinsic/wave-vector.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
33
//DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
44
//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
5-
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
5+
//TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -render-feature hardware-device
66
//TEST:COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0 -shaderobj
77

88
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer

‎tests/language-feature/initializer-lists/default-init-16bit-types.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// simple-namespace.slang
22

3-
//TEST(compute):COMPARE_COMPUTE:-vk
3+
//TEST(compute):COMPARE_COMPUTE:-vk -render-feature int16
44

55
// Test that default initialization works with 16-bit types under Vulkan.
66

‎tests/type/texture-sampler/texture-sampler-2d.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
1+
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type
22

33
//TEST_INPUT: TextureSampler2D(size=4, content=one):name t2D
44
Sampler2D<float> t2D;

‎tests/type/texture-sampler/texture-sampler-2d.slang.expected.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
3F800000
2-
3F800000
3-
3F800000
4-
3F800000
1+
type: float
2+
1.0
3+
1.0
4+
1.0
5+
1.0

‎tools/copy-hlsl-libs.bat

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ set SOURCE_DIR=%~1
55
set TARGET_DIR=%~2
66
set PLATFORM=%~3
77

8-
robocopy "../../external/slang-binaries/bin/%PLATFORM%" "%TARGET_DIR%" d3dcompiler_47.dll /r:0 >nul
8+
robocopy "../../../external/slang-binaries/bin/%PLATFORM%" "%TARGET_DIR%" d3dcompiler_47.dll /r:0 >nul
99

10-
robocopy "%SOURCE_DIR%" "%TARGET_DIR%" dxcompiler.dll /xn /r:0 >nul
11-
robocopy "%SOURCE_DIR%" "%TARGET_DIR%" dxil.dll /xn /r:0 >nul
10+
robocopy "../../../external/slang-binaries/bin/%PLATFORM%" "%TARGET_DIR%" dxcompiler.dll /r:0 >nul
11+
robocopy "../../../external/slang-binaries/bin/%PLATFORM%" "%TARGET_DIR%" dxil.dll /r:0 >nul
12+
13+
robocopy "%SOURCE_DIR%" "%TARGET_DIR%" dxcompiler.dll /xo /r:0 >nul
14+
robocopy "%SOURCE_DIR%" "%TARGET_DIR%" dxil.dll /xo /r:0 >nul
1215

1316
exit /b 0

0 commit comments

Comments
 (0)