ClspvReflection non-sematic: add NormalizedSamplerMaskPushConstant (KhronosGroup#377)

rjodinchr · web-flow · commit 4183b260f4cc · 2023-10-11T10:38:39.000-04:00
This is needed to implement 3D Image read using unnormalised sampler. Ref google/clspv#1202
diff --git a/include/spirv/unified1/NonSemanticClspvReflection.h b/include/spirv/unified1/NonSemanticClspvReflection.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 enum {
-    NonSemanticClspvReflectionRevision = 5,
+    NonSemanticClspvReflectionRevision = 6,
     NonSemanticClspvReflectionRevision_BitWidthPadding = 0x7fffffff
 };
 
@@ -78,6 +78,7 @@ enum NonSemanticClspvReflectionInstructions {
     NonSemanticClspvReflectionPrintfInfo = 38,
     NonSemanticClspvReflectionPrintfBufferStorageBuffer = 39,
     NonSemanticClspvReflectionPrintfBufferPointerPushConstant = 40,
+    NonSemanticClspvReflectionNormalizedSamplerMaskPushConstant = 41,
     NonSemanticClspvReflectionInstructionsMax = 0x7fffffff
 };
 
diff --git a/include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json b/include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json
@@ -1,5 +1,5 @@
 {
-  "revision" : 5,
+  "revision" : 6,
   "instructions" : [
     {
       "opname" : "Kernel",
@@ -395,6 +395,16 @@
       { "kind" : "IdRef", "name" : "Size"},
       { "kind" : "IdRef", "name" : "BufferSize"}
       ]
+    },
+    {
+    "opname" : "NormalizedSamplerMaskPushConstant",
+    "opcode" : 41,
+    "operands" : [
+      { "kind" : "IdRef", "name" : "Kernel" },
+      { "kind" : "IdRef", "name" : "Ordinal" },
+      { "kind" : "IdRef", "name" : "Offset" },
+      { "kind" : "IdRef", "name" : "Size" }
+      ]
     }
   ],
   "operand_kinds" : [

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "revision" : 5,`
	`2`	`+ "revision" : 6,`
`3`	`3`	`"instructions" : [`
`4`	`4`	`{`
`5`	`5`	`"opname" : "Kernel",`
`@@ -395,6 +395,16 @@`
`395`	`395`	`{ "kind" : "IdRef", "name" : "Size"},`
`396`	`396`	`{ "kind" : "IdRef", "name" : "BufferSize"}`
`397`	`397`	`]`
	`398`	`+ },`
	`399`	`+ {`
	`400`	`+ "opname" : "NormalizedSamplerMaskPushConstant",`
	`401`	`+ "opcode" : 41,`
	`402`	`+ "operands" : [`
	`403`	`+ { "kind" : "IdRef", "name" : "Kernel" },`
	`404`	`+ { "kind" : "IdRef", "name" : "Ordinal" },`
	`405`	`+ { "kind" : "IdRef", "name" : "Offset" },`
	`406`	`+ { "kind" : "IdRef", "name" : "Size" }`
	`407`	`+ ]`
`398`	`408`	`}`
`399`	`409`	`],`
`400`	`410`	`"operand_kinds" : [`