From 9c17d0be79834a8ebe2888aed8905bae355cb674 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 11 Oct 2019 14:14:08 -0400 Subject: Support for unbounded array of arrays (#1078) * WIP: Unsized arrays on CPU. * unbounded-array-of-array working on CPU. * Remove some left over comments. --- tests/compute/unbounded-array-of-array.slang | 35 ++++++++++++++++++++++ .../unbounded-array-of-array.slang.expected.txt | 8 +++++ 2 files changed, 43 insertions(+) create mode 100644 tests/compute/unbounded-array-of-array.slang create mode 100644 tests/compute/unbounded-array-of-array.slang.expected.txt (limited to 'tests') diff --git a/tests/compute/unbounded-array-of-array.slang b/tests/compute/unbounded-array-of-array.slang new file mode 100644 index 000000000..760740282 --- /dev/null +++ b/tests/compute/unbounded-array-of-array.slang @@ -0,0 +1,35 @@ +//DISABLE_TEST:CPU_REFLECTION: -profile cs_5_0 -entry computeMain -target cpp +//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute + +struct IntAoa { RWStructuredBuffer array[]; } + +//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):dxbinding(0),glbinding(0),out,name outputBuffer +RWStructuredBuffer outputBuffer; + +//TEST_INPUT:array(size=2):name g_aoa.array +ParameterBlock g_aoa; + +//TEST_INPUT:ubuffer(data=[1 2 3 4], stride=4):name=g_aoa.array[0] +//TEST_INPUT:ubuffer(data=[8 17 34], stride=4):name=g_aoa.array[1] + +[numthreads(8, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + int index = int(dispatchThreadID.x); + + int baseIndex = index >> 2; + int innerIndex = index & 3; + + RWStructuredBuffer buffer = g_aoa.array[baseIndex]; + + // Get the size + uint bufferCount, bufferStride; + buffer.GetDimensions(bufferCount, bufferStride); + + if (innerIndex >= bufferCount) + { + innerIndex = bufferCount - 1; + } + + outputBuffer[index] = buffer[innerIndex]; +} \ No newline at end of file diff --git a/tests/compute/unbounded-array-of-array.slang.expected.txt b/tests/compute/unbounded-array-of-array.slang.expected.txt new file mode 100644 index 000000000..aeec8496c --- /dev/null +++ b/tests/compute/unbounded-array-of-array.slang.expected.txt @@ -0,0 +1,8 @@ +1 +2 +3 +4 +8 +11 +22 +22 -- cgit v1.2.3