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

22
Test/baseResults/hlsl.promotions.frag.out
View File

@@ -498,7 +498,7 @@ gl_FragCoord origin is upper left
0:199 'outval' (temp 4-component vector of float)
0:200 Sequence
0:200 move second child to first child (temp structure{temp 4-component vector of float Color})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color})
0:200 'psout' (temp structure{temp 4-component vector of float Color})
0:200 Branch: Return
0:? Linker Objects
@@ -1016,7 +1016,7 @@ gl_FragCoord origin is upper left
0:199 'outval' (temp 4-component vector of float)
0:200 Sequence
0:200 move second child to first child (temp structure{temp 4-component vector of float Color})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color})
0:200 'psout' (temp structure{temp 4-component vector of float Color})
0:200 Branch: Return
0:? Linker Objects
@@ -1033,13 +1033,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 480
// Id's are bound by 481
Capability Shader
Capability Float64
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 477
EntryPoint Fragment 4 "main" 478
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 11 "Fn_F3(vf3;"
@@ -1128,7 +1128,10 @@ gl_FragCoord origin is upper left
Name 471 "PS_OUTPUT"
MemberName 471(PS_OUTPUT) 0 "Color"
Name 473 "psout"
Name 477 "@entryPointOutput"
Name 476 "PS_OUTPUT"
MemberName 476(PS_OUTPUT) 0 "Color"
Name 478 "@entryPointOutput"
Decorate 478(@entryPointOutput) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -1199,8 +1202,9 @@ gl_FragCoord origin is upper left
465: 6(float) Constant 1080452710
471(PS_OUTPUT): TypeStruct 462(fvec4)
472: TypePointer Function 471(PS_OUTPUT)
476: TypePointer Output 471(PS_OUTPUT)
477(@entryPointOutput): 476(ptr) Variable Output
476(PS_OUTPUT): TypeStruct 462(fvec4)
477: TypePointer Output 476(PS_OUTPUT)
478(@entryPointOutput): 477(ptr) Variable Output
4(main): 2 Function None 3
5: Label
252(r00): 8(ptr) Variable Function
@@ -1466,8 +1470,8 @@ gl_FragCoord origin is upper left
474: 462(fvec4) Load 464(outval)
475: 463(ptr) AccessChain 473(psout) 149
Store 475 474
478:471(PS_OUTPUT) Load 473(psout)
Store 477(@entryPointOutput) 478
479:471(PS_OUTPUT) Load 473(psout)
Store 478(@entryPointOutput) 479
Return
FunctionEnd
11(Fn_F3(vf3;): 2 Function None 9