From 8b3e3beea66d9773adf11ea2e163577d649f3d7c Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Tue, 28 Jan 2020 12:35:13 -0800 Subject: Fix layout for structured buffers of matrices (#1184) When using row-major layout (via command-line or API option), the following sort of declaration: ```hlsl StructuredBuffer gBuffer; ... gBuffer[i] ... ``` Generates unexpected results when compiled to DXBC via fxc or DXIL via dxc, because the fxc/dxc compilers do not respect the matrix layout mode in this specific case (a structured buffer of matrices). Instead, they always use column-major layout, even if row-major was requested by the user. A user can work around this behavior by wrapping the matrix in a `struct`: ```hlsl struct Wrapper { float4x4 wrapped; } SturcturedBuffer gBuffer; ... gBuffer[i].wrapped ... ``` This change simply automates that workaround when compiling for an HLSL-based downstream compiler, so that we get the same behavior across all our backends. The change adds a test case to confirm the behavior across multiple targets, but it turns out we also had a test checked in that confirmed the buggy (or at least surprising) fxc/dxc behavior, so that one had its baselines changed and can work as a regression test for this fix as well. --- source/slang/slang-ir.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source/slang/slang-ir.cpp') diff --git a/source/slang/slang-ir.cpp b/source/slang/slang-ir.cpp index a8f42c326..4f33e08ee 100644 --- a/source/slang/slang-ir.cpp +++ b/source/slang/slang-ir.cpp @@ -2120,6 +2120,13 @@ namespace Slang return getType(op, 0, nullptr); } + IRType* IRBuilder::getType( + IROp op, + IRInst* operand0) + { + return getType(op, 1, &operand0); + } + IRBasicType* IRBuilder::getBasicType(BaseType baseType) { return (IRBasicType*)getType( -- cgit v1.2.3