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

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

View file

@ -393,14 +393,14 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 129
// Id's are bound by 128
Capability Shader
Capability Sampled1D
Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 125
EntryPoint Fragment 4 "main" 124
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@ -426,11 +426,8 @@ gl_FragCoord origin is upper left
MemberName 113(PS_OUTPUT) 0 "Color"
MemberName 113(PS_OUTPUT) 1 "Depth"
Name 115 "psout"
Name 123 "PS_OUTPUT"
MemberName 123(PS_OUTPUT) 0 "Color"
MemberName 123(PS_OUTPUT) 1 "Depth"
Name 125 "@entryPointOutput"
Name 128 "g_tTex1df4a"
Name 124 "@entryPointOutput"
Name 127 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@ -444,10 +441,9 @@ gl_FragCoord origin is upper left
Decorate 98(g_tTexcdi4) DescriptorSet 0
Decorate 107(g_tTexcdu4) DescriptorSet 0
MemberDecorate 113(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 123(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 125(@entryPointOutput) Location 0
Decorate 128(g_tTex1df4a) DescriptorSet 0
Decorate 128(g_tTex1df4a) Binding 1
Decorate 124(@entryPointOutput) Location 0
Decorate 127(g_tTex1df4a) DescriptorSet 0
Decorate 127(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@ -519,10 +515,9 @@ gl_FragCoord origin is upper left
118: 7(fvec4) ConstantComposite 117 117 117 117
120: 27(int) Constant 1
121: TypePointer Function 6(float)
123(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
124: TypePointer Output 123(PS_OUTPUT)
125(@entryPointOutput): 124(ptr) Variable Output
128(g_tTex1df4a): 11(ptr) Variable UniformConstant
123: TypePointer Output 113(PS_OUTPUT)
124(@entryPointOutput): 123(ptr) Variable Output
127(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@ -584,7 +579,7 @@ gl_FragCoord origin is upper left
Store 119 118
122: 121(ptr) AccessChain 115(psout) 120
Store 122 117
126:113(PS_OUTPUT) Load 115(psout)
Store 125(@entryPointOutput) 126
125:113(PS_OUTPUT) Load 115(psout)
Store 124(@entryPointOutput) 125
Return
FunctionEnd