diff options
Diffstat (limited to 'tests/compute')
| -rw-r--r-- | tests/compute/matrix-layout.hlsl | 11 | ||||
| -rw-r--r-- | tests/compute/matrix-layout.hlsl.expected.txt | 24 |
2 files changed, 21 insertions, 14 deletions
diff --git a/tests/compute/matrix-layout.hlsl b/tests/compute/matrix-layout.hlsl index ad456d8be..034ac512c 100644 --- a/tests/compute/matrix-layout.hlsl +++ b/tests/compute/matrix-layout.hlsl @@ -32,7 +32,14 @@ cbuffer C0 //TEST_INPUT:cbuffer(data=[1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24]):dxbinding(1),glbinding(1) cbuffer C1 { - column_major + +// Note: support for the explicit `row_major` and `column_major` modifiers is being +// disabled for now, since our current Vulkan output strategy cannot possibly match the +// semantics of these modifiers in D3D. Once we do a more complete implementation of +// matrix layout (see GitHub issue #695) we can add a directed test for all the +// corners cases of explicit matrix layout. +// +// column_major int3x4 cc; int dd; }; @@ -47,7 +54,7 @@ int test(int val) int a = s.a[val / 4][val % 3]; int b = s.b; - int c = cc[val / 4][val % 4]; + int c = cc[val / 4][val % 3]; int d = dd; return ((a*N + b) * N + c) * N + d; diff --git a/tests/compute/matrix-layout.hlsl.expected.txt b/tests/compute/matrix-layout.hlsl.expected.txt index cb8e2cae7..3b67fe0cb 100644 --- a/tests/compute/matrix-layout.hlsl.expected.txt +++ b/tests/compute/matrix-layout.hlsl.expected.txt @@ -1,12 +1,12 @@ -10D0111 -20D0511 -30D0911 -10D0D11 -60D0211 -70D0611 -50D0A11 -60D0E11 -B0D0311 -90D0711 -A0D0B11 -B0D0F11 +10D010D +20D020D +30D030D +10D010D +60D060D +70D070D +50D050D +60D060D +B0D0B0D +90D090D +A0D0A0D +B0D0B0D |