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

@ -2197,7 +2197,7 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 541
// Id's are bound by 540
Capability Shader
Capability Sampled1D
@ -2206,7 +2206,7 @@ gl_FragCoord origin is upper left
Capability ImageQuery
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 535
EntryPoint Fragment 4 "main" 534
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 8 "sizeQueryTemp"
@ -2294,11 +2294,8 @@ gl_FragCoord origin is upper left
MemberName 522(PS_OUTPUT) 0 "Color"
MemberName 522(PS_OUTPUT) 1 "Depth"
Name 524 "psout"
Name 533 "PS_OUTPUT"
MemberName 533(PS_OUTPUT) 0 "Color"
MemberName 533(PS_OUTPUT) 1 "Depth"
Name 535 "@entryPointOutput"
Name 540 "g_sSamp"
Name 534 "@entryPointOutput"
Name 539 "g_sSamp"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 29(g_tTex1di4) DescriptorSet 0
@ -2328,10 +2325,9 @@ gl_FragCoord origin is upper left
Decorate 496(g_tTex2dmsi4a) DescriptorSet 0
Decorate 510(g_tTex2dmsu4a) DescriptorSet 0
MemberDecorate 522(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 533(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 535(@entryPointOutput) Location 0
Decorate 540(g_sSamp) DescriptorSet 0
Decorate 540(g_sSamp) Binding 0
Decorate 534(@entryPointOutput) Location 0
Decorate 539(g_sSamp) DescriptorSet 0
Decorate 539(g_sSamp) Binding 0
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 0
@ -2438,12 +2434,11 @@ gl_FragCoord origin is upper left
528: TypePointer Function 521(fvec4)
530: 14(int) Constant 1
531: TypePointer Function 9(float)
533(PS_OUTPUT): TypeStruct 521(fvec4) 9(float)
534: TypePointer Output 533(PS_OUTPUT)
535(@entryPointOutput): 534(ptr) Variable Output
538: TypeSampler
539: TypePointer UniformConstant 538
540(g_sSamp): 539(ptr) Variable UniformConstant
533: TypePointer Output 522(PS_OUTPUT)
534(@entryPointOutput): 533(ptr) Variable Output
537: TypeSampler
538: TypePointer UniformConstant 537
539(g_sSamp): 538(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
8(sizeQueryTemp): 7(ptr) Variable Function
@ -3057,7 +3052,7 @@ gl_FragCoord origin is upper left
Store 529 527
532: 531(ptr) AccessChain 524(psout) 530
Store 532 526
536:522(PS_OUTPUT) Load 524(psout)
Store 535(@entryPointOutput) 536
535:522(PS_OUTPUT) Load 524(psout)
Store 534(@entryPointOutput) 535
Return
FunctionEnd