HLSL: Make the entry-point shadow function have non-IO params and return.
This also removes an no longer needed makeTemporary() and rationalizes makeTypeNonIo()'s interface.
This commit is contained in:
John Kessenich
@@ -5,10 +5,10 @@ gl_FragCoord origin is upper left
|
||||
0:7 Function Definition: @main(i1;struct-S-f1-vf41[3]; (temp 4-component vector of float)
|
||||
0:7 Function Parameters:
|
||||
0:7 'i' (in int)
|
||||
0:7 'input' (in 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:7 'input' (in 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:? Sequence
|
||||
0:9 move second child to first child (temp 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:9 'input' (in 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:9 move second child to first child (temp 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:9 'input' (in 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:9 'a' (temp 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:11 Branch: Return with expression
|
||||
0:11 Constant:
|
||||
@@ -24,8 +24,8 @@ gl_FragCoord origin is upper left
|
||||
0:7 Sequence
|
||||
0:7 move second child to first child (temp float)
|
||||
0:7 f: direct index for structure (temp float)
|
||||
0:7 direct index (temp structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:7 direct index (temp structure{temp float f, temp 4-component vector of float pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:7 Constant:
|
||||
0:7 0 (const int)
|
||||
0:7 Constant:
|
||||
@@ -39,8 +39,8 @@ gl_FragCoord origin is upper left
|
||||
0:7 0 (const int)
|
||||
0:7 move second child to first child (temp float)
|
||||
0:7 f: direct index for structure (temp float)
|
||||
0:7 direct index (temp structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:7 direct index (temp structure{temp float f, temp 4-component vector of float pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:7 Constant:
|
||||
0:7 1 (const int)
|
||||
0:7 Constant:
|
||||
@@ -54,8 +54,8 @@ gl_FragCoord origin is upper left
|
||||
0:7 0 (const int)
|
||||
0:7 move second child to first child (temp float)
|
||||
0:7 f: direct index for structure (temp float)
|
||||
0:7 direct index (temp structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:7 direct index (temp structure{temp float f, temp 4-component vector of float pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:7 Constant:
|
||||
0:7 2 (const int)
|
||||
0:7 Constant:
|
||||
@@ -71,7 +71,7 @@ gl_FragCoord origin is upper left
|
||||
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
|
||||
0:7 Function Call: @main(i1;struct-S-f1-vf41[3]; (temp 4-component vector of float)
|
||||
0:? 'i' (temp int)
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:? Linker Objects
|
||||
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
|
||||
0:? 'i' (layout(location=0 ) in int)
|
||||
@@ -88,10 +88,10 @@ gl_FragCoord origin is upper left
|
||||
0:7 Function Definition: @main(i1;struct-S-f1-vf41[3]; (temp 4-component vector of float)
|
||||
0:7 Function Parameters:
|
||||
0:7 'i' (in int)
|
||||
0:7 'input' (in 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:7 'input' (in 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:? Sequence
|
||||
0:9 move second child to first child (temp 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:9 'input' (in 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:9 move second child to first child (temp 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:9 'input' (in 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:9 'a' (temp 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:11 Branch: Return with expression
|
||||
0:11 Constant:
|
||||
@@ -107,8 +107,8 @@ gl_FragCoord origin is upper left
|
||||
0:7 Sequence
|
||||
0:7 move second child to first child (temp float)
|
||||
0:7 f: direct index for structure (temp float)
|
||||
0:7 direct index (temp structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:7 direct index (temp structure{temp float f, temp 4-component vector of float pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:7 Constant:
|
||||
0:7 0 (const int)
|
||||
0:7 Constant:
|
||||
@@ -122,8 +122,8 @@ gl_FragCoord origin is upper left
|
||||
0:7 0 (const int)
|
||||
0:7 move second child to first child (temp float)
|
||||
0:7 f: direct index for structure (temp float)
|
||||
0:7 direct index (temp structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:7 direct index (temp structure{temp float f, temp 4-component vector of float pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:7 Constant:
|
||||
0:7 1 (const int)
|
||||
0:7 Constant:
|
||||
@@ -137,8 +137,8 @@ gl_FragCoord origin is upper left
|
||||
0:7 0 (const int)
|
||||
0:7 move second child to first child (temp float)
|
||||
0:7 f: direct index for structure (temp float)
|
||||
0:7 direct index (temp structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:7 direct index (temp structure{temp float f, temp 4-component vector of float pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:7 Constant:
|
||||
0:7 2 (const int)
|
||||
0:7 Constant:
|
||||
@@ -154,7 +154,7 @@ gl_FragCoord origin is upper left
|
||||
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
|
||||
0:7 Function Call: @main(i1;struct-S-f1-vf41[3]; (temp 4-component vector of float)
|
||||
0:? 'i' (temp int)
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float FragCoord pos})
|
||||
0:? 'input' (temp 3-element array of structure{temp float f, temp 4-component vector of float pos})
|
||||
0:? Linker Objects
|
||||
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
|
||||
0:? 'i' (layout(location=0 ) in int)
|
||||
@@ -163,12 +163,12 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 85
|
||||
// Id's are bound by 63
|
||||
|
||||
Capability Shader
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 58 64 76 84
|
||||
EntryPoint Fragment 4 "main" 32 39 54 62
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Name 4 "main"
|
||||
Name 10 "S"
|
||||
@@ -177,25 +177,21 @@ gl_FragCoord origin is upper left
|
||||
Name 18 "@main(i1;struct-S-f1-vf41[3];"
|
||||
Name 16 "i"
|
||||
Name 17 "input"
|
||||
Name 20 "S"
|
||||
MemberName 20(S) 0 "f"
|
||||
MemberName 20(S) 1 "pos"
|
||||
Name 23 "a"
|
||||
Name 56 "i"
|
||||
Name 58 "i"
|
||||
Name 60 "input"
|
||||
Name 61 "S"
|
||||
MemberName 61(S) 0 "f"
|
||||
Name 64 "input"
|
||||
Name 76 "@entryPointOutput"
|
||||
Name 77 "param"
|
||||
Name 79 "param"
|
||||
Name 84 "input_pos"
|
||||
MemberDecorate 10(S) 1 BuiltIn FragCoord
|
||||
Decorate 58(i) Location 0
|
||||
Decorate 64(input) Location 1
|
||||
Decorate 76(@entryPointOutput) Location 0
|
||||
Decorate 84(input_pos) BuiltIn FragCoord
|
||||
Name 20 "a"
|
||||
Name 30 "i"
|
||||
Name 32 "i"
|
||||
Name 34 "input"
|
||||
Name 36 "S"
|
||||
MemberName 36(S) 0 "f"
|
||||
Name 39 "input"
|
||||
Name 54 "@entryPointOutput"
|
||||
Name 55 "param"
|
||||
Name 57 "param"
|
||||
Name 62 "input_pos"
|
||||
Decorate 32(i) Location 0
|
||||
Decorate 39(input) Location 1
|
||||
Decorate 54(@entryPointOutput) Location 0
|
||||
Decorate 62(input_pos) BuiltIn FragCoord
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeInt 32 1
|
||||
@@ -208,90 +204,63 @@ gl_FragCoord origin is upper left
|
||||
13: TypeArray 10(S) 12
|
||||
14: TypePointer Function 13
|
||||
15: TypeFunction 9(fvec4) 7(ptr) 14(ptr)
|
||||
20(S): TypeStruct 8(float) 9(fvec4)
|
||||
21: TypeArray 20(S) 12
|
||||
22: TypePointer Function 21
|
||||
26: 6(int) Constant 0
|
||||
27: TypePointer Function 10(S)
|
||||
30: TypePointer Function 8(float)
|
||||
33: 6(int) Constant 1
|
||||
34: TypePointer Function 9(fvec4)
|
||||
43: 6(int) Constant 2
|
||||
49: TypeVector 8(float) 3
|
||||
50: 8(float) Constant 1065353216
|
||||
51: 49(fvec3) ConstantComposite 50 50 50
|
||||
57: TypePointer Input 6(int)
|
||||
58(i): 57(ptr) Variable Input
|
||||
61(S): TypeStruct 8(float)
|
||||
62: TypeArray 61(S) 12
|
||||
63: TypePointer Input 62
|
||||
64(input): 63(ptr) Variable Input
|
||||
65: TypePointer Input 8(float)
|
||||
75: TypePointer Output 9(fvec4)
|
||||
76(@entryPointOutput): 75(ptr) Variable Output
|
||||
82: TypeArray 9(fvec4) 12
|
||||
83: TypePointer Input 82
|
||||
84(input_pos): 83(ptr) Variable Input
|
||||
22: TypeVector 8(float) 3
|
||||
23: 8(float) Constant 1065353216
|
||||
24: 22(fvec3) ConstantComposite 23 23 23
|
||||
25: TypePointer Function 9(fvec4)
|
||||
31: TypePointer Input 6(int)
|
||||
32(i): 31(ptr) Variable Input
|
||||
35: 6(int) Constant 0
|
||||
36(S): TypeStruct 8(float)
|
||||
37: TypeArray 36(S) 12
|
||||
38: TypePointer Input 37
|
||||
39(input): 38(ptr) Variable Input
|
||||
40: TypePointer Input 8(float)
|
||||
43: TypePointer Function 8(float)
|
||||
45: 6(int) Constant 1
|
||||
49: 6(int) Constant 2
|
||||
53: TypePointer Output 9(fvec4)
|
||||
54(@entryPointOutput): 53(ptr) Variable Output
|
||||
60: TypeArray 9(fvec4) 12
|
||||
61: TypePointer Input 60
|
||||
62(input_pos): 61(ptr) Variable Input
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
56(i): 7(ptr) Variable Function
|
||||
60(input): 14(ptr) Variable Function
|
||||
77(param): 7(ptr) Variable Function
|
||||
79(param): 14(ptr) Variable Function
|
||||
59: 6(int) Load 58(i)
|
||||
Store 56(i) 59
|
||||
66: 65(ptr) AccessChain 64(input) 26 26
|
||||
67: 8(float) Load 66
|
||||
68: 30(ptr) AccessChain 60(input) 26 26
|
||||
Store 68 67
|
||||
69: 65(ptr) AccessChain 64(input) 33 26
|
||||
70: 8(float) Load 69
|
||||
71: 30(ptr) AccessChain 60(input) 33 26
|
||||
Store 71 70
|
||||
72: 65(ptr) AccessChain 64(input) 43 26
|
||||
73: 8(float) Load 72
|
||||
74: 30(ptr) AccessChain 60(input) 43 26
|
||||
Store 74 73
|
||||
78: 6(int) Load 56(i)
|
||||
Store 77(param) 78
|
||||
80: 13 Load 60(input)
|
||||
Store 79(param) 80
|
||||
81: 9(fvec4) FunctionCall 18(@main(i1;struct-S-f1-vf41[3];) 77(param) 79(param)
|
||||
Store 76(@entryPointOutput) 81
|
||||
30(i): 7(ptr) Variable Function
|
||||
34(input): 14(ptr) Variable Function
|
||||
55(param): 7(ptr) Variable Function
|
||||
57(param): 14(ptr) Variable Function
|
||||
33: 6(int) Load 32(i)
|
||||
Store 30(i) 33
|
||||
41: 40(ptr) AccessChain 39(input) 35 35
|
||||
42: 8(float) Load 41
|
||||
44: 43(ptr) AccessChain 34(input) 35 35
|
||||
Store 44 42
|
||||
46: 40(ptr) AccessChain 39(input) 45 35
|
||||
47: 8(float) Load 46
|
||||
48: 43(ptr) AccessChain 34(input) 45 35
|
||||
Store 48 47
|
||||
50: 40(ptr) AccessChain 39(input) 49 35
|
||||
51: 8(float) Load 50
|
||||
52: 43(ptr) AccessChain 34(input) 49 35
|
||||
Store 52 51
|
||||
56: 6(int) Load 30(i)
|
||||
Store 55(param) 56
|
||||
58: 13 Load 34(input)
|
||||
Store 57(param) 58
|
||||
59: 9(fvec4) FunctionCall 18(@main(i1;struct-S-f1-vf41[3];) 55(param) 57(param)
|
||||
Store 54(@entryPointOutput) 59
|
||||
Return
|
||||
FunctionEnd
|
||||
18(@main(i1;struct-S-f1-vf41[3];): 9(fvec4) Function None 15
|
||||
16(i): 7(ptr) FunctionParameter
|
||||
17(input): 14(ptr) FunctionParameter
|
||||
19: Label
|
||||
23(a): 22(ptr) Variable Function
|
||||
52: 34(ptr) Variable Function
|
||||
24: 21 Load 23(a)
|
||||
25: 20(S) CompositeExtract 24 0
|
||||
28: 27(ptr) AccessChain 17(input) 26
|
||||
29: 8(float) CompositeExtract 25 0
|
||||
31: 30(ptr) AccessChain 28 26
|
||||
Store 31 29
|
||||
32: 9(fvec4) CompositeExtract 25 1
|
||||
35: 34(ptr) AccessChain 28 33
|
||||
Store 35 32
|
||||
36: 20(S) CompositeExtract 24 1
|
||||
37: 27(ptr) AccessChain 17(input) 33
|
||||
38: 8(float) CompositeExtract 36 0
|
||||
39: 30(ptr) AccessChain 37 26
|
||||
Store 39 38
|
||||
40: 9(fvec4) CompositeExtract 36 1
|
||||
41: 34(ptr) AccessChain 37 33
|
||||
Store 41 40
|
||||
42: 20(S) CompositeExtract 24 2
|
||||
44: 27(ptr) AccessChain 17(input) 43
|
||||
45: 8(float) CompositeExtract 42 0
|
||||
46: 30(ptr) AccessChain 44 26
|
||||
Store 46 45
|
||||
47: 9(fvec4) CompositeExtract 42 1
|
||||
48: 34(ptr) AccessChain 44 33
|
||||
Store 48 47
|
||||
Store 52 51
|
||||
53: 9(fvec4) Load 52
|
||||
ReturnValue 53
|
||||
20(a): 14(ptr) Variable Function
|
||||
26: 25(ptr) Variable Function
|
||||
21: 13 Load 20(a)
|
||||
Store 17(input) 21
|
||||
Store 26 24
|
||||
27: 9(fvec4) Load 26
|
||||
ReturnValue 27
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user