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

141
Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out
View File

@@ -343,14 +343,14 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 178
// Id's are bound by 177
Capability Shader
Capability Sampled1D
Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 139
EntryPoint Fragment 4 "main" 138
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 8 "r00"
@@ -376,22 +376,19 @@ gl_FragCoord origin is upper left
MemberName 127(PS_OUTPUT) 0 "Color"
MemberName 127(PS_OUTPUT) 1 "Depth"
Name 129 "psout"
Name 137 "PS_OUTPUT"
MemberName 137(PS_OUTPUT) 0 "Color"
MemberName 137(PS_OUTPUT) 1 "Depth"
Name 139 "@entryPointOutput"
Name 144 "g_tTex3df4"
Name 147 "g_tTex3di4"
Name 150 "g_tTex3du4"
Name 153 "g_tTex1df4a"
Name 156 "g_tTex1di4a"
Name 159 "g_tTex1du4a"
Name 162 "g_tTex2df4a"
Name 165 "g_tTex2di4a"
Name 168 "g_tTex2du4a"
Name 171 "g_tTexcdf4a"
Name 174 "g_tTexcdi4a"
Name 177 "g_tTexcdu4a"
Name 138 "@entryPointOutput"
Name 143 "g_tTex3df4"
Name 146 "g_tTex3di4"
Name 149 "g_tTex3du4"
Name 152 "g_tTex1df4a"
Name 155 "g_tTex1di4a"
Name 158 "g_tTex1du4a"
Name 161 "g_tTex2df4a"
Name 164 "g_tTex2di4a"
Name 167 "g_tTex2du4a"
Name 170 "g_tTexcdf4a"
Name 173 "g_tTexcdi4a"
Name 176 "g_tTexcdu4a"
Decorate 11(g_tTex1df4) DescriptorSet 0
Decorate 11(g_tTex1df4) Binding 0
Decorate 15(g_sSamp) DescriptorSet 0
@@ -405,20 +402,19 @@ gl_FragCoord origin is upper left
Decorate 105(g_tTexcdi4) DescriptorSet 0
Decorate 117(g_tTexcdu4) DescriptorSet 0
MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 137(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 139(@entryPointOutput) Location 0
Decorate 144(g_tTex3df4) DescriptorSet 0
Decorate 147(g_tTex3di4) DescriptorSet 0
Decorate 150(g_tTex3du4) DescriptorSet 0
Decorate 153(g_tTex1df4a) DescriptorSet 0
Decorate 156(g_tTex1di4a) DescriptorSet 0
Decorate 159(g_tTex1du4a) DescriptorSet 0
Decorate 162(g_tTex2df4a) DescriptorSet 0
Decorate 165(g_tTex2di4a) DescriptorSet 0
Decorate 168(g_tTex2du4a) DescriptorSet 0
Decorate 171(g_tTexcdf4a) DescriptorSet 0
Decorate 174(g_tTexcdi4a) DescriptorSet 0
Decorate 177(g_tTexcdu4a) DescriptorSet 0
Decorate 138(@entryPointOutput) Location 0
Decorate 143(g_tTex3df4) DescriptorSet 0
Decorate 146(g_tTex3di4) DescriptorSet 0
Decorate 149(g_tTex3du4) DescriptorSet 0
Decorate 152(g_tTex1df4a) DescriptorSet 0
Decorate 155(g_tTex1di4a) DescriptorSet 0
Decorate 158(g_tTex1du4a) DescriptorSet 0
Decorate 161(g_tTex2df4a) DescriptorSet 0
Decorate 164(g_tTex2di4a) DescriptorSet 0
Decorate 167(g_tTex2du4a) DescriptorSet 0
Decorate 170(g_tTexcdf4a) DescriptorSet 0
Decorate 173(g_tTexcdi4a) DescriptorSet 0
Decorate 176(g_tTexcdu4a) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -489,45 +485,44 @@ gl_FragCoord origin is upper left
132: 126(fvec4) ConstantComposite 131 131 131 131
133: TypePointer Function 126(fvec4)
135: 25(int) Constant 1
137(PS_OUTPUT): TypeStruct 126(fvec4) 6(float)
138: TypePointer Output 137(PS_OUTPUT)
139(@entryPointOutput): 138(ptr) Variable Output
142: TypeImage 6(float) 3D sampled format:Unknown
143: TypePointer UniformConstant 142
144(g_tTex3df4): 143(ptr) Variable UniformConstant
145: TypeImage 25(int) 3D sampled format:Unknown
146: TypePointer UniformConstant 145
147(g_tTex3di4): 146(ptr) Variable UniformConstant
148: TypeImage 37(int) 3D sampled format:Unknown
149: TypePointer UniformConstant 148
150(g_tTex3du4): 149(ptr) Variable UniformConstant
151: TypeImage 6(float) 1D array sampled format:Unknown
152: TypePointer UniformConstant 151
153(g_tTex1df4a): 152(ptr) Variable UniformConstant
154: TypeImage 25(int) 1D array sampled format:Unknown
155: TypePointer UniformConstant 154
156(g_tTex1di4a): 155(ptr) Variable UniformConstant
157: TypeImage 37(int) 1D array sampled format:Unknown
158: TypePointer UniformConstant 157
159(g_tTex1du4a): 158(ptr) Variable UniformConstant
160: TypeImage 6(float) 2D array sampled format:Unknown
161: TypePointer UniformConstant 160
162(g_tTex2df4a): 161(ptr) Variable UniformConstant
163: TypeImage 25(int) 2D array sampled format:Unknown
164: TypePointer UniformConstant 163
165(g_tTex2di4a): 164(ptr) Variable UniformConstant
166: TypeImage 37(int) 2D array sampled format:Unknown
167: TypePointer UniformConstant 166
168(g_tTex2du4a): 167(ptr) Variable UniformConstant
169: TypeImage 6(float) Cube array sampled format:Unknown
170: TypePointer UniformConstant 169
171(g_tTexcdf4a): 170(ptr) Variable UniformConstant
172: TypeImage 25(int) Cube array sampled format:Unknown
173: TypePointer UniformConstant 172
174(g_tTexcdi4a): 173(ptr) Variable UniformConstant
175: TypeImage 37(int) Cube array sampled format:Unknown
176: TypePointer UniformConstant 175
177(g_tTexcdu4a): 176(ptr) Variable UniformConstant
137: TypePointer Output 127(PS_OUTPUT)
138(@entryPointOutput): 137(ptr) Variable Output
141: TypeImage 6(float) 3D sampled format:Unknown
142: TypePointer UniformConstant 141
143(g_tTex3df4): 142(ptr) Variable UniformConstant
144: TypeImage 25(int) 3D sampled format:Unknown
145: TypePointer UniformConstant 144
146(g_tTex3di4): 145(ptr) Variable UniformConstant
147: TypeImage 37(int) 3D sampled format:Unknown
148: TypePointer UniformConstant 147
149(g_tTex3du4): 148(ptr) Variable UniformConstant
150: TypeImage 6(float) 1D array sampled format:Unknown
151: TypePointer UniformConstant 150
152(g_tTex1df4a): 151(ptr) Variable UniformConstant
153: TypeImage 25(int) 1D array sampled format:Unknown
154: TypePointer UniformConstant 153
155(g_tTex1di4a): 154(ptr) Variable UniformConstant
156: TypeImage 37(int) 1D array sampled format:Unknown
157: TypePointer UniformConstant 156
158(g_tTex1du4a): 157(ptr) Variable UniformConstant
159: TypeImage 6(float) 2D array sampled format:Unknown
160: TypePointer UniformConstant 159
161(g_tTex2df4a): 160(ptr) Variable UniformConstant
162: TypeImage 25(int) 2D array sampled format:Unknown
163: TypePointer UniformConstant 162
164(g_tTex2di4a): 163(ptr) Variable UniformConstant
165: TypeImage 37(int) 2D array sampled format:Unknown
166: TypePointer UniformConstant 165
167(g_tTex2du4a): 166(ptr) Variable UniformConstant
168: TypeImage 6(float) Cube array sampled format:Unknown
169: TypePointer UniformConstant 168
170(g_tTexcdf4a): 169(ptr) Variable UniformConstant
171: TypeImage 25(int) Cube array sampled format:Unknown
172: TypePointer UniformConstant 171
173(g_tTexcdi4a): 172(ptr) Variable UniformConstant
174: TypeImage 37(int) Cube array sampled format:Unknown
175: TypePointer UniformConstant 174
176(g_tTexcdu4a): 175(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
8(r00): 7(ptr) Variable Function
@@ -604,7 +599,7 @@ gl_FragCoord origin is upper left
Store 134 132
136: 7(ptr) AccessChain 129(psout) 135
Store 136 131
140:127(PS_OUTPUT) Load 129(psout)
Store 139(@entryPointOutput) 140
139:127(PS_OUTPUT) Load 129(psout)
Store 138(@entryPointOutput) 139
Return
FunctionEnd