Merge pull request KhronosGroup#327 from gnl21/gnl-image-dims

johnkslang · web-flow · commit 3834d41284f2 · 2023-03-22T22:59:23.000+07:00
Simplify enabling capabilities for image Dim
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
@@ -11032,12 +11032,11 @@
         {
           "enumerant" : "1D",
           "value" : 0,
-          "capabilities" : [ "Sampled1D", "Image1D" ]
+          "capabilities" : [ "Sampled1D" ]
         },
         {
           "enumerant" : "2D",
-          "value" : 1,
-          "capabilities" : [ "Shader", "Kernel", "ImageMSArray" ]
+          "value" : 1
         },
         {
           "enumerant" : "3D",
@@ -11046,17 +11045,17 @@
         {
           "enumerant" : "Cube",
           "value" : 3,
-          "capabilities" : [ "Shader", "ImageCubeArray" ]
+          "capabilities" : [ "Shader" ]
         },
         {
           "enumerant" : "Rect",
           "value" : 4,
-          "capabilities" : [ "SampledRect", "ImageRect" ]
+          "capabilities" : [ "SampledRect" ]
         },
         {
           "enumerant" : "Buffer",
           "value" : 5,
-          "capabilities" : [ "SampledBuffer", "ImageBuffer" ]
+          "capabilities" : [ "SampledBuffer" ]
         },
         {
           "enumerant" : "SubpassData",

Original file line number	Diff line number	Diff line change
`@@ -11032,12 +11032,11 @@`
`11032`	`11032`	`{`
`11033`	`11033`	`"enumerant" : "1D",`
`11034`	`11034`	`"value" : 0,`
`11035`		`- "capabilities" : [ "Sampled1D", "Image1D" ]`
	`11035`	`+ "capabilities" : [ "Sampled1D" ]`
`11036`	`11036`	`},`
`11037`	`11037`	`{`
`11038`	`11038`	`"enumerant" : "2D",`
`11039`		`- "value" : 1,`
`11040`		`- "capabilities" : [ "Shader", "Kernel", "ImageMSArray" ]`
	`11039`	`+ "value" : 1`
`11041`	`11040`	`},`
`11042`	`11041`	`{`
`11043`	`11042`	`"enumerant" : "3D",`
`@@ -11046,17 +11045,17 @@`
`11046`	`11045`	`{`
`11047`	`11046`	`"enumerant" : "Cube",`
`11048`	`11047`	`"value" : 3,`
`11049`		`- "capabilities" : [ "Shader", "ImageCubeArray" ]`
	`11048`	`+ "capabilities" : [ "Shader" ]`
`11050`	`11049`	`},`
`11051`	`11050`	`{`
`11052`	`11051`	`"enumerant" : "Rect",`
`11053`	`11052`	`"value" : 4,`
`11054`		`- "capabilities" : [ "SampledRect", "ImageRect" ]`
	`11053`	`+ "capabilities" : [ "SampledRect" ]`
`11055`	`11054`	`},`
`11056`	`11055`	`{`
`11057`	`11056`	`"enumerant" : "Buffer",`
`11058`	`11057`	`"value" : 5,`
`11059`		`- "capabilities" : [ "SampledBuffer", "ImageBuffer" ]`
	`11058`	`+ "capabilities" : [ "SampledBuffer" ]`
`11060`	`11059`	`},`
`11061`	`11060`	`{`
`11062`	`11061`	`"enumerant" : "SubpassData",`