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

@@ -261,13 +261,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 108
// Id's are bound by 107
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 104
EntryPoint Fragment 4 "main" 103
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -287,11 +287,8 @@ gl_FragCoord origin is upper left
MemberName 94(PS_OUTPUT) 0 "Color"
MemberName 94(PS_OUTPUT) 1 "Depth"
Name 96 "psout"
Name 102 "PS_OUTPUT"
MemberName 102(PS_OUTPUT) 0 "Color"
MemberName 102(PS_OUTPUT) 1 "Depth"
Name 104 "@entryPointOutput"
Name 107 "g_tTex1df4a"
Name 103 "@entryPointOutput"
Name 106 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -302,10 +299,9 @@ gl_FragCoord origin is upper left
Decorate 73(g_tTex2di4) DescriptorSet 0
Decorate 84(g_tTex2du4) DescriptorSet 0
MemberDecorate 94(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 102(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 104(@entryPointOutput) Location 0
Decorate 107(g_tTex1df4a) DescriptorSet 0
Decorate 107(g_tTex1df4a) Binding 1
Decorate 103(@entryPointOutput) Location 0
Decorate 106(g_tTex1df4a) DescriptorSet 0
Decorate 106(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -371,10 +367,9 @@ gl_FragCoord origin is upper left
97: 6(float) Constant 1065353216
98: 7(fvec4) ConstantComposite 97 97 97 97
100: TypePointer Function 6(float)
102(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
103: TypePointer Output 102(PS_OUTPUT)
104(@entryPointOutput): 103(ptr) Variable Output
107(g_tTex1df4a): 11(ptr) Variable UniformConstant
102: TypePointer Output 94(PS_OUTPUT)
103(@entryPointOutput): 102(ptr) Variable Output
106(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -418,7 +413,7 @@ gl_FragCoord origin is upper left
Store 99 98
101: 100(ptr) AccessChain 96(psout) 40
Store 101 97
105:94(PS_OUTPUT) Load 96(psout)
Store 104(@entryPointOutput) 105
104:94(PS_OUTPUT) Load 96(psout)
Store 103(@entryPointOutput) 104
Return
FunctionEnd