Merge branch 'main' into GetDimensions

Author: luciechoi

docs/DXIL.rst

@@ -3076,7 +3076,7 @@ ID         Name                                     Description
 2147483656 RayQuery_CandidateTriangleObjectPosition returns candidate triangle vertices in object space as <9 x float>
 2147483657 RayQuery_CommittedTriangleObjectPosition returns committed triangle vertices in object space as <9 x float>
 2147483658 HitObject_TriangleObjectPosition         returns triangle vertices in object space as <9 x float>
-2147483659 CreateMatrix                             creates a handle to a Matrix
+2147483659 ReservedD0                               reserved
 2147483660 FillMatrix                               fills a matrix with a scalar value
 2147483661 CopyConvertMatrix                        Converts and copies the element and use type of the source matrix to the destination matrix with optional transpose
 2147483662 MatrixLoadFromDescriptor                 fills a matrix with data from a [RW]ByteAddressBuffer
@@ -3094,10 +3094,10 @@ ID         Name                                     Description
 2147483674 MatrixVecMulAdd                          Multiplies a MxK dimension matrix and a K sized input vector then adds a M sized bias vector
 2147483675 MatrixAccumulateToDescriptor             accumulates a matrix to a RWByteAddressBuffer
 2147483676 MatrixAccumulateToMemory                 accumulates a matrix to groupshared memory
-2147483677 MatrixOuterProduct                       Outer products an M sized vector and a K sized vector producing an MxK matrix
-2147483678 LinAlgMatrixReserved0                    reserved
-2147483679 LinAlgMatrixReserved1                    reserved
-2147483680 LinAlgMatrixReserved2                    reserved
+2147483677 MatrixOuterProduct                       Outer products an M sized vector and a N sized vector producing an MxN matrix
+2147483678 ReservedD1                               reserved
+2147483679 ReservedD2                               reserved
+2147483680 ReservedD3                               reserved
 2147483681 DebugBreak                               triggers a breakpoint if a debugger is attached
 2147483682 IsDebuggerPresent                        returns true if a debugger is attached
 ========== ======================================== ===================================================================================================================

docs/ReleaseNotes.md

@@ -37,6 +37,9 @@ line upon naming the release. Refer to previous for appropriate section names.
   - `dx::IsDebuggerPresent()` returns true if a debugger is attached.
   - SPIR-V: `DebugBreak()` emits `NonSemantic.DebugBreak` extended instruction; `IsDebuggerPresent()` is not supported.
 
+#### Other Changes
+- Fixed mesh shader semantics that were incorrectly case sensitive.
+
 ### Version 1.9.2602
 
 #### Shader Model 6.9 Release

include/dxc/DXIL/DxilConstants.h

@@ -524,9 +524,10 @@ static const OpCodeTableID TableID = OpCodeTableID::ExperimentalOps;
 // Enumeration for ExperimentalOps DXIL operations
 enum class OpCode : unsigned {
   //
-  LinAlgMatrixReserved0 = 30, // reserved
-  LinAlgMatrixReserved1 = 31, // reserved
-  LinAlgMatrixReserved2 = 32, // reserved
+  ReservedD0 = 11, // reserved
+  ReservedD1 = 30, // reserved
+  ReservedD2 = 31, // reserved
+  ReservedD3 = 32, // reserved
 
   // Debugging
   DebugBreak = 33,        // triggers a breakpoint if a debugger is attached
@@ -548,7 +549,6 @@ enum class OpCode : unsigned {
   CopyConvertMatrix =
       13, // Converts and copies the element and use type of the source matrix
           // to the destination matrix with optional transpose
-  CreateMatrix = 11,     // creates a handle to a Matrix
   FillMatrix = 12,       // fills a matrix with a scalar value
   MatrixAccumulate = 24, // accumulate A or B matrix into Accumulator matrix
                          // following LHS += RHS
@@ -568,8 +568,8 @@ enum class OpCode : unsigned {
       15, // fills a matrix with data from a groupshared array
   MatrixMulOp =
       23, // applies a multiplication op to matrix C using A and B as parameters
-  MatrixOuterProduct = 29, // Outer products an M sized vector and a K sized
-                           // vector producing an MxK matrix
+  MatrixOuterProduct = 29, // Outer products an M sized vector and a N sized
+                           // vector producing an MxN matrix
   MatrixQueryAccumulatorLayout = 22, // returns comptime 0 when accumulator
                                      // matrix are A layout, 1 when B layout
   MatrixSetElement = 19, // sets the element of the matrix corresponding to the
@@ -1258,8 +1258,8 @@ enum class OpCode : unsigned {
   EXP_OPCODE(ExperimentalOps,
              HitObject_TriangleObjectPosition), // returns triangle vertices in
                                                 // object space as <9 x float>
-  // CreateMatrix = 0x8000000B, 2147483659U, -2147483637
-  EXP_OPCODE(ExperimentalOps, CreateMatrix), // creates a handle to a Matrix
+  // ReservedD0 = 0x8000000B, 2147483659U, -2147483637
+  EXP_OPCODE(ExperimentalOps, ReservedD0), // reserved
   // FillMatrix = 0x8000000C, 2147483660U, -2147483636
   EXP_OPCODE(ExperimentalOps, FillMatrix), // fills a matrix with a scalar value
   // CopyConvertMatrix = 0x8000000D, 2147483661U, -2147483635
@@ -1332,14 +1332,14 @@ enum class OpCode : unsigned {
       MatrixAccumulateToMemory), // accumulates a matrix to groupshared memory
   // MatrixOuterProduct = 0x8000001D, 2147483677U, -2147483619
   EXP_OPCODE(ExperimentalOps,
-             MatrixOuterProduct), // Outer products an M sized vector and a K
-                                  // sized vector producing an MxK matrix
-  // LinAlgMatrixReserved0 = 0x8000001E, 2147483678U, -2147483618
-  EXP_OPCODE(ExperimentalOps, LinAlgMatrixReserved0), // reserved
-  // LinAlgMatrixReserved1 = 0x8000001F, 2147483679U, -2147483617
-  EXP_OPCODE(ExperimentalOps, LinAlgMatrixReserved1), // reserved
-  // LinAlgMatrixReserved2 = 0x80000020, 2147483680U, -2147483616
-  EXP_OPCODE(ExperimentalOps, LinAlgMatrixReserved2), // reserved
+             MatrixOuterProduct), // Outer products an M sized vector and a N
+                                  // sized vector producing an MxN matrix
+  // ReservedD1 = 0x8000001E, 2147483678U, -2147483618
+  EXP_OPCODE(ExperimentalOps, ReservedD1), // reserved
+  // ReservedD2 = 0x8000001F, 2147483679U, -2147483617
+  EXP_OPCODE(ExperimentalOps, ReservedD2), // reserved
+  // ReservedD3 = 0x80000020, 2147483680U, -2147483616
+  EXP_OPCODE(ExperimentalOps, ReservedD3), // reserved
   // DebugBreak = 0x80000021, 2147483681U, -2147483615
   EXP_OPCODE(ExperimentalOps,
              DebugBreak), // triggers a breakpoint if a debugger is attached
@@ -1506,7 +1506,6 @@ enum class OpCodeClass : unsigned {
 
   // Linear Algebra Operations
   CopyConvertMatrix,
-  CreateMatrix,
   FillMatrix,
   MatVecMul,
   MatVecMulAdd,
@@ -1714,7 +1713,7 @@ enum class OpCodeClass : unsigned {
   NodeOutputIsValid,
   OutputComplete,
 
-  NumOpClasses = 225, // exclusive last value of enumeration
+  NumOpClasses = 224, // exclusive last value of enumeration
 };
 // OPCODECLASS-ENUM:END