From ab64cf2ec05980d72cb2bad45e629d10ebbefdc1 Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Mon, 23 Oct 2017 10:37:07 -0700 Subject: Fix output for matrix multiple in GLSL code (#228) When Slang sees a matrix multiplication `M * v` in GLSL code it should (obviously) output GLSL code that also does `M * v`, but there was a bug introduced where the type-checker manages to resolve the operation and recognize it as a matrix-vector multiply, and then the code-generation logic says "oh, I'm generating output for GLSL, and that is reversed from HLSL/Slang, so I'd better reverse these operands!" and outputs `v * M`... which isn't what we want. I've fixed the problem in an expedient way, by having the front-end resolve the operation to what it believes is an intrinsic multiply operation, rather than a matrix-vector operation. If we ever support cross compilation *from* GLSL (unlikely), we've need to fix this up so that we have both real matrix-vector multiplies and "reversed" multiplies where the operands folow the GLSL convention). I've added two tests here to confirm the fix. The one under `tests/bugs` catches the actual issue described above, and confirms the fix. The other one under `tests/cross-compile` is just to make sure that we *do* properly reverse the operands to a matrix-vector product when converting from Slang to GLSL. --- tests/cross-compile/matrix-mult.slang | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 tests/cross-compile/matrix-mult.slang (limited to 'tests/cross-compile/matrix-mult.slang') diff --git a/tests/cross-compile/matrix-mult.slang b/tests/cross-compile/matrix-mult.slang new file mode 100644 index 000000000..180a806e2 --- /dev/null +++ b/tests/cross-compile/matrix-mult.slang @@ -0,0 +1,14 @@ +//TEST:CROSS_COMPILE: -profile ps_5_0 -entry main -target spirv-assembly + +// Confirm that order of arguments to matrix-vector +// multiplication gets reversed when generating GLSL. + +cbuffer C +{ + float4x3 m; +}; + +float4 main(float3 v) : SV_Target +{ + return mul(m, v); +} -- cgit v1.2.3