HLSL: Wrap the entry-point; need to write 'in' args, and support 'inout' args.
This needs some render testing, but is destined to be part of master. This also leads to a variety of other simplifications. - IO are global symbols, so only need one list of linkage nodes (deferred) - no longer need parse-context-wide 'inEntryPoint' state, entry-point is localized - several parts of splitting/flattening are now localized
This commit is contained in:
@@ -14,19 +14,19 @@ gl_FragCoord origin is upper left
|
||||
0:3 1.000000
|
||||
0:3 true case
|
||||
0:4 Branch: Kill
|
||||
0:8 Function Definition: PixelShaderFunction(vf4; (temp void)
|
||||
0:8 Function Definition: @PixelShaderFunction(vf4; (temp void)
|
||||
0:8 Function Parameters:
|
||||
0:8 'input' (layout(location=0 ) in 4-component vector of float)
|
||||
0:8 'input' (in 4-component vector of float)
|
||||
0:? Sequence
|
||||
0:9 Function Call: foo(f1; (temp void)
|
||||
0:9 direct index (temp float)
|
||||
0:9 'input' (layout(location=0 ) in 4-component vector of float)
|
||||
0:9 'input' (in 4-component vector of float)
|
||||
0:9 Constant:
|
||||
0:9 2 (const int)
|
||||
0:10 Test condition and select (temp void)
|
||||
0:10 Condition
|
||||
0:10 direct index (temp float)
|
||||
0:10 'input' (layout(location=0 ) in 4-component vector of float)
|
||||
0:10 'input' (in 4-component vector of float)
|
||||
0:10 Constant:
|
||||
0:10 0 (const int)
|
||||
0:10 true case
|
||||
@@ -35,10 +35,18 @@ gl_FragCoord origin is upper left
|
||||
0:12 move second child to first child (temp float)
|
||||
0:12 'f' (temp float)
|
||||
0:12 direct index (temp float)
|
||||
0:12 'input' (layout(location=0 ) in 4-component vector of float)
|
||||
0:12 'input' (in 4-component vector of float)
|
||||
0:12 Constant:
|
||||
0:12 0 (const int)
|
||||
0:13 Branch: Kill
|
||||
0:8 Function Definition: PixelShaderFunction( (temp void)
|
||||
0:8 Function Parameters:
|
||||
0:? Sequence
|
||||
0:8 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'input' (temp 4-component vector of float)
|
||||
0:? 'input' (layout(location=0 ) in 4-component vector of float)
|
||||
0:8 Function Call: @PixelShaderFunction(vf4; (temp void)
|
||||
0:? 'input' (temp 4-component vector of float)
|
||||
0:? Linker Objects
|
||||
0:? 'input' (layout(location=0 ) in 4-component vector of float)
|
||||
|
||||
@@ -61,19 +69,19 @@ gl_FragCoord origin is upper left
|
||||
0:3 1.000000
|
||||
0:3 true case
|
||||
0:4 Branch: Kill
|
||||
0:8 Function Definition: PixelShaderFunction(vf4; (temp void)
|
||||
0:8 Function Definition: @PixelShaderFunction(vf4; (temp void)
|
||||
0:8 Function Parameters:
|
||||
0:8 'input' (layout(location=0 ) in 4-component vector of float)
|
||||
0:8 'input' (in 4-component vector of float)
|
||||
0:? Sequence
|
||||
0:9 Function Call: foo(f1; (temp void)
|
||||
0:9 direct index (temp float)
|
||||
0:9 'input' (layout(location=0 ) in 4-component vector of float)
|
||||
0:9 'input' (in 4-component vector of float)
|
||||
0:9 Constant:
|
||||
0:9 2 (const int)
|
||||
0:10 Test condition and select (temp void)
|
||||
0:10 Condition
|
||||
0:10 direct index (temp float)
|
||||
0:10 'input' (layout(location=0 ) in 4-component vector of float)
|
||||
0:10 'input' (in 4-component vector of float)
|
||||
0:10 Constant:
|
||||
0:10 0 (const int)
|
||||
0:10 true case
|
||||
@@ -82,72 +90,97 @@ gl_FragCoord origin is upper left
|
||||
0:12 move second child to first child (temp float)
|
||||
0:12 'f' (temp float)
|
||||
0:12 direct index (temp float)
|
||||
0:12 'input' (layout(location=0 ) in 4-component vector of float)
|
||||
0:12 'input' (in 4-component vector of float)
|
||||
0:12 Constant:
|
||||
0:12 0 (const int)
|
||||
0:13 Branch: Kill
|
||||
0:8 Function Definition: PixelShaderFunction( (temp void)
|
||||
0:8 Function Parameters:
|
||||
0:? Sequence
|
||||
0:8 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'input' (temp 4-component vector of float)
|
||||
0:? 'input' (layout(location=0 ) in 4-component vector of float)
|
||||
0:8 Function Call: @PixelShaderFunction(vf4; (temp void)
|
||||
0:? 'input' (temp 4-component vector of float)
|
||||
0:? Linker Objects
|
||||
0:? 'input' (layout(location=0 ) in 4-component vector of float)
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 39
|
||||
// Id's are bound by 48
|
||||
|
||||
Capability Shader
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "PixelShaderFunction" 21
|
||||
EntryPoint Fragment 4 "PixelShaderFunction" 43
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Name 4 "PixelShaderFunction"
|
||||
Name 10 "foo(f1;"
|
||||
Name 9 "f"
|
||||
Name 21 "input"
|
||||
Name 22 "param"
|
||||
Name 35 "f"
|
||||
Decorate 21(input) Location 0
|
||||
Name 16 "@PixelShaderFunction(vf4;"
|
||||
Name 15 "input"
|
||||
Name 25 "param"
|
||||
Name 37 "f"
|
||||
Name 41 "input"
|
||||
Name 43 "input"
|
||||
Name 45 "param"
|
||||
Decorate 43(input) Location 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
7: TypePointer Function 6(float)
|
||||
8: TypeFunction 2 7(ptr)
|
||||
13: 6(float) Constant 1065353216
|
||||
14: TypeBool
|
||||
19: TypeVector 6(float) 4
|
||||
20: TypePointer Input 19(fvec4)
|
||||
21(input): 20(ptr) Variable Input
|
||||
23: TypeInt 32 0
|
||||
24: 23(int) Constant 2
|
||||
25: TypePointer Input 6(float)
|
||||
29: 23(int) Constant 0
|
||||
12: TypeVector 6(float) 4
|
||||
13: TypePointer Function 12(fvec4)
|
||||
14: TypeFunction 2 13(ptr)
|
||||
19: 6(float) Constant 1065353216
|
||||
20: TypeBool
|
||||
26: TypeInt 32 0
|
||||
27: 26(int) Constant 2
|
||||
31: 26(int) Constant 0
|
||||
42: TypePointer Input 12(fvec4)
|
||||
43(input): 42(ptr) Variable Input
|
||||
4(PixelShaderFunction): 2 Function None 3
|
||||
5: Label
|
||||
22(param): 7(ptr) Variable Function
|
||||
35(f): 7(ptr) Variable Function
|
||||
26: 25(ptr) AccessChain 21(input) 24
|
||||
27: 6(float) Load 26
|
||||
Store 22(param) 27
|
||||
28: 2 FunctionCall 10(foo(f1;) 22(param)
|
||||
30: 25(ptr) AccessChain 21(input) 29
|
||||
31: 6(float) Load 30
|
||||
SelectionMerge 33 None
|
||||
BranchConditional 31 32 33
|
||||
32: Label
|
||||
Kill
|
||||
33: Label
|
||||
36: 25(ptr) AccessChain 21(input) 29
|
||||
37: 6(float) Load 36
|
||||
Store 35(f) 37
|
||||
Kill
|
||||
41(input): 13(ptr) Variable Function
|
||||
45(param): 13(ptr) Variable Function
|
||||
44: 12(fvec4) Load 43(input)
|
||||
Store 41(input) 44
|
||||
46: 12(fvec4) Load 41(input)
|
||||
Store 45(param) 46
|
||||
47: 2 FunctionCall 16(@PixelShaderFunction(vf4;) 45(param)
|
||||
Return
|
||||
FunctionEnd
|
||||
10(foo(f1;): 2 Function None 8
|
||||
9(f): 7(ptr) FunctionParameter
|
||||
11: Label
|
||||
12: 6(float) Load 9(f)
|
||||
15: 14(bool) FOrdLessThan 12 13
|
||||
SelectionMerge 17 None
|
||||
BranchConditional 15 16 17
|
||||
16: Label
|
||||
18: 6(float) Load 9(f)
|
||||
21: 20(bool) FOrdLessThan 18 19
|
||||
SelectionMerge 23 None
|
||||
BranchConditional 21 22 23
|
||||
22: Label
|
||||
Kill
|
||||
17: Label
|
||||
23: Label
|
||||
Return
|
||||
FunctionEnd
|
||||
16(@PixelShaderFunction(vf4;): 2 Function None 14
|
||||
15(input): 13(ptr) FunctionParameter
|
||||
17: Label
|
||||
25(param): 7(ptr) Variable Function
|
||||
37(f): 7(ptr) Variable Function
|
||||
28: 7(ptr) AccessChain 15(input) 27
|
||||
29: 6(float) Load 28
|
||||
Store 25(param) 29
|
||||
30: 2 FunctionCall 10(foo(f1;) 25(param)
|
||||
32: 7(ptr) AccessChain 15(input) 31
|
||||
33: 6(float) Load 32
|
||||
SelectionMerge 35 None
|
||||
BranchConditional 33 34 35
|
||||
34: Label
|
||||
Kill
|
||||
35: Label
|
||||
38: 7(ptr) AccessChain 15(input) 31
|
||||
39: 6(float) Load 38
|
||||
Store 37(f) 39
|
||||
Kill
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user