Revert "Merge pull request KhronosGroup#367 from dneto0/coop-matrix-enums-deps"

dneto0 · dneto0 · commit c43effd54686 · 2023-08-10T12:25:32.000-04:00
This reverts commit 124a966, reversing changes made to f14a663.
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
@@ -15390,37 +15390,31 @@
         {
           "enumerant" : "NoneKHR",
           "value" : "0x0000",
-          "extensions" : [ "SPV_KHR_cooperative_matrix" ],
           "version" : "None"
         },
         {
           "enumerant" : "MatrixASignedComponentsKHR",
           "value" : "0x0001",
-          "extensions" : [ "SPV_KHR_cooperative_matrix" ],
           "version" : "None"
         },
         {
           "enumerant" : "MatrixBSignedComponentsKHR",
           "value" : "0x0002",
-          "extensions" : [ "SPV_KHR_cooperative_matrix" ],
           "version" : "None"
         },
         {
           "enumerant" : "MatrixCSignedComponentsKHR",
           "value" : "0x0004",
-          "extensions" : [ "SPV_KHR_cooperative_matrix" ],
           "version" : "None"
         },
         {
           "enumerant" : "MatrixResultSignedComponentsKHR",
           "value" : "0x0008",
-          "extensions" : [ "SPV_KHR_cooperative_matrix" ],
           "version" : "None"
         },
         {
           "enumerant" : "SaturatingAccumulationKHR",
           "value" : "0x0010",
-          "extensions" : [ "SPV_KHR_cooperative_matrix" ],
           "version" : "None"
         }
       ]
@@ -15432,13 +15426,11 @@
         {
           "enumerant" : "RowMajorKHR",
           "value" : 0,
-          "extensions" : [ "SPV_KHR_cooperative_matrix" ],
           "version" : "None"
         },
         {
           "enumerant" : "ColumnMajorKHR",
           "value" : 1,
-          "extensions" : [ "SPV_KHR_cooperative_matrix" ],
           "version" : "None"
         }
       ]
@@ -15450,19 +15442,16 @@
         {
           "enumerant" : "MatrixAKHR",
           "value" : 0,
-          "extensions" : [ "SPV_KHR_cooperative_matrix" ],
           "version" : "None"
         },
         {
           "enumerant" : "MatrixBKHR",
           "value" : 1,
-          "extensions" : [ "SPV_KHR_cooperative_matrix" ],
           "version" : "None"
         },
         {
           "enumerant" : "MatrixAccumulatorKHR",
           "value" : 2,
-          "extensions" : [ "SPV_KHR_cooperative_matrix" ],
           "version" : "None"
         }
       ]

Original file line number	Diff line number	Diff line change
`@@ -15390,37 +15390,31 @@`
`15390`	`15390`	`{`
`15391`	`15391`	`"enumerant" : "NoneKHR",`
`15392`	`15392`	`"value" : "0x0000",`
`15393`		`- "extensions" : [ "SPV_KHR_cooperative_matrix" ],`
`15394`	`15393`	`"version" : "None"`
`15395`	`15394`	`},`
`15396`	`15395`	`{`
`15397`	`15396`	`"enumerant" : "MatrixASignedComponentsKHR",`
`15398`	`15397`	`"value" : "0x0001",`
`15399`		`- "extensions" : [ "SPV_KHR_cooperative_matrix" ],`
`15400`	`15398`	`"version" : "None"`
`15401`	`15399`	`},`
`15402`	`15400`	`{`
`15403`	`15401`	`"enumerant" : "MatrixBSignedComponentsKHR",`
`15404`	`15402`	`"value" : "0x0002",`
`15405`		`- "extensions" : [ "SPV_KHR_cooperative_matrix" ],`
`15406`	`15403`	`"version" : "None"`
`15407`	`15404`	`},`
`15408`	`15405`	`{`
`15409`	`15406`	`"enumerant" : "MatrixCSignedComponentsKHR",`
`15410`	`15407`	`"value" : "0x0004",`
`15411`		`- "extensions" : [ "SPV_KHR_cooperative_matrix" ],`
`15412`	`15408`	`"version" : "None"`
`15413`	`15409`	`},`
`15414`	`15410`	`{`
`15415`	`15411`	`"enumerant" : "MatrixResultSignedComponentsKHR",`
`15416`	`15412`	`"value" : "0x0008",`
`15417`		`- "extensions" : [ "SPV_KHR_cooperative_matrix" ],`
`15418`	`15413`	`"version" : "None"`
`15419`	`15414`	`},`
`15420`	`15415`	`{`
`15421`	`15416`	`"enumerant" : "SaturatingAccumulationKHR",`
`15422`	`15417`	`"value" : "0x0010",`
`15423`		`- "extensions" : [ "SPV_KHR_cooperative_matrix" ],`
`15424`	`15418`	`"version" : "None"`
`15425`	`15419`	`}`
`15426`	`15420`	`]`
`@@ -15432,13 +15426,11 @@`
`15432`	`15426`	`{`
`15433`	`15427`	`"enumerant" : "RowMajorKHR",`
`15434`	`15428`	`"value" : 0,`
`15435`		`- "extensions" : [ "SPV_KHR_cooperative_matrix" ],`
`15436`	`15429`	`"version" : "None"`
`15437`	`15430`	`},`
`15438`	`15431`	`{`
`15439`	`15432`	`"enumerant" : "ColumnMajorKHR",`
`15440`	`15433`	`"value" : 1,`
`15441`		`- "extensions" : [ "SPV_KHR_cooperative_matrix" ],`
`15442`	`15434`	`"version" : "None"`
`15443`	`15435`	`}`
`15444`	`15436`	`]`
`@@ -15450,19 +15442,16 @@`
`15450`	`15442`	`{`
`15451`	`15443`	`"enumerant" : "MatrixAKHR",`
`15452`	`15444`	`"value" : 0,`
`15453`		`- "extensions" : [ "SPV_KHR_cooperative_matrix" ],`
`15454`	`15445`	`"version" : "None"`
`15455`	`15446`	`},`
`15456`	`15447`	`{`
`15457`	`15448`	`"enumerant" : "MatrixBKHR",`
`15458`	`15449`	`"value" : 1,`
`15459`		`- "extensions" : [ "SPV_KHR_cooperative_matrix" ],`
`15460`	`15450`	`"version" : "None"`
`15461`	`15451`	`},`
`15462`	`15452`	`{`
`15463`	`15453`	`"enumerant" : "MatrixAccumulatorKHR",`
`15464`	`15454`	`"value" : 2,`
`15465`		`- "extensions" : [ "SPV_KHR_cooperative_matrix" ],`
`15466`	`15455`	`"version" : "None"`
`15467`	`15456`	`}`
`15468`	`15457`	`]`