diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2020-02-26 21:13:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 21:13:41 +0000 |
| commit | 7bce066cfc51296a538c7a7d325133d60e352494 (patch) | |
| tree | ce54b40315274c3a7daaf5781de3d2504d72cba2 /tests | |
| parent | 6308a1224672944220a1fee34ae22f70212703a0 (diff) | |
Support for RWTexture types on CPU and CUDA (#1243)
* Added FloatTextureData as a mechanism to enable CPU based Texture writes.
* Add [] RWTexture access for CPU.
* Fixed rw-texture-simple.slang.expected.txt
* WIP: CUDA stdlib has support for [] surface access.
* Made IRWTexture class able to take different locations.
Doing a Texture2d access on CUDA works.
* Fix bug in outputing UniformState - was missing out padding.
Support RWTexture with array. Support RWTexture3D.
* Use * for locations for read only textures, so only need a ITexture interface.
* Fix problem around application of set/get for CUDA on subscript Texture types.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/compute/rw-texture-simple.slang | 36 | ||||
| -rw-r--r-- | tests/compute/rw-texture-simple.slang.expected.txt | 9 | ||||
| -rw-r--r-- | tests/compute/texture-simple.slang | 2 |
3 files changed, 33 insertions, 14 deletions
diff --git a/tests/compute/rw-texture-simple.slang b/tests/compute/rw-texture-simple.slang index dde0ecd4c..3598cadeb 100644 --- a/tests/compute/rw-texture-simple.slang +++ b/tests/compute/rw-texture-simple.slang @@ -1,27 +1,45 @@ -//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute +//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type // Doesn't work on DX11 currently - locks up on binding -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile cs_6_0 -use-dxil +//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type +// Produces a different result on DX12 with DXBC than expected(!). So disabled for now +//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -output-using-type +//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile cs_6_0 -use-dxil -output-using-type // TODO(JS): Doesn't work on vk currently, because createTextureView not implemented on vk renderer -//DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute +//DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type +//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type //TEST_INPUT: RWTexture1D(format=R_Float32, size=4, content = one):name rwt1D RWTexture1D<float> rwt1D; +//TEST_INPUT: RWTexture2D(format=R_Float32, size=4, content = one):name rwt2D +RWTexture2D<float> rwt2D; +//TEST_INPUT: RWTexture3D(format=R_Float32, size=4, content = one):name rwt3D +RWTexture3D<float> rwt3D; //TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer RWStructuredBuffer<float> outputBuffer; -[numthreads(4, 4, 1)] +[numthreads(4, 1, 1)] void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) { int idx = dispatchThreadID.x; - float u = idx * (1.0f / 4); float val = 0.0f; - val += rwt1D.Load(idx); + //val += rwt1D.Load(idx); + val += rwt1D[idx]; + val += rwt2D[uint2(idx, idx)]; + val += rwt3D[uint3(idx, idx, idx)]; + + // NOTE! This is disabled because on CUDA, whilst this has an effect it is not what is expected. + // The value read back has changed but seems to always be 1. + // rwt1D[idx] = idx; + + rwt2D[uint2(idx, idx)] = idx; + rwt3D[uint3(idx, idx, idx)] = idx; + + val += rwt1D[idx]; + val += rwt2D[uint2(idx, idx)]; + val += rwt3D[uint3(idx, idx, idx)]; outputBuffer[idx] = val; } diff --git a/tests/compute/rw-texture-simple.slang.expected.txt b/tests/compute/rw-texture-simple.slang.expected.txt index cc5e55ab6..78ed77898 100644 --- a/tests/compute/rw-texture-simple.slang.expected.txt +++ b/tests/compute/rw-texture-simple.slang.expected.txt @@ -1,4 +1,5 @@ -3F800000 -3F800000 -3F800000 -3F800000 +type: float +4.000000 +6.000000 +8.000000 +10.000000 diff --git a/tests/compute/texture-simple.slang b/tests/compute/texture-simple.slang index df990ec7a..e2a14043e 100644 --- a/tests/compute/texture-simple.slang +++ b/tests/compute/texture-simple.slang @@ -32,7 +32,7 @@ SamplerState samplerState; //TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer RWStructuredBuffer<float> outputBuffer; -[numthreads(4, 4, 1)] +[numthreads(4, 1, 1)] void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) { int idx = dispatchThreadID.x; |
