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

@ -1033,13 +1033,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 481
// Id's are bound by 480
Capability Shader
Capability Float64
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 478
EntryPoint Fragment 4 "main" 477
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 11 "Fn_F3(vf3;"
@ -1128,10 +1128,8 @@ gl_FragCoord origin is upper left
Name 471 "PS_OUTPUT"
MemberName 471(PS_OUTPUT) 0 "Color"
Name 473 "psout"
Name 476 "PS_OUTPUT"
MemberName 476(PS_OUTPUT) 0 "Color"
Name 478 "@entryPointOutput"
Decorate 478(@entryPointOutput) Location 0
Name 477 "@entryPointOutput"
Decorate 477(@entryPointOutput) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@ -1202,9 +1200,8 @@ gl_FragCoord origin is upper left
465: 6(float) Constant 1080452710
471(PS_OUTPUT): TypeStruct 462(fvec4)
472: TypePointer Function 471(PS_OUTPUT)
476(PS_OUTPUT): TypeStruct 462(fvec4)
477: TypePointer Output 476(PS_OUTPUT)
478(@entryPointOutput): 477(ptr) Variable Output
476: TypePointer Output 471(PS_OUTPUT)
477(@entryPointOutput): 476(ptr) Variable Output
4(main): 2 Function None 3
5: Label
252(r00): 8(ptr) Variable Function
@ -1470,8 +1467,8 @@ gl_FragCoord origin is upper left
474: 462(fvec4) Load 464(outval)
475: 463(ptr) AccessChain 473(psout) 149
Store 475 474
479:471(PS_OUTPUT) Load 473(psout)
Store 478(@entryPointOutput) 479
478:471(PS_OUTPUT) Load 473(psout)
Store 477(@entryPointOutput) 478
Return
FunctionEnd
11(Fn_F3(vf3;): 2 Function None 9