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

@ -83,12 +83,12 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 31
// Id's are bound by 30
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 28
EntryPoint Fragment 4 "main" 27
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 8 "thisLineIs"
@ -96,13 +96,9 @@ gl_FragCoord origin is upper left
MemberName 12(PS_OUTPUT) 0 "Color"
MemberName 12(PS_OUTPUT) 1 "Depth"
Name 14 "psout"
Name 26 "PS_OUTPUT"
MemberName 26(PS_OUTPUT) 0 "Color"
MemberName 26(PS_OUTPUT) 1 "Depth"
Name 28 "@entryPointOutput"
Name 27 "@entryPointOutput"
MemberDecorate 12(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 26(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 28(@entryPointOutput) Location 0
Decorate 27(@entryPointOutput) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 1
@ -118,9 +114,8 @@ gl_FragCoord origin is upper left
21: TypePointer Function 11(fvec4)
23: 6(int) Constant 1
24: TypePointer Function 10(float)
26(PS_OUTPUT): TypeStruct 11(fvec4) 10(float)
27: TypePointer Output 26(PS_OUTPUT)
28(@entryPointOutput): 27(ptr) Variable Output
26: TypePointer Output 12(PS_OUTPUT)
27(@entryPointOutput): 26(ptr) Variable Output
4(main): 2 Function None 3
5: Label
8(thisLineIs): 7(ptr) Variable Function
@ -133,7 +128,7 @@ gl_FragCoord origin is upper left
Store 22 20
25: 24(ptr) AccessChain 14(psout) 23
Store 25 19
29:12(PS_OUTPUT) Load 14(psout)
Store 28(@entryPointOutput) 29
28:12(PS_OUTPUT) Load 14(psout)
Store 27(@entryPointOutput) 28
Return
FunctionEnd