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

@@ -7,13 +7,13 @@ Linked fragment stage:
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 186
// Id's are bound by 185
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 181
EntryPoint Fragment 4 "main" 180
ExecutionMode 4 OriginUpperLeft
Decorate 41 DescriptorSet 0
Decorate 41 Binding 0
@@ -31,12 +31,11 @@ Linked fragment stage:
Decorate 156 DescriptorSet 0
Decorate 165 DescriptorSet 0
MemberDecorate 171 1 BuiltIn FragDepth
MemberDecorate 179 1 BuiltIn FragDepth
Decorate 181 Location 0
Decorate 180 Location 0
Decorate 182 DescriptorSet 0
Decorate 183 DescriptorSet 0
Decorate 184 DescriptorSet 0
Decorate 185 DescriptorSet 0
Decorate 185 Binding 1
Decorate 184 Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 1
@@ -136,12 +135,11 @@ Linked fragment stage:
174: 35(float) Constant 1065353216
175: 36(fvec4) ConstantComposite 174 174 174 174
177: TypePointer Function 35(float)
179: TypeStruct 36(fvec4) 35(float)
180: TypePointer Output 179(struct)
181: 180(ptr) Variable Output
179: TypePointer Output 171(struct)
180: 179(ptr) Variable Output
182: 44(ptr) Variable UniformConstant
183: 44(ptr) Variable UniformConstant
184: 44(ptr) Variable UniformConstant
185: 40(ptr) Variable UniformConstant
184: 40(ptr) Variable UniformConstant
4: 2 Function None 3
5: Label
9: 8(ptr) Variable Function
@@ -246,7 +244,7 @@ Linked fragment stage:
Store 176 175
178: 177(ptr) AccessChain 173 10
Store 178 174
182: 171(struct) Load 173
Store 181 182
181: 171(struct) Load 173
Store 180 181
Return
FunctionEnd