mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SPV: Tighten up number of struct-types declared based on decoration.

Browse Source 
Takes some pressure off of issue #304.
Structures don't inherit locations and then explicitly decorate
members with them, so removed this reason to have another instance
of a structure type.
This commit is contained in:
John Kessenich
2016-09-01 17:05:23 -06:00
parent 5e56423046
commit f2b7f3353b
61 changed files with 2057 additions and 2308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
Test/baseResults/hlsl.samplecmp.array.dx10.frag.out
View File

@@ -361,14 +361,14 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 180
// Id's are bound by 179
Capability Shader
Capability Sampled1D
Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 141
EntryPoint Fragment 4 "main" 140
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 8 "r10"
@@ -394,22 +394,19 @@ gl_FragCoord origin is upper left
MemberName 129(PS_OUTPUT) 0 "Color"
MemberName 129(PS_OUTPUT) 1 "Depth"
Name 131 "psout"
Name 139 "PS_OUTPUT"
MemberName 139(PS_OUTPUT) 0 "Color"
MemberName 139(PS_OUTPUT) 1 "Depth"
Name 141 "@entryPointOutput"
Name 146 "g_tTex1df4"
Name 149 "g_tTex1di4"
Name 152 "g_tTex1du4"
Name 155 "g_tTex2df4"
Name 158 "g_tTex2di4"
Name 161 "g_tTex2du4"
Name 164 "g_tTex3df4"
Name 167 "g_tTex3di4"
Name 170 "g_tTex3du4"
Name 173 "g_tTexcdf4"
Name 176 "g_tTexcdi4"
Name 179 "g_tTexcdu4"
Name 140 "@entryPointOutput"
Name 145 "g_tTex1df4"
Name 148 "g_tTex1di4"
Name 151 "g_tTex1du4"
Name 154 "g_tTex2df4"
Name 157 "g_tTex2di4"
Name 160 "g_tTex2du4"
Name 163 "g_tTex3df4"
Name 166 "g_tTex3di4"
Name 169 "g_tTex3du4"
Name 172 "g_tTexcdf4"
Name 175 "g_tTexcdi4"
Name 178 "g_tTexcdu4"
Decorate 11(g_tTex1df4a) DescriptorSet 0
Decorate 15(g_sSamp) DescriptorSet 0
Decorate 15(g_sSamp) Binding 0
@@ -422,21 +419,20 @@ gl_FragCoord origin is upper left
Decorate 110(g_tTexcdi4a) DescriptorSet 0
Decorate 121(g_tTexcdu4a) DescriptorSet 0
MemberDecorate 129(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 139(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 141(@entryPointOutput) Location 0
Decorate 146(g_tTex1df4) DescriptorSet 0
Decorate 146(g_tTex1df4) Binding 0
Decorate 149(g_tTex1di4) DescriptorSet 0
Decorate 152(g_tTex1du4) DescriptorSet 0
Decorate 155(g_tTex2df4) DescriptorSet 0
Decorate 158(g_tTex2di4) DescriptorSet 0
Decorate 161(g_tTex2du4) DescriptorSet 0
Decorate 164(g_tTex3df4) DescriptorSet 0
Decorate 167(g_tTex3di4) DescriptorSet 0
Decorate 170(g_tTex3du4) DescriptorSet 0
Decorate 173(g_tTexcdf4) DescriptorSet 0
Decorate 176(g_tTexcdi4) DescriptorSet 0
Decorate 179(g_tTexcdu4) DescriptorSet 0
Decorate 140(@entryPointOutput) Location 0
Decorate 145(g_tTex1df4) DescriptorSet 0
Decorate 145(g_tTex1df4) Binding 0
Decorate 148(g_tTex1di4) DescriptorSet 0
Decorate 151(g_tTex1du4) DescriptorSet 0
Decorate 154(g_tTex2df4) DescriptorSet 0
Decorate 157(g_tTex2di4) DescriptorSet 0
Decorate 160(g_tTex2du4) DescriptorSet 0
Decorate 163(g_tTex3df4) DescriptorSet 0
Decorate 166(g_tTex3di4) DescriptorSet 0
Decorate 169(g_tTex3du4) DescriptorSet 0
Decorate 172(g_tTexcdf4) DescriptorSet 0
Decorate 175(g_tTexcdi4) DescriptorSet 0
Decorate 178(g_tTexcdu4) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -509,45 +505,44 @@ gl_FragCoord origin is upper left
134: 102(fvec4) ConstantComposite 133 133 133 133
135: TypePointer Function 102(fvec4)
137: 29(int) Constant 1
139(PS_OUTPUT): TypeStruct 102(fvec4) 6(float)
140: TypePointer Output 139(PS_OUTPUT)
141(@entryPointOutput): 140(ptr) Variable Output
144: TypeImage 6(float) 1D sampled format:Unknown
145: TypePointer UniformConstant 144
146(g_tTex1df4): 145(ptr) Variable UniformConstant
147: TypeImage 29(int) 1D sampled format:Unknown
148: TypePointer UniformConstant 147
149(g_tTex1di4): 148(ptr) Variable UniformConstant
150: TypeImage 42(int) 1D sampled format:Unknown
151: TypePointer UniformConstant 150
152(g_tTex1du4): 151(ptr) Variable UniformConstant
153: TypeImage 6(float) 2D sampled format:Unknown
154: TypePointer UniformConstant 153
155(g_tTex2df4): 154(ptr) Variable UniformConstant
156: TypeImage 29(int) 2D sampled format:Unknown
157: TypePointer UniformConstant 156
158(g_tTex2di4): 157(ptr) Variable UniformConstant
159: TypeImage 42(int) 2D sampled format:Unknown
160: TypePointer UniformConstant 159
161(g_tTex2du4): 160(ptr) Variable UniformConstant
162: TypeImage 6(float) 3D sampled format:Unknown
163: TypePointer UniformConstant 162
164(g_tTex3df4): 163(ptr) Variable UniformConstant
165: TypeImage 29(int) 3D sampled format:Unknown
166: TypePointer UniformConstant 165
167(g_tTex3di4): 166(ptr) Variable UniformConstant
168: TypeImage 42(int) 3D sampled format:Unknown
169: TypePointer UniformConstant 168
170(g_tTex3du4): 169(ptr) Variable UniformConstant
171: TypeImage 6(float) Cube sampled format:Unknown
172: TypePointer UniformConstant 171
173(g_tTexcdf4): 172(ptr) Variable UniformConstant
174: TypeImage 29(int) Cube sampled format:Unknown
175: TypePointer UniformConstant 174
176(g_tTexcdi4): 175(ptr) Variable UniformConstant
177: TypeImage 42(int) Cube sampled format:Unknown
178: TypePointer UniformConstant 177
179(g_tTexcdu4): 178(ptr) Variable UniformConstant
139: TypePointer Output 129(PS_OUTPUT)
140(@entryPointOutput): 139(ptr) Variable Output
143: TypeImage 6(float) 1D sampled format:Unknown
144: TypePointer UniformConstant 143
145(g_tTex1df4): 144(ptr) Variable UniformConstant
146: TypeImage 29(int) 1D sampled format:Unknown
147: TypePointer UniformConstant 146
148(g_tTex1di4): 147(ptr) Variable UniformConstant
149: TypeImage 42(int) 1D sampled format:Unknown
150: TypePointer UniformConstant 149
151(g_tTex1du4): 150(ptr) Variable UniformConstant
152: TypeImage 6(float) 2D sampled format:Unknown
153: TypePointer UniformConstant 152
154(g_tTex2df4): 153(ptr) Variable UniformConstant
155: TypeImage 29(int) 2D sampled format:Unknown
156: TypePointer UniformConstant 155
157(g_tTex2di4): 156(ptr) Variable UniformConstant
158: TypeImage 42(int) 2D sampled format:Unknown
159: TypePointer UniformConstant 158
160(g_tTex2du4): 159(ptr) Variable UniformConstant
161: TypeImage 6(float) 3D sampled format:Unknown
162: TypePointer UniformConstant 161
163(g_tTex3df4): 162(ptr) Variable UniformConstant
164: TypeImage 29(int) 3D sampled format:Unknown
165: TypePointer UniformConstant 164
166(g_tTex3di4): 165(ptr) Variable UniformConstant
167: TypeImage 42(int) 3D sampled format:Unknown
168: TypePointer UniformConstant 167
169(g_tTex3du4): 168(ptr) Variable UniformConstant
170: TypeImage 6(float) Cube sampled format:Unknown
171: TypePointer UniformConstant 170
172(g_tTexcdf4): 171(ptr) Variable UniformConstant
173: TypeImage 29(int) Cube sampled format:Unknown
174: TypePointer UniformConstant 173
175(g_tTexcdi4): 174(ptr) Variable UniformConstant
176: TypeImage 42(int) Cube sampled format:Unknown
177: TypePointer UniformConstant 176
178(g_tTexcdu4): 177(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
8(r10): 7(ptr) Variable Function
@@ -624,7 +619,7 @@ gl_FragCoord origin is upper left
Store 136 134
138: 7(ptr) AccessChain 131(psout) 137
Store 138 133
142:129(PS_OUTPUT) Load 131(psout)
Store 141(@entryPointOutput) 142
141:129(PS_OUTPUT) Load 131(psout)
Store 140(@entryPointOutput) 141
Return
FunctionEnd