[HLSL] Matrix constructors is using the initalizer index when it needs to convert the index to a column major index #165663
Description
Today Matrix initalization is just taking in the index from the initalizer list:
llvm-project/clang/lib/Sema/SemaInit.cpp
Lines 1907 to 1913 in 15bbdd1
This means we aren't reordering the index to account for layout DXC is expecting.
The fix seems to be
@@ -1906,10 +1906,12 @@ void InitListChecker::CheckMatrixType(const InitializedEntity &Entity, while (NumEltsInit < MaxElts && Index < IList->getNumInits()) { // Not a sublist: just consume directly. - ElemEnt.setElementIndex(Index); - CheckSubElementType(ElemEnt, IList, ElemTy, Index, StructuredList, + unsigned ColMajorIndex = (Index % MT->getNumRows()) * MT->getNumColumns() + (Index / MT->getNumRows()); + ElemEnt.setElementIndex(ColMajorIndex); + CheckSubElementType(ElemEnt, IList, ElemTy, ColMajorIndex, StructuredList, StructuredIndex); ++NumEltsInit; + ++Index; }Metadata
Metadata
Assignees
Type
Projects
Status