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

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

View file

@ -21,7 +21,7 @@ gl_FragCoord origin is upper left
0:16 1.000000
0:17 Sequence
0:17 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:17 'ps_output' (temp structure{temp 4-component vector of float color})
0:17 Branch: Return
0:? Linker Objects
@ -52,19 +52,19 @@ gl_FragCoord origin is upper left
0:16 1.000000
0:17 Sequence
0:17 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:17 'ps_output' (temp structure{temp 4-component vector of float color})
0:17 Branch: Return
0:? Linker Objects
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 25
// Id's are bound by 26
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 22
EntryPoint Fragment 4 "main" 23
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 6 "MyFunc("
@ -72,7 +72,10 @@ gl_FragCoord origin is upper left
Name 12 "PS_OUTPUT"
MemberName 12(PS_OUTPUT) 0 "color"
Name 14 "ps_output"
Name 22 "@entryPointOutput"
Name 21 "PS_OUTPUT"
MemberName 21(PS_OUTPUT) 0 "color"
Name 23 "@entryPointOutput"
Decorate 23(@entryPointOutput) Location 0
2: TypeVoid
3: TypeFunction 2
10: TypeFloat 32
@ -84,15 +87,16 @@ gl_FragCoord origin is upper left
17: 10(float) Constant 1065353216
18: 11(fvec4) ConstantComposite 17 17 17 17
19: TypePointer Function 11(fvec4)
21: TypePointer Output 12(PS_OUTPUT)
22(@entryPointOutput): 21(ptr) Variable Output
21(PS_OUTPUT): TypeStruct 11(fvec4)
22: TypePointer Output 21(PS_OUTPUT)
23(@entryPointOutput): 22(ptr) Variable Output
4(main): 2 Function None 3
5: Label
14(ps_output): 13(ptr) Variable Function
20: 19(ptr) AccessChain 14(ps_output) 16
Store 20 18
23:12(PS_OUTPUT) Load 14(ps_output)
Store 22(@entryPointOutput) 23
24:12(PS_OUTPUT) Load 14(ps_output)
Store 23(@entryPointOutput) 24
Return
FunctionEnd
6(MyFunc(): 2 Function None 3