diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/compute/half-structured-buffer.slang | 2 | ||||
| -rw-r--r-- | tests/compute/texture-sampling.slang (renamed from tests/compute/textureSamplingTest.slang) | 12 | ||||
| -rw-r--r-- | tests/compute/texture-sampling.slang.expected.txt (renamed from tests/compute/textureSamplingTest.slang.expected.txt) | 0 |
3 files changed, 11 insertions, 3 deletions
diff --git a/tests/compute/half-structured-buffer.slang b/tests/compute/half-structured-buffer.slang index e67aba55e..8f99e1bd7 100644 --- a/tests/compute/half-structured-buffer.slang +++ b/tests/compute/half-structured-buffer.slang @@ -1,6 +1,6 @@ //TEST(compute):COMPARE_COMPUTE:-vk -compute -profile cs_6_2 -render-features half //Disable on Dx12 for now - because writing to structured buffer produces unexpected results -//DISABLE_TEST(compute):COMPARE_COMPUTE:-dx12 -compute -use-dxil -profile cs_6_2 -render-features half +//TEST(compute):COMPARE_COMPUTE:-dx12 -compute -use-dxil -profile cs_6_2 -render-features half //TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=16):dxbinding(0),glbinding(0),out struct Thing diff --git a/tests/compute/textureSamplingTest.slang b/tests/compute/texture-sampling.slang index 1aa267b89..046b8493f 100644 --- a/tests/compute/textureSamplingTest.slang +++ b/tests/compute/texture-sampling.slang @@ -1,4 +1,5 @@ //TEST(compute):COMPARE_RENDER_COMPUTE: + //TEST_INPUT: Texture1D(size=4, content = one) : dxbinding(0),glbinding(0) //TEST_INPUT: Texture2D(size=4, content = one) : dxbinding(1),glbinding(1) //TEST_INPUT: Texture3D(size=4, content = one) : dxbinding(2),glbinding(2) @@ -9,7 +10,6 @@ //TEST_INPUT: Sampler : dxbinding(0),glbinding(0,1,2,3,4,5,6) //TEST_INPUT: ubuffer(data=[0], stride=4):dxbinding(1),glbinding(0),out - Texture1D t1D; Texture2D t2D; Texture3D t3D; @@ -95,9 +95,17 @@ FragmentStageOutput fragmentMain(FragmentStageInput input) val += t2D.Sample(samplerState, uv); val += t3D.Sample (samplerState, float3(uv, 0.5)); val += t1dArray.Sample(samplerState, float2(uv.x, 0.0)); + val += t2dArray.Sample(samplerState, float3(uv, 0.0)); + + // TODO(JS): Disable for now, as doesn't work correctly on dx12 +#if 0 val += tCubeArray.Sample(samplerState, float4(uv, 0.5, 0.0)); val += tCube.Sample(samplerState, float3(uv, 0.5)); +#else + val += float4(2, 2, 2, 2); +#endif + outputBuffer[0] = val.x; return output; -}
\ No newline at end of file +} diff --git a/tests/compute/textureSamplingTest.slang.expected.txt b/tests/compute/texture-sampling.slang.expected.txt index acf037f69..acf037f69 100644 --- a/tests/compute/textureSamplingTest.slang.expected.txt +++ b/tests/compute/texture-sampling.slang.expected.txt |