From 661d6198bbb9857d3fdc6df477e0742ed0b0765c Mon Sep 17 00:00:00 2001 From: Yong He Date: Mon, 14 Aug 2023 16:23:19 -0700 Subject: Support per field matrix layout (#3101) * Support per field matrix layout * Fix warnings. * Fix. * Fix tests. * Fix spiv gen. * Fix. * More test fixes. * Fix. * Run only GPU tests on self-hosted servers. * Remove -use-glsl-matrix-layout-modifier. * Fix. --------- Co-authored-by: Yong He --- tests/compute/comma-operator.slang.glsl | 11 ++++------- tests/compute/unbounded-array-of-array-syntax.slang.glsl | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'tests/compute') diff --git a/tests/compute/comma-operator.slang.glsl b/tests/compute/comma-operator.slang.glsl index 3107f5773..af7120704 100644 --- a/tests/compute/comma-operator.slang.glsl +++ b/tests/compute/comma-operator.slang.glsl @@ -3,8 +3,7 @@ //TEST_IGNORE_FILE: -layout(std430, binding = 0) -buffer _S1 { +layout(std430, binding = 0) buffer _S1 { int _data[]; } outputBuffer_0; @@ -13,12 +12,10 @@ int test_0(int inVal_0) return inVal_0 * 2 + 1; } -layout(local_size_x = 4, local_size_y = 1, local_size_z = 1) in;void main() +layout(local_size_x = 4, local_size_y = 1, local_size_z = 1) in; +void main() { uint tid_0 = gl_GlobalInvocationID.x; - - int outVal_0 = test_0(outputBuffer_0._data[tid_0]); - - outputBuffer_0._data[tid_0] = outVal_0; + outputBuffer_0._data[tid_0] = test_0(outputBuffer_0._data[tid_0]); return; } diff --git a/tests/compute/unbounded-array-of-array-syntax.slang.glsl b/tests/compute/unbounded-array-of-array-syntax.slang.glsl index f30012cc3..73148ae10 100644 --- a/tests/compute/unbounded-array-of-array-syntax.slang.glsl +++ b/tests/compute/unbounded-array-of-array-syntax.slang.glsl @@ -32,7 +32,6 @@ void main() { innerIndex_1 = innerIndex_0; } - uint _S4 = uint(innerIndex_1); - ((outputBuffer_0)._data[(uint(index_0))]) = ((g_aoa_0[_S3])._data[(_S4)]); + outputBuffer_0._data[uint(index_0)] = g_aoa_0[_S3]._data[uint(innerIndex_1)]; return; } -- cgit v1.2.3