From dcc3af7bf4fdfb6926db039506137be0e16ae3bd Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 20 Feb 2020 10:34:58 -0500 Subject: CUDA/CPU support for 1D, 2D, CubeArray (#1232) * CUDA support for array of resources. * * Add support for Texture2DArray on CPU * Expand texture-simple.slang to test Texture2DArray * Reorganise CUDAComputeUtil to split out createTextureResource. * Add TextureCubeArray support for CPU/CUDA targets. --- tests/compute/texture-simple.slang | 6 ++++++ tests/compute/texture-simple.slang.expected.txt | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/compute/texture-simple.slang b/tests/compute/texture-simple.slang index 3d8fe8619..8e72250ff 100644 --- a/tests/compute/texture-simple.slang +++ b/tests/compute/texture-simple.slang @@ -17,6 +17,10 @@ TextureCube tCube; //TEST_INPUT: Texture1D(size=4, content = one, arrayLength=2):name t1DArray Texture1DArray t1DArray; +//TEST_INPUT: Texture2D(size=4, content = one, arrayLength=2):name t2DArray +Texture2DArray t2DArray; +//TEST_INPUT: TextureCube(size=4, content = one, arrayLength=2):name tCubeArray +TextureCubeArray tCubeArray; //TEST_INPUT: Sampler:name samplerState SamplerState samplerState; @@ -37,6 +41,8 @@ void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) val += tCube.SampleLevel(samplerState, normalize(float3(u, 1 - u, u)), 0); val += t1DArray.SampleLevel(samplerState, float2(u, 0), 0); + val += t2DArray.SampleLevel(samplerState, float3(u, u, 0), 0); + val += tCubeArray.SampleLevel(samplerState, float4(u, u, u, 0), 0); outputBuffer[idx] = val; } diff --git a/tests/compute/texture-simple.slang.expected.txt b/tests/compute/texture-simple.slang.expected.txt index a10701b2e..cf6e7405a 100644 --- a/tests/compute/texture-simple.slang.expected.txt +++ b/tests/compute/texture-simple.slang.expected.txt @@ -1,4 +1,4 @@ -40A00000 -40A00000 -40A00000 -40A00000 +40E00000 +40E00000 +40E00000 +40E00000 -- cgit v1.2.3