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.samplecmplevelzero.array.dx10.frag.out
View File

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