summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source/slang/slang-check-decl.cpp34
-rw-r--r--source/slang/slang-emit-c-like.cpp4
-rw-r--r--source/slang/slang-emit-c-like.h3
-rw-r--r--source/slang/slang-emit-cuda.cpp4
-rw-r--r--source/slang/slang-emit-cuda.h2
-rw-r--r--source/slang/slang-emit-glsl.cpp12
-rw-r--r--source/slang/slang-emit-glsl.h2
-rw-r--r--source/slang/slang-emit-hlsl.cpp71
-rw-r--r--source/slang/slang-emit-hlsl.h3
-rw-r--r--source/slang/slang-emit-metal.cpp2
-rw-r--r--source/slang/slang-emit-metal.h2
-rw-r--r--source/slang/slang-type-layout.cpp27
-rw-r--r--tests/compute/constant-buffer-memory-packing.slang93
-rw-r--r--tests/language-feature/types/matrix-layout-uniform.slang19
14 files changed, 173 insertions, 105 deletions
diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp
index ec59469d3..ad3f94fc3 100644
--- a/source/slang/slang-check-decl.cpp
+++ b/source/slang/slang-check-decl.cpp
@@ -93,7 +93,7 @@ namespace Slang
void checkDerivativeMemberAttributeParent(VarDeclBase* varDecl, DerivativeMemberAttribute* attr);
void checkExtensionExternVarAttribute(VarDeclBase* varDecl, ExtensionExternVarModifier* m);
void checkMeshOutputDecl(VarDeclBase* varDecl);
-
+ void maybeApplyMatrixLayoutModifier(VarDeclBase* varDecl);
void checkVarDeclCommon(VarDeclBase* varDecl);
void visitVarDecl(VarDecl* varDecl)
@@ -1516,6 +1516,22 @@ namespace Slang
}
}
}
+ void SemanticsDeclHeaderVisitor::maybeApplyMatrixLayoutModifier(VarDeclBase* varDecl)
+ {
+ if (auto matrixType = as<MatrixExpressionType>(varDecl->type.type))
+ {
+ if (auto matrixLayoutModifier = varDecl->findModifier<MatrixLayoutModifier>())
+ {
+ auto matrixLayout = as<ColumnMajorLayoutModifier>(matrixLayoutModifier) ? SLANG_MATRIX_LAYOUT_COLUMN_MAJOR : SLANG_MATRIX_LAYOUT_ROW_MAJOR;
+ auto newMatrixType = getASTBuilder()->getMatrixType(
+ matrixType->getElementType(),
+ matrixType->getRowCount(),
+ matrixType->getColumnCount(),
+ getASTBuilder()->getIntVal(getASTBuilder()->getIntType(), matrixLayout));
+ varDecl->type.type = newMatrixType;
+ }
+ }
+ }
void SemanticsDeclHeaderVisitor::checkVarDeclCommon(VarDeclBase* varDecl)
{
@@ -1598,19 +1614,7 @@ namespace Slang
}
// If there is a matrix layout modifier, we will modify the matrix type now.
- if (auto matrixType = as<MatrixExpressionType>(varDecl->type.type))
- {
- if (auto matrixLayoutModifier = varDecl->findModifier<MatrixLayoutModifier>())
- {
- auto matrixLayout = as<ColumnMajorLayoutModifier>(matrixLayoutModifier) ? SLANG_MATRIX_LAYOUT_COLUMN_MAJOR : SLANG_MATRIX_LAYOUT_ROW_MAJOR;
- auto newMatrixType = getASTBuilder()->getMatrixType(
- matrixType->getElementType(),
- matrixType->getRowCount(),
- matrixType->getColumnCount(),
- getASTBuilder()->getIntVal(getASTBuilder()->getIntType(), matrixLayout));
- varDecl->type.type = newMatrixType;
- }
- }
+ maybeApplyMatrixLayoutModifier(varDecl);
if (varDecl->initExpr)
{
@@ -7676,6 +7680,8 @@ namespace Slang
}
}
+ maybeApplyMatrixLayoutModifier(paramDecl);
+
// Only texture types are allowed to have memory qualifiers on parameters
if(!paramDecl->type || paramDecl->type->astNodeType != ASTNodeType::TextureType)
{
diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp
index ad365581a..1893929f8 100644
--- a/source/slang/slang-emit-c-like.cpp
+++ b/source/slang/slang-emit-c-like.cpp
@@ -3520,7 +3520,7 @@ void CLikeSourceEmitter::emitParamTypeImpl(IRType* type, String const& name)
{
type = constRefType->getValueType();
}
-
+ emitParamTypeModifier(type);
emitType(type, name);
}
@@ -3862,7 +3862,7 @@ void CLikeSourceEmitter::emitVarModifiers(IRVarLayout* layout, IRInst* varDecl,
if (!layout)
return;
- emitMatrixLayoutModifiersImpl(layout);
+ emitMatrixLayoutModifiersImpl(varType);
// Target specific modifier output
emitImageFormatModifierImpl(varDecl, varType);
diff --git a/source/slang/slang-emit-c-like.h b/source/slang/slang-emit-c-like.h
index 756b59913..00ad156d1 100644
--- a/source/slang/slang-emit-c-like.h
+++ b/source/slang/slang-emit-c-like.h
@@ -497,7 +497,7 @@ public:
virtual void emitMeshShaderModifiersImpl(IRInst* varInst) { SLANG_UNUSED(varInst) }
virtual void emitSimpleTypeImpl(IRType* type) = 0;
virtual void emitVarDecorationsImpl(IRInst* varDecl) { SLANG_UNUSED(varDecl); }
- virtual void emitMatrixLayoutModifiersImpl(IRVarLayout* layout) { SLANG_UNUSED(layout); }
+ virtual void emitMatrixLayoutModifiersImpl(IRType* varType) { SLANG_UNUSED(varType); }
virtual void emitTypeImpl(IRType* type, const StringSliceLoc* nameLoc);
virtual void emitSimpleValueImpl(IRInst* inst);
virtual void emitModuleImpl(IRModule* module, DiagnosticSink* sink);
@@ -505,6 +505,7 @@ public:
virtual void emitVarExpr(IRInst* inst, EmitOpInfo const& outerPrec);
virtual void emitOperandImpl(IRInst* inst, EmitOpInfo const& outerPrec);
virtual void emitParamTypeImpl(IRType* type, String const& name);
+ virtual void emitParamTypeModifier(IRType* type) { SLANG_UNUSED(type); }
virtual void emitIntrinsicCallExprImpl(IRCall* inst, UnownedStringSlice intrinsicDefinition, IRInst* intrinsicInst, EmitOpInfo const& inOuterPrec);
virtual void emitFunctionPreambleImpl(IRInst* inst) { SLANG_UNUSED(inst); }
virtual void emitLoopControlDecorationImpl(IRLoopControlDecoration* decl) { SLANG_UNUSED(decl); }
diff --git a/source/slang/slang-emit-cuda.cpp b/source/slang/slang-emit-cuda.cpp
index ab7ee8f58..05485855c 100644
--- a/source/slang/slang-emit-cuda.cpp
+++ b/source/slang/slang-emit-cuda.cpp
@@ -810,9 +810,9 @@ void CUDASourceEmitter::emitVarDecorationsImpl(IRInst* varDecl)
Super::emitVarDecorationsImpl(varDecl);
}
-void CUDASourceEmitter::emitMatrixLayoutModifiersImpl(IRVarLayout* layout)
+void CUDASourceEmitter::emitMatrixLayoutModifiersImpl(IRType* varType)
{
- Super::emitMatrixLayoutModifiersImpl(layout);
+ Super::emitMatrixLayoutModifiersImpl(varType);
}
bool CUDASourceEmitter::tryEmitGlobalParamImpl(IRGlobalParam* varDecl, IRType* varType)
diff --git a/source/slang/slang-emit-cuda.h b/source/slang/slang-emit-cuda.h
index ac7a33302..8b9c98c41 100644
--- a/source/slang/slang-emit-cuda.h
+++ b/source/slang/slang-emit-cuda.h
@@ -76,7 +76,7 @@ protected:
virtual void emitSimpleValueImpl(IRInst* inst) SLANG_OVERRIDE;
virtual void emitVectorTypeNameImpl(IRType* elementType, IRIntegerValue elementCount) SLANG_OVERRIDE;
virtual void emitVarDecorationsImpl(IRInst* varDecl) SLANG_OVERRIDE;
- virtual void emitMatrixLayoutModifiersImpl(IRVarLayout* layout) SLANG_OVERRIDE;
+ virtual void emitMatrixLayoutModifiersImpl(IRType* varType) SLANG_OVERRIDE;
virtual void emitFunctionPreambleImpl(IRInst* inst) SLANG_OVERRIDE;
virtual void _maybeEmitExportLike(IRInst* inst) SLANG_OVERRIDE { SLANG_UNUSED(inst); }
diff --git a/source/slang/slang-emit-glsl.cpp b/source/slang/slang-emit-glsl.cpp
index fff1cddbe..56113409d 100644
--- a/source/slang/slang-emit-glsl.cpp
+++ b/source/slang/slang-emit-glsl.cpp
@@ -2850,28 +2850,28 @@ void GLSLSourceEmitter::emitVarDecorationsImpl(IRInst* varDecl)
}
-void GLSLSourceEmitter::emitMatrixLayoutModifiersImpl(IRVarLayout* layout)
+void GLSLSourceEmitter::emitMatrixLayoutModifiersImpl(IRType* varType)
{
// When a variable has a matrix type, we want to emit an explicit
// layout qualifier based on what the layout has been computed to be.
//
- auto typeLayout = layout->getTypeLayout()->unwrapArray();
+ auto matrixType = as<IRMatrixType>(unwrapArray(varType));
- if (auto matrixTypeLayout = as<IRMatrixTypeLayout>(typeLayout))
+ if (matrixType)
{
// Reminder: the meaning of row/column major layout
// in our semantics is the *opposite* of what GLSL
// calls them, because what they call "columns"
// are what we call "rows."
//
- switch (matrixTypeLayout->getMode())
+ switch (getIntVal(matrixType->getLayout()))
{
- case kMatrixLayoutMode_ColumnMajor:
+ case SLANG_MATRIX_LAYOUT_COLUMN_MAJOR:
m_writer->emit("layout(row_major)\n");
break;
- case kMatrixLayoutMode_RowMajor:
+ case SLANG_MATRIX_LAYOUT_ROW_MAJOR:
m_writer->emit("layout(column_major)\n");
break;
}
diff --git a/source/slang/slang-emit-glsl.h b/source/slang/slang-emit-glsl.h
index cc8a4b02d..8958c7608 100644
--- a/source/slang/slang-emit-glsl.h
+++ b/source/slang/slang-emit-glsl.h
@@ -42,7 +42,7 @@ protected:
virtual void emitSimpleTypeImpl(IRType* type) SLANG_OVERRIDE;
virtual void emitVectorTypeNameImpl(IRType* elementType, IRIntegerValue elementCount) SLANG_OVERRIDE;
virtual void emitVarDecorationsImpl(IRInst* varDecl) SLANG_OVERRIDE;
- virtual void emitMatrixLayoutModifiersImpl(IRVarLayout* layout) SLANG_OVERRIDE;
+ virtual void emitMatrixLayoutModifiersImpl(IRType* varType) SLANG_OVERRIDE;
virtual void emitTypeImpl(IRType* type, const StringSliceLoc* nameAndLoc) SLANG_OVERRIDE;
virtual void emitParamTypeImpl(IRType* type, String const& name) SLANG_OVERRIDE;
virtual void emitFuncDecorationImpl(IRDecoration* decoration) SLANG_OVERRIDE;
diff --git a/source/slang/slang-emit-hlsl.cpp b/source/slang/slang-emit-hlsl.cpp
index a867d4c06..f9765a555 100644
--- a/source/slang/slang-emit-hlsl.cpp
+++ b/source/slang/slang-emit-hlsl.cpp
@@ -959,15 +959,37 @@ void HLSLSourceEmitter::emitSimpleTypeImpl(IRType* type)
case kIROp_MatrixType:
{
auto matType = (IRMatrixType*)type;
-
- // TODO(tfoley): should really emit these with sugar
- m_writer->emit("matrix<");
- emitType(matType->getElementType());
- m_writer->emit(",");
- emitVal(matType->getRowCount(), getInfo(EmitOp::General));
- m_writer->emit(",");
- emitVal(matType->getColumnCount(), getInfo(EmitOp::General));
- m_writer->emit("> ");
+ bool canUseSugar = true;
+ switch (matType->getElementType()->getOp())
+ {
+ case kIROp_IntType:
+ case kIROp_UIntType:
+ case kIROp_FloatType:
+ canUseSugar = true;
+ break;
+ default:
+ canUseSugar = false;
+ break;
+ }
+ if (!as<IRIntLit>(matType->getRowCount()) || !as<IRIntLit>(matType->getColumnCount()))
+ canUseSugar = false;
+ if (canUseSugar)
+ {
+ emitType(matType->getElementType());
+ m_writer->emitInt64(getIntVal(matType->getRowCount()));
+ m_writer->emit("x");
+ m_writer->emitInt64(getIntVal(matType->getColumnCount()));
+ }
+ else
+ {
+ m_writer->emit("matrix<");
+ emitType(matType->getElementType());
+ m_writer->emit(",");
+ emitVal(matType->getRowCount(), getInfo(EmitOp::General));
+ m_writer->emit(",");
+ emitVal(matType->getColumnCount(), getInfo(EmitOp::General));
+ m_writer->emit("> ");
+ }
return;
}
case kIROp_SamplerStateType:
@@ -1306,25 +1328,24 @@ void HLSLSourceEmitter::emitVarDecorationsImpl(IRInst* varDecl)
}
}
-void HLSLSourceEmitter::emitMatrixLayoutModifiersImpl(IRVarLayout* layout)
+void HLSLSourceEmitter::emitMatrixLayoutModifiersImpl(IRType* type)
{
- // When a variable has a matrix type, we want to emit an explicit
- // layout qualifier based on what the layout has been computed to be.
- //
-
- auto typeLayout = layout->getTypeLayout()->unwrapArray();
-
- if (auto matrixTypeLayout = as<IRMatrixTypeLayout>(typeLayout))
+ auto matType = as<IRMatrixType>(type);
+ if (!matType)
+ return;
+ auto matrixLayout = getIntVal(matType->getLayout());
+ if (getTargetProgram()->getOptionSet().getMatrixLayoutMode() != (MatrixLayoutMode)matrixLayout)
{
- switch (matrixTypeLayout->getMode())
+ switch (matrixLayout)
{
- case kMatrixLayoutMode_ColumnMajor:
- m_writer->emit("column_major ");
- break;
-
- case kMatrixLayoutMode_RowMajor:
- m_writer->emit("row_major ");
- break;
+ case SLANG_MATRIX_LAYOUT_COLUMN_MAJOR:
+ m_writer->emit("column_major ");
+ break;
+ case SLANG_MATRIX_LAYOUT_ROW_MAJOR:
+ m_writer->emit("row_major ");
+ break;
+ default:
+ break;
}
}
}
diff --git a/source/slang/slang-emit-hlsl.h b/source/slang/slang-emit-hlsl.h
index 2137a6d3d..4d721a1ac 100644
--- a/source/slang/slang-emit-hlsl.h
+++ b/source/slang/slang-emit-hlsl.h
@@ -45,7 +45,8 @@ protected:
virtual void emitSimpleTypeImpl(IRType* type) SLANG_OVERRIDE;
virtual void emitVectorTypeNameImpl(IRType* elementType, IRIntegerValue elementCount) SLANG_OVERRIDE;
virtual void emitVarDecorationsImpl(IRInst* varDecl) SLANG_OVERRIDE;
- virtual void emitMatrixLayoutModifiersImpl(IRVarLayout* layout) SLANG_OVERRIDE;
+ virtual void emitMatrixLayoutModifiersImpl(IRType* varType) SLANG_OVERRIDE;
+ virtual void emitParamTypeModifier(IRType* type) SLANG_OVERRIDE { emitMatrixLayoutModifiersImpl(type); }
virtual bool tryEmitInstExprImpl(IRInst* inst, const EmitOpInfo& inOuterPrec) SLANG_OVERRIDE;
virtual void emitSimpleValueImpl(IRInst* inst) SLANG_OVERRIDE;
diff --git a/source/slang/slang-emit-metal.cpp b/source/slang/slang-emit-metal.cpp
index 61e310401..a0fe220e5 100644
--- a/source/slang/slang-emit-metal.cpp
+++ b/source/slang/slang-emit-metal.cpp
@@ -1091,7 +1091,7 @@ void MetalSourceEmitter::emitVarDecorationsImpl(IRInst* varInst)
SLANG_UNUSED(varInst);
}
-void MetalSourceEmitter::emitMatrixLayoutModifiersImpl(IRVarLayout*)
+void MetalSourceEmitter::emitMatrixLayoutModifiersImpl(IRType*)
{
// Metal only supports column major layout, and we must have
// already translated all matrix ops to assume column-major
diff --git a/source/slang/slang-emit-metal.h b/source/slang/slang-emit-metal.h
index 6460b076a..67aa0d506 100644
--- a/source/slang/slang-emit-metal.h
+++ b/source/slang/slang-emit-metal.h
@@ -44,7 +44,7 @@ protected:
virtual void emitParamTypeImpl(IRType* type, String const& name) SLANG_OVERRIDE;
virtual void emitVectorTypeNameImpl(IRType* elementType, IRIntegerValue elementCount) SLANG_OVERRIDE;
virtual void emitVarDecorationsImpl(IRInst* varDecl) SLANG_OVERRIDE;
- virtual void emitMatrixLayoutModifiersImpl(IRVarLayout* layout) SLANG_OVERRIDE;
+ virtual void emitMatrixLayoutModifiersImpl(IRType* varType) SLANG_OVERRIDE;
virtual bool tryEmitInstExprImpl(IRInst* inst, const EmitOpInfo& inOuterPrec) SLANG_OVERRIDE;
virtual bool tryEmitInstStmtImpl(IRInst* inst) SLANG_OVERRIDE;
diff --git a/source/slang/slang-type-layout.cpp b/source/slang/slang-type-layout.cpp
index 7d6d047d3..f654135a1 100644
--- a/source/slang/slang-type-layout.cpp
+++ b/source/slang/slang-type-layout.cpp
@@ -606,6 +606,28 @@ struct CUDALayoutRulesImpl : DefaultLayoutRulesImpl
}
};
+struct MetalLayoutRulesImpl : public CPULayoutRulesImpl
+{
+ SimpleLayoutInfo GetVectorLayout(BaseType elementType, SimpleLayoutInfo elementInfo, size_t elementCount) override
+ {
+ SLANG_UNUSED(elementType);
+
+ const auto elementSize = elementInfo.size.getFiniteValue();
+ auto alignedElementCount = 1 << Math::Log2Ceil((uint32_t)elementCount);
+
+ // Metal aligns vectors to 2/4 element boundaries.
+ size_t size = elementSize * elementCount;
+ size_t alignment = alignedElementCount * elementSize;
+
+ SimpleLayoutInfo vectorInfo;
+ vectorInfo.kind = elementInfo.kind;
+ vectorInfo.size = size;
+ vectorInfo.alignment = alignment;
+
+ return vectorInfo;
+ }
+};
+
struct HLSLStructuredBufferLayoutRulesImpl : DefaultLayoutRulesImpl
{
// HLSL structured buffers drop the restrictions added for constant buffers,
@@ -1696,6 +1718,7 @@ struct MetalArgumentBufferElementLayoutRulesImpl : ObjectLayoutRulesImpl, Defaul
static MetalObjectLayoutRulesImpl kMetalObjectLayoutRulesImpl;
static MetalArgumentBufferElementLayoutRulesImpl kMetalArgumentBufferElementLayoutRulesImpl;
+static MetalLayoutRulesImpl kMetalLayoutRulesImpl;
LayoutRulesImpl kMetalAnyValueLayoutRulesImpl_ = {
&kMetalLayoutRulesFamilyImpl,
@@ -1704,7 +1727,7 @@ LayoutRulesImpl kMetalAnyValueLayoutRulesImpl_ = {
};
LayoutRulesImpl kMetalConstantBufferLayoutRulesImpl_ = {
- &kMetalLayoutRulesFamilyImpl, & kCPULayoutRulesImpl, &kMetalObjectLayoutRulesImpl,
+ &kMetalLayoutRulesFamilyImpl, & kMetalLayoutRulesImpl, &kMetalObjectLayoutRulesImpl,
};
LayoutRulesImpl kMetalParameterBlockLayoutRulesImpl_ = {
@@ -1712,7 +1735,7 @@ LayoutRulesImpl kMetalParameterBlockLayoutRulesImpl_ = {
};
LayoutRulesImpl kMetalStructuredBufferLayoutRulesImpl_ = {
- &kMetalLayoutRulesFamilyImpl, &kCPULayoutRulesImpl, & kMetalObjectLayoutRulesImpl,
+ &kMetalLayoutRulesFamilyImpl, &kMetalLayoutRulesImpl, & kMetalObjectLayoutRulesImpl,
};
LayoutRulesImpl kMetalVaryingInputLayoutRulesImpl_ = {
diff --git a/tests/compute/constant-buffer-memory-packing.slang b/tests/compute/constant-buffer-memory-packing.slang
index 5246c4d33..fb7a78fc1 100644
--- a/tests/compute/constant-buffer-memory-packing.slang
+++ b/tests/compute/constant-buffer-memory-packing.slang
@@ -3,31 +3,31 @@
// Metal/CPP/CUDA do not deal with packing currently, different results will occur.
//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-cpu -compute -xslang -DTARGET_WITHOUT_PACKING
//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-cuda -compute -xslang -DTARGET_WITHOUT_PACKING
-//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-mtl -compute -xslang -DTARGET_WITHOUT_PACKING
-//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-slang -compute -dx12
-//TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute
//TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute -emit-spirv-via-glsl
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-slang -compute
+//TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-mtl -compute
-// CPP/Metal/CUDA due to not having memory packing will recieve the following ROW matrix:
+// CPP/CUDA due to natural layout rules will recieve the following ROW matrix:
// {1,2,3}
// {0,4,5}
// {6,0,7}
-// GLSL/SPIRV/HLSL due to having memory packing will recieve the following ROW/COL matrix:
+// GLSL/SPIRV/HLSL/Metal with cbuffer layout rules will recieve the following ROW/COL matrix:
// {1,2,3}
-// {0,4,5}
-// {6,0,7}
+// {4,5,6}
+// {7,8,9}
-//TEST_INPUT:cbuffer(data=[1.0 2.0 3.0 0.0 4.0 5.0 6.0 0.0 7.0 8.0 9.0 0]):name matrixTestCBuf1
+//TEST_INPUT:cbuffer(data=[1.0 2.0 3.0 0.0 4.0 5.0 6.0 0.0 7.0 8.0 9.0 0.0]):name matrixTestCBuf1
ConstantBuffer<row_major float3x3> matrixTestCBuf1;
// CPP/Metal/CUDA due to not having memory packing will recieve the following COL matrix post-transpose:
-// {1,0,8}
-// {4,2,0}
-// {7,5,3}
+// {1,0,6}
+// {2,4,0}
+// {3,5,7}
-//TEST_INPUT:cbuffer(data=[1.0 4.0 7.0 0.0 2.0 5.0 8.0 0.0 3.0 6.0 9.0 0.0]):name matrixTestCBuf2
+//TEST_INPUT:cbuffer(data=[1.0 2.0 3.0 0.0 4.0 5.0 6.0 0.0 7.0 8.0 9.0 0.0]):name matrixTestCBuf2
ConstantBuffer<column_major float3x3> matrixTestCBuf2;
//TEST_INPUT:cbuffer(data=[1.0 2.0 3.0 0.0 4.0 5.0 6.0 0.0]):name NeedsPadding
@@ -55,34 +55,7 @@ void computeMain(uint3 tid : SV_DispatchThreadID)
matrixTest2 = matrixTestCBuf2;
output[0] = uint(true
-#ifndef TARGET_WITHOUT_PACKING
- && floatCheck(matrixTest1[0][0], 1)
- && floatCheck(matrixTest1[0][1], 2)
- && floatCheck(matrixTest1[0][2], 3)
- && floatCheck(matrixTest1[1][0], 4)
- && floatCheck(matrixTest1[1][1], 5)
- && floatCheck(matrixTest1[1][2], 6)
- && floatCheck(matrixTest1[2][0], 7)
- && floatCheck(matrixTest1[2][1], 8)
- && floatCheck(matrixTest1[2][2], 9)
-
- && floatCheck(matrixTest2[0][0], 1)
- && floatCheck(matrixTest2[0][1], 2)
- && floatCheck(matrixTest2[0][2], 3)
- && floatCheck(matrixTest2[1][0], 4)
- && floatCheck(matrixTest2[1][1], 5)
- && floatCheck(matrixTest2[1][2], 6)
- && floatCheck(matrixTest2[2][0], 7)
- && floatCheck(matrixTest2[2][1], 8)
- && floatCheck(matrixTest2[2][2], 9)
-
- && floatCheck(data1[0], 1)
- && floatCheck(data1[1], 2)
- && floatCheck(data1[2], 3)
- && floatCheck(data2[0], 4)
- && floatCheck(data2[1], 5)
- && floatCheck(data2[2], 6)
-#else
+#ifdef TARGET_WITHOUT_PACKING
&& floatCheck(matrixTest1[0][0], 1)
&& floatCheck(matrixTest1[0][1], 2)
&& floatCheck(matrixTest1[0][2], 3)
@@ -95,13 +68,13 @@ void computeMain(uint3 tid : SV_DispatchThreadID)
&& floatCheck(matrixTest2[0][0], 1)
&& floatCheck(matrixTest2[0][1], 0)
- && floatCheck(matrixTest2[0][2], 8)
- && floatCheck(matrixTest2[1][0], 4)
- && floatCheck(matrixTest2[1][1], 2)
+ && floatCheck(matrixTest2[0][2], 6)
+ && floatCheck(matrixTest2[1][0], 2)
+ && floatCheck(matrixTest2[1][1], 4)
&& floatCheck(matrixTest2[1][2], 0)
- && floatCheck(matrixTest2[2][0], 7)
+ && floatCheck(matrixTest2[2][0], 3)
&& floatCheck(matrixTest2[2][1], 5)
- && floatCheck(matrixTest2[2][2], 3)
+ && floatCheck(matrixTest2[2][2], 7)
&& floatCheck(data1[0], 1)
&& floatCheck(data1[1], 2)
@@ -109,10 +82,34 @@ void computeMain(uint3 tid : SV_DispatchThreadID)
&& floatCheck(data2[0], 0)
&& floatCheck(data2[1], 4)
&& floatCheck(data2[2], 5)
+#else
+ && floatCheck(matrixTest1[0][0], 1)
+ && floatCheck(matrixTest1[0][1], 2)
+ && floatCheck(matrixTest1[0][2], 3)
+ && floatCheck(matrixTest1[1][0], 4)
+ && floatCheck(matrixTest1[1][1], 5)
+ && floatCheck(matrixTest1[1][2], 6)
+ && floatCheck(matrixTest1[2][0], 7)
+ && floatCheck(matrixTest1[2][1], 8)
+ && floatCheck(matrixTest1[2][2], 9)
+
+ && floatCheck(matrixTest2[0][0], 1)
+ && floatCheck(matrixTest2[0][1], 4)
+ && floatCheck(matrixTest2[0][2], 7)
+ && floatCheck(matrixTest2[1][0], 2)
+ && floatCheck(matrixTest2[1][1], 5)
+ && floatCheck(matrixTest2[1][2], 8)
+ && floatCheck(matrixTest2[2][0], 3)
+ && floatCheck(matrixTest2[2][1], 6)
+ && floatCheck(matrixTest2[2][2], 9)
+
+ && floatCheck(data1[0], 1)
+ && floatCheck(data1[1], 2)
+ && floatCheck(data1[2], 3)
+ && floatCheck(data2[0], 4)
+ && floatCheck(data2[1], 5)
+ && floatCheck(data2[2], 6)
#endif
);
- output[1] = (uint)matrixTest2[0][0];
- output[2] = (uint)matrixTest2[0][1];
- output[3] = (uint)matrixTest2[0][2];
//BUF: 1
}
diff --git a/tests/language-feature/types/matrix-layout-uniform.slang b/tests/language-feature/types/matrix-layout-uniform.slang
new file mode 100644
index 000000000..ed72ccdca
--- /dev/null
+++ b/tests/language-feature/types/matrix-layout-uniform.slang
@@ -0,0 +1,19 @@
+//TEST:SIMPLE(filecheck=HLSL): -target hlsl -profile vs_6_0 -entry Main
+
+// HLSL: #pragma pack_matrix(column_major)
+// HLSL-NOT: row_major float4x4 worldToClip
+// HLSL: row_major float4x4 instanceMeshToWorld
+
+[shader("vertex")]
+void Main(
+ uniform column_major float4x4 worldToClip,
+ out float4 SV_Position : SV_Position,
+ in row_major float4x4 instanceMeshToWorld : instanceMeshToWorld,
+ in float3 vertexPositionInMesh : vertexPositionInMesh
+)
+{
+ SV_Position = mul(
+ mul(worldToClip, instanceMeshToWorld),
+ float4(vertexPositionInMesh, 1.f),
+ );
+} \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 19:30:18 +0000