Skip to content

Commit 50bc4de

Browse files
rjodinchrrjodinchr
authored
VkspReflection non-sematic: remove literals for Ids (KhronosGroup#453)
https://gitlab.khronos.org/spirv/SPIR-V/-/issues/817
1 parent 07ddb1c commit 50bc4de

File tree

2 files changed

+86
-86
lines changed

2 files changed

+86
-86
lines changed

‎include/spirv/unified1/NonSemanticVkspReflection.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extern "C" {
3333
#endif
3434

3535
enum {
36-
NonSemanticVkspReflectionRevision = 3,
36+
NonSemanticVkspReflectionRevision = 4,
3737
NonSemanticVkspReflectionRevision_BitWidthPadding = 0x7fffffff
3838
};
3939

‎include/spirv/unified1/extinst.nonsemantic.vkspreflection.grammar.json

+85-85
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
2-
"revision" : 3,
2+
"revision" : 4,
33
"instructions" : [
44
{
55
"opname" : "Configuration",
66
"opcode" : 1,
77
"operands" : [
8-
{"kind" : "LiteralString", "name" : "enabledExtensionNames" },
9-
{"kind" : "LiteralInteger", "name" : "specializationInfoDataSize" },
10-
{"kind" : "LiteralString", "name" : "specializationInfoData" },
11-
{"kind" : "LiteralString", "name" : "shaderName" },
12-
{"kind" : "LiteralString", "name" : "EntryPoint" },
13-
{"kind" : "LiteralInteger", "name" : "groupCountX" },
14-
{"kind" : "LiteralInteger", "name" : "groupCountY" },
15-
{"kind" : "LiteralInteger", "name" : "groupCountZ" },
16-
{"kind" : "LiteralInteger", "name" : "dispatchId" }
8+
{"kind" : "IdRef", "name" : "enabledExtensionNames" },
9+
{"kind" : "IdRef", "name" : "specializationInfoDataSize" },
10+
{"kind" : "IdRef", "name" : "specializationInfoData" },
11+
{"kind" : "IdRef", "name" : "shaderName" },
12+
{"kind" : "IdRef", "name" : "EntryPoint" },
13+
{"kind" : "IdRef", "name" : "groupCountX" },
14+
{"kind" : "IdRef", "name" : "groupCountY" },
15+
{"kind" : "IdRef", "name" : "groupCountZ" },
16+
{"kind" : "IdRef", "name" : "dispatchId" }
1717
]
1818
},
1919
{
2020
"opname" : "StartCounter",
2121
"opcode" : 2,
2222
"operands" : [
23-
{"kind" : "LiteralString", "name" : "name" }
23+
{"kind" : "IdRef", "name" : "name" }
2424
]
2525
},
2626
{
@@ -34,104 +34,104 @@
3434
"opname" : "PushConstants",
3535
"opcode" : 4,
3636
"operands" : [
37-
{ "kind" : "LiteralInteger", "name" : "offset" },
38-
{ "kind" : "LiteralInteger", "name" : "size" },
39-
{ "kind" : "LiteralString", "name" : "pValues" },
40-
{ "kind" : "LiteralInteger", "name" : "stageFlags" }
37+
{ "kind" : "IdRef", "name" : "offset" },
38+
{ "kind" : "IdRef", "name" : "size" },
39+
{ "kind" : "IdRef", "name" : "pValues" },
40+
{ "kind" : "IdRef", "name" : "stageFlags" }
4141
]
4242
},
4343
{
4444
"opname" : "SpecializationMapEntry",
4545
"opcode" : 5,
4646
"operands" : [
47-
{"kind" : "LiteralInteger", "name" : "constantID" },
48-
{"kind" : "LiteralInteger", "name" : "offset" },
49-
{"kind" : "LiteralInteger", "name" : "size" }
47+
{"kind" : "IdRef", "name" : "constantID" },
48+
{"kind" : "IdRef", "name" : "offset" },
49+
{"kind" : "IdRef", "name" : "size" }
5050
]
5151
},
5252
{
5353
"opname" : "DescriptorSetBuffer",
5454
"opcode" : 6,
5555
"operands" : [
56-
{ "kind" : "LiteralInteger", "name" : "ds" },
57-
{ "kind" : "LiteralInteger", "name" : "binding" },
58-
{ "kind" : "LiteralInteger", "name" : "type" },
59-
{ "kind" : "LiteralInteger", "name" : "flags" },
60-
{ "kind" : "LiteralInteger", "name" : "queueFamilyIndexCount" },
61-
{ "kind" : "LiteralInteger", "name" : "sharingMode" },
62-
{ "kind" : "LiteralInteger", "name" : "size" },
63-
{ "kind" : "LiteralInteger", "name" : "usage" },
64-
{ "kind" : "LiteralInteger", "name" : "range" },
65-
{ "kind" : "LiteralInteger", "name" : "offset" },
66-
{ "kind" : "LiteralInteger", "name" : "memorySize" },
67-
{ "kind" : "LiteralInteger", "name" : "memoryType" },
68-
{ "kind" : "LiteralInteger", "name" : "bindOffset" },
69-
{ "kind" : "LiteralInteger", "name" : "viewFlags" },
70-
{ "kind" : "LiteralInteger", "name" : "viewFormat" }
56+
{ "kind" : "IdRef", "name" : "ds" },
57+
{ "kind" : "IdRef", "name" : "binding" },
58+
{ "kind" : "IdRef", "name" : "type" },
59+
{ "kind" : "IdRef", "name" : "flags" },
60+
{ "kind" : "IdRef", "name" : "queueFamilyIndexCount" },
61+
{ "kind" : "IdRef", "name" : "sharingMode" },
62+
{ "kind" : "IdRef", "name" : "size" },
63+
{ "kind" : "IdRef", "name" : "usage" },
64+
{ "kind" : "IdRef", "name" : "range" },
65+
{ "kind" : "IdRef", "name" : "offset" },
66+
{ "kind" : "IdRef", "name" : "memorySize" },
67+
{ "kind" : "IdRef", "name" : "memoryType" },
68+
{ "kind" : "IdRef", "name" : "bindOffset" },
69+
{ "kind" : "IdRef", "name" : "viewFlags" },
70+
{ "kind" : "IdRef", "name" : "viewFormat" }
7171
]
7272
},
7373
{
7474
"opname" : "DescriptorSetImage",
7575
"opcode" : 7,
7676
"operands" : [
77-
{ "kind" : "LiteralInteger", "name" : "ds" },
78-
{ "kind" : "LiteralInteger", "name" : "binding" },
79-
{ "kind" : "LiteralInteger", "name" : "type" },
80-
{ "kind" : "LiteralInteger", "name" : "imageLayout"},
81-
{ "kind" : "LiteralInteger", "name" : "imageFlags"},
82-
{ "kind" : "LiteralInteger", "name" : "imageType"},
83-
{ "kind" : "LiteralInteger", "name" : "imageformat"},
84-
{ "kind" : "LiteralInteger", "name" : "width"},
85-
{ "kind" : "LiteralInteger", "name" : "height"},
86-
{ "kind" : "LiteralInteger", "name" : "depth"},
87-
{ "kind" : "LiteralInteger", "name" : "mipLevels"},
88-
{ "kind" : "LiteralInteger", "name" : "arrayLayers"},
89-
{ "kind" : "LiteralInteger", "name" : "samples"},
90-
{ "kind" : "LiteralInteger", "name" : "tiling"},
91-
{ "kind" : "LiteralInteger", "name" : "usage"},
92-
{ "kind" : "LiteralInteger", "name" : "sharingMode"},
93-
{ "kind" : "LiteralInteger", "name" : "queueFamilyIndexCount"},
94-
{ "kind" : "LiteralInteger", "name" : "initialLayout"},
95-
{ "kind" : "LiteralInteger", "name" : "aspectMask"},
96-
{ "kind" : "LiteralInteger", "name" : "baseMipLevel"},
97-
{ "kind" : "LiteralInteger", "name" : "levelCount"},
98-
{ "kind" : "LiteralInteger", "name" : "baseArrayLayer"},
99-
{ "kind" : "LiteralInteger", "name" : "layerCount"},
100-
{ "kind" : "LiteralInteger", "name" : "viewFlags"},
101-
{ "kind" : "LiteralInteger", "name" : "viewType"},
102-
{ "kind" : "LiteralInteger", "name" : "viewFormat"},
103-
{ "kind" : "LiteralInteger", "name" : "component_a"},
104-
{ "kind" : "LiteralInteger", "name" : "component_b"},
105-
{ "kind" : "LiteralInteger", "name" : "component_g"},
106-
{ "kind" : "LiteralInteger", "name" : "component_r"},
107-
{ "kind" : "LiteralInteger", "name" : "memorySize" },
108-
{ "kind" : "LiteralInteger", "name" : "memoryType" },
109-
{ "kind" : "LiteralInteger", "name" : "bindOffset"}
77+
{ "kind" : "IdRef", "name" : "ds" },
78+
{ "kind" : "IdRef", "name" : "binding" },
79+
{ "kind" : "IdRef", "name" : "type" },
80+
{ "kind" : "IdRef", "name" : "imageLayout"},
81+
{ "kind" : "IdRef", "name" : "imageFlags"},
82+
{ "kind" : "IdRef", "name" : "imageType"},
83+
{ "kind" : "IdRef", "name" : "imageformat"},
84+
{ "kind" : "IdRef", "name" : "width"},
85+
{ "kind" : "IdRef", "name" : "height"},
86+
{ "kind" : "IdRef", "name" : "depth"},
87+
{ "kind" : "IdRef", "name" : "mipLevels"},
88+
{ "kind" : "IdRef", "name" : "arrayLayers"},
89+
{ "kind" : "IdRef", "name" : "samples"},
90+
{ "kind" : "IdRef", "name" : "tiling"},
91+
{ "kind" : "IdRef", "name" : "usage"},
92+
{ "kind" : "IdRef", "name" : "sharingMode"},
93+
{ "kind" : "IdRef", "name" : "queueFamilyIndexCount"},
94+
{ "kind" : "IdRef", "name" : "initialLayout"},
95+
{ "kind" : "IdRef", "name" : "aspectMask"},
96+
{ "kind" : "IdRef", "name" : "baseMipLevel"},
97+
{ "kind" : "IdRef", "name" : "levelCount"},
98+
{ "kind" : "IdRef", "name" : "baseArrayLayer"},
99+
{ "kind" : "IdRef", "name" : "layerCount"},
100+
{ "kind" : "IdRef", "name" : "viewFlags"},
101+
{ "kind" : "IdRef", "name" : "viewType"},
102+
{ "kind" : "IdRef", "name" : "viewFormat"},
103+
{ "kind" : "IdRef", "name" : "component_a"},
104+
{ "kind" : "IdRef", "name" : "component_b"},
105+
{ "kind" : "IdRef", "name" : "component_g"},
106+
{ "kind" : "IdRef", "name" : "component_r"},
107+
{ "kind" : "IdRef", "name" : "memorySize" },
108+
{ "kind" : "IdRef", "name" : "memoryType" },
109+
{ "kind" : "IdRef", "name" : "bindOffset"}
110110
]
111111
},
112112
{
113113
"opname" : "DescriptorSetSampler",
114114
"opcode" : 8,
115115
"operands" : [
116-
{ "kind" : "LiteralInteger", "name" : "ds" },
117-
{ "kind" : "LiteralInteger", "name" : "binding" },
118-
{ "kind" : "LiteralInteger", "name" : "type" },
119-
{ "kind" : "LiteralInteger", "name" : "flags"},
120-
{ "kind" : "LiteralInteger", "name" : "magFilter"},
121-
{ "kind" : "LiteralInteger", "name" : "minFilter"},
122-
{ "kind" : "LiteralInteger", "name" : "mipmapMode"},
123-
{ "kind" : "LiteralInteger", "name" : "addressModeU"},
124-
{ "kind" : "LiteralInteger", "name" : "addressModeV"},
125-
{ "kind" : "LiteralInteger", "name" : "addressModeW"},
126-
{ "kind" : "LiteralFloat", "name" : "mipLodBias"},
127-
{ "kind" : "LiteralInteger", "name" : "anisotropyEnable"},
128-
{ "kind" : "LiteralFloat", "name" : "maxAnisotropy"},
129-
{ "kind" : "LiteralInteger", "name" : "compareEnable"},
130-
{ "kind" : "LiteralInteger", "name" : "compareOp"},
131-
{ "kind" : "LiteralFloat", "name" : "minLod"},
132-
{ "kind" : "LiteralFloat", "name" : "maxLod"},
133-
{ "kind" : "LiteralInteger", "name" : "borderColor"},
134-
{ "kind" : "LiteralInteger", "name" : "unnormalizedCoordinates"}
116+
{ "kind" : "IdRef", "name" : "ds" },
117+
{ "kind" : "IdRef", "name" : "binding" },
118+
{ "kind" : "IdRef", "name" : "type" },
119+
{ "kind" : "IdRef", "name" : "flags"},
120+
{ "kind" : "IdRef", "name" : "magFilter"},
121+
{ "kind" : "IdRef", "name" : "minFilter"},
122+
{ "kind" : "IdRef", "name" : "mipmapMode"},
123+
{ "kind" : "IdRef", "name" : "addressModeU"},
124+
{ "kind" : "IdRef", "name" : "addressModeV"},
125+
{ "kind" : "IdRef", "name" : "addressModeW"},
126+
{ "kind" : "IdRef", "name" : "mipLodBias"},
127+
{ "kind" : "IdRef", "name" : "anisotropyEnable"},
128+
{ "kind" : "IdRef", "name" : "maxAnisotropy"},
129+
{ "kind" : "IdRef", "name" : "compareEnable"},
130+
{ "kind" : "IdRef", "name" : "compareOp"},
131+
{ "kind" : "IdRef", "name" : "minLod"},
132+
{ "kind" : "IdRef", "name" : "maxLod"},
133+
{ "kind" : "IdRef", "name" : "borderColor"},
134+
{ "kind" : "IdRef", "name" : "unnormalizedCoordinates"}
135135
]
136136
}
137137
]

0 commit comments

Comments
 (0)