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

73
Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out
View File

@@ -575,14 +575,14 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 223
// Id's are bound by 222
Capability Shader
Capability Sampled1D
Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 205
EntryPoint Fragment 4 "main" 204
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval00"
@@ -622,16 +622,13 @@ gl_FragCoord origin is upper left
MemberName 195(PS_OUTPUT) 0 "Color"
MemberName 195(PS_OUTPUT) 1 "Depth"
Name 197 "psout"
Name 203 "PS_OUTPUT"
MemberName 203(PS_OUTPUT) 0 "Color"
MemberName 203(PS_OUTPUT) 1 "Depth"
Name 205 "@entryPointOutput"
Name 208 "g_sSamp2d"
Name 211 "g_tTex1df4a"
Name 214 "g_tTex1di4a"
Name 217 "g_tTex1du4a"
Name 219 "c1"
Name 222 "c2"
Name 204 "@entryPointOutput"
Name 207 "g_sSamp2d"
Name 210 "g_tTex1df4a"
Name 213 "g_tTex1di4a"
Name 216 "g_tTex1du4a"
Name 218 "c1"
Name 221 "c2"
Decorate 12(g_tTex2df4a) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0
@@ -641,13 +638,12 @@ gl_FragCoord origin is upper left
Decorate 124(g_tTexcdi4a) DescriptorSet 0
Decorate 134(g_tTexcdu4a) DescriptorSet 0
MemberDecorate 195(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 203(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 205(@entryPointOutput) Location 0
Decorate 208(g_sSamp2d) DescriptorSet 0
Decorate 211(g_tTex1df4a) DescriptorSet 0
Decorate 211(g_tTex1df4a) Binding 0
Decorate 214(g_tTex1di4a) DescriptorSet 0
Decorate 217(g_tTex1du4a) DescriptorSet 0
Decorate 204(@entryPointOutput) Location 0
Decorate 207(g_sSamp2d) DescriptorSet 0
Decorate 210(g_tTex1df4a) DescriptorSet 0
Decorate 210(g_tTex1df4a) Binding 0
Decorate 213(g_tTex1di4a) DescriptorSet 0
Decorate 216(g_tTex1du4a) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -700,24 +696,23 @@ gl_FragCoord origin is upper left
198: 6(float) Constant 1065353216
199: 7(fvec4) ConstantComposite 198 198 198 198
201: TypePointer Function 6(float)
203(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
204: TypePointer Output 203(PS_OUTPUT)
205(@entryPointOutput): 204(ptr) Variable Output
208(g_sSamp2d): 15(ptr) Variable UniformConstant
209: TypeImage 6(float) 1D array sampled format:Unknown
210: TypePointer UniformConstant 209
211(g_tTex1df4a): 210(ptr) Variable UniformConstant
212: TypeImage 24(int) 1D array sampled format:Unknown
213: TypePointer UniformConstant 212
214(g_tTex1di4a): 213(ptr) Variable UniformConstant
215: TypeImage 39(int) 1D array sampled format:Unknown
216: TypePointer UniformConstant 215
217(g_tTex1du4a): 216(ptr) Variable UniformConstant
218: TypePointer UniformConstant 6(float)
219(c1): 218(ptr) Variable UniformConstant
220: TypeVector 6(float) 2
221: TypePointer UniformConstant 220(fvec2)
222(c2): 221(ptr) Variable UniformConstant
203: TypePointer Output 195(PS_OUTPUT)
204(@entryPointOutput): 203(ptr) Variable Output
207(g_sSamp2d): 15(ptr) Variable UniformConstant
208: TypeImage 6(float) 1D array sampled format:Unknown
209: TypePointer UniformConstant 208
210(g_tTex1df4a): 209(ptr) Variable UniformConstant
211: TypeImage 24(int) 1D array sampled format:Unknown
212: TypePointer UniformConstant 211
213(g_tTex1di4a): 212(ptr) Variable UniformConstant
214: TypeImage 39(int) 1D array sampled format:Unknown
215: TypePointer UniformConstant 214
216(g_tTex1du4a): 215(ptr) Variable UniformConstant
217: TypePointer UniformConstant 6(float)
218(c1): 217(ptr) Variable UniformConstant
219: TypeVector 6(float) 2
220: TypePointer UniformConstant 219(fvec2)
221(c2): 220(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval00): 8(ptr) Variable Function
@@ -893,7 +888,7 @@ gl_FragCoord origin is upper left
Store 200 199
202: 201(ptr) AccessChain 197(psout) 57
Store 202 198
206:195(PS_OUTPUT) Load 197(psout)
Store 205(@entryPointOutput) 206
205:195(PS_OUTPUT) Load 197(psout)
Store 204(@entryPointOutput) 205
Return
FunctionEnd