mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HLSL: Start location numbering with the entry-point return value.

Browse Source 
Also, increment location numbers by the size of the objects.
This commit is contained in:
John Kessenich
2016-08-29 18:10:47 -06:00
parent a05d8b5604
commit 830b0cc98b
89 changed files with 2517 additions and 2157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Test/baseResults/hlsl.getdimensions.dx10.frag.out
View File

@@ -1062,7 +1062,7 @@ gl_FragCoord origin is upper left
0:277 1.000000
0:279 Sequence
0:279 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:279 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:279 Branch: Return
0:? Linker Objects
@@ -2162,7 +2162,7 @@ gl_FragCoord origin is upper left
0:277 1.000000
0:279 Sequence
0:279 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:279 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:279 Branch: Return
0:? Linker Objects
@@ -2197,7 +2197,7 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 540
// Id's are bound by 541
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" 534
EntryPoint Fragment 4 "main" 535
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 8 "sizeQueryTemp"
@@ -2294,8 +2294,11 @@ gl_FragCoord origin is upper left
MemberName 522(PS_OUTPUT) 0 "Color"
MemberName 522(PS_OUTPUT) 1 "Depth"
Name 524 "psout"
Name 534 "@entryPointOutput"
Name 539 "g_sSamp"
Name 533 "PS_OUTPUT"
MemberName 533(PS_OUTPUT) 0 "Color"
MemberName 533(PS_OUTPUT) 1 "Depth"
Name 535 "@entryPointOutput"
Name 540 "g_sSamp"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 29(g_tTex1di4) DescriptorSet 0
@@ -2325,8 +2328,10 @@ 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
Decorate 539(g_sSamp) DescriptorSet 0
Decorate 539(g_sSamp) Binding 0
MemberDecorate 533(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 535(@entryPointOutput) Location 0
Decorate 540(g_sSamp) DescriptorSet 0
Decorate 540(g_sSamp) Binding 0
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 0
@@ -2433,11 +2438,12 @@ gl_FragCoord origin is upper left
528: TypePointer Function 521(fvec4)
530: 14(int) Constant 1
531: TypePointer Function 9(float)
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
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
4(main): 2 Function None 3
5: Label
8(sizeQueryTemp): 7(ptr) Variable Function
@@ -3051,7 +3057,7 @@ gl_FragCoord origin is upper left
Store 529 527
532: 531(ptr) AccessChain 524(psout) 530
Store 532 526
535:522(PS_OUTPUT) Load 524(psout)
Store 534(@entryPointOutput) 535
536:522(PS_OUTPUT) Load 524(psout)
Store 535(@entryPointOutput) 536
Return
FunctionEnd