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
@@ -8,7 +8,7 @@ output primitive = triangle_strip
|
||||
0:13 Function Definition: @main(u1[1];struct-PSInput-vf4-vf2-vf3-u11; (temp void)
|
||||
0:13 Function Parameters:
|
||||
0:13 'v' (in 1-element array of uint)
|
||||
0:13 'OutputStream' (out structure{temp 4-component vector of float Position Pos, temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID})
|
||||
0:13 'OutputStream' (out structure{temp 4-component vector of float Pos, temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID})
|
||||
0:? Sequence
|
||||
0:16 Sequence
|
||||
0:16 move second child to first child (temp structure{temp 4-component vector of float Pos, temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID})
|
||||
@@ -69,7 +69,7 @@ output primitive = triangle_strip
|
||||
0:? 'v' (layout(location=0 ) in 1-element array of uint)
|
||||
0:13 Function Call: @main(u1[1];struct-PSInput-vf4-vf2-vf3-u11; (temp void)
|
||||
0:? 'v' (temp 1-element array of uint)
|
||||
0:? 'OutputStream' (temp structure{temp 4-component vector of float Position Pos, temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID})
|
||||
0:? 'OutputStream' (temp structure{temp 4-component vector of float Pos, temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID})
|
||||
0:? Linker Objects
|
||||
0:? 'v' (layout(location=0 ) in 1-element array of uint)
|
||||
|
||||
@@ -86,7 +86,7 @@ output primitive = triangle_strip
|
||||
0:13 Function Definition: @main(u1[1];struct-PSInput-vf4-vf2-vf3-u11; (temp void)
|
||||
0:13 Function Parameters:
|
||||
0:13 'v' (in 1-element array of uint)
|
||||
0:13 'OutputStream' (out structure{temp 4-component vector of float Position Pos, temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID})
|
||||
0:13 'OutputStream' (out structure{temp 4-component vector of float Pos, temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID})
|
||||
0:? Sequence
|
||||
0:16 Sequence
|
||||
0:16 move second child to first child (temp structure{temp 4-component vector of float Pos, temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID})
|
||||
@@ -147,18 +147,18 @@ output primitive = triangle_strip
|
||||
0:? 'v' (layout(location=0 ) in 1-element array of uint)
|
||||
0:13 Function Call: @main(u1[1];struct-PSInput-vf4-vf2-vf3-u11; (temp void)
|
||||
0:? 'v' (temp 1-element array of uint)
|
||||
0:? 'OutputStream' (temp structure{temp 4-component vector of float Position Pos, temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID})
|
||||
0:? 'OutputStream' (temp structure{temp 4-component vector of float Pos, temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID})
|
||||
0:? Linker Objects
|
||||
0:? 'v' (layout(location=0 ) in 1-element array of uint)
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 98
|
||||
// Id's are bound by 97
|
||||
|
||||
Capability Geometry
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Geometry 4 "main" 91
|
||||
EntryPoint Geometry 4 "main" 90
|
||||
ExecutionMode 4 InputPoints
|
||||
ExecutionMode 4 Invocations 1
|
||||
ExecutionMode 4 OutputTriangleStrip
|
||||
@@ -172,27 +172,27 @@ output primitive = triangle_strip
|
||||
Name 19 "@main(u1[1];struct-PSInput-vf4-vf2-vf3-u11;"
|
||||
Name 17 "v"
|
||||
Name 18 "OutputStream"
|
||||
Name 21 "PSInput"
|
||||
MemberName 21(PSInput) 0 "Pos"
|
||||
MemberName 21(PSInput) 1 "TexCoord"
|
||||
MemberName 21(PSInput) 2 "TerrainPos"
|
||||
MemberName 21(PSInput) 3 "VertexID"
|
||||
Name 23 "Out"
|
||||
Name 48 "x"
|
||||
Name 57 "y"
|
||||
Name 65 "PSInput"
|
||||
MemberName 65(PSInput) 0 "Pos"
|
||||
MemberName 65(PSInput) 1 "TexCoord"
|
||||
MemberName 65(PSInput) 2 "TerrainPos"
|
||||
MemberName 65(PSInput) 3 "VertexID"
|
||||
Name 71 "Verts"
|
||||
Name 89 "v"
|
||||
Name 91 "v"
|
||||
Name 93 "OutputStream"
|
||||
Name 94 "param"
|
||||
Name 96 "param"
|
||||
MemberDecorate 14(PSInput) 0 BuiltIn Position
|
||||
Decorate 91(v) Location 0
|
||||
Name 21 "Out"
|
||||
Name 22 "PSInput"
|
||||
MemberName 22(PSInput) 0 "Pos"
|
||||
MemberName 22(PSInput) 1 "TexCoord"
|
||||
MemberName 22(PSInput) 2 "TerrainPos"
|
||||
MemberName 22(PSInput) 3 "VertexID"
|
||||
Name 47 "x"
|
||||
Name 56 "y"
|
||||
Name 64 "PSInput"
|
||||
MemberName 64(PSInput) 0 "Pos"
|
||||
MemberName 64(PSInput) 1 "TexCoord"
|
||||
MemberName 64(PSInput) 2 "TerrainPos"
|
||||
MemberName 64(PSInput) 3 "VertexID"
|
||||
Name 70 "Verts"
|
||||
Name 88 "v"
|
||||
Name 90 "v"
|
||||
Name 92 "OutputStream"
|
||||
Name 93 "param"
|
||||
Name 95 "param"
|
||||
MemberDecorate 22(PSInput) 0 BuiltIn Position
|
||||
Decorate 90(v) Location 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeInt 32 0
|
||||
@@ -206,116 +206,115 @@ output primitive = triangle_strip
|
||||
14(PSInput): TypeStruct 11(fvec4) 12(fvec2) 13(fvec3) 6(int)
|
||||
15: TypePointer Function 14(PSInput)
|
||||
16: TypeFunction 2 9(ptr) 15(ptr)
|
||||
21(PSInput): TypeStruct 11(fvec4) 12(fvec2) 13(fvec3) 6(int)
|
||||
22: TypePointer Function 21(PSInput)
|
||||
24: 10(float) Constant 0
|
||||
25: 11(fvec4) ConstantComposite 24 24 24 24
|
||||
26: 12(fvec2) ConstantComposite 24 24
|
||||
27: 13(fvec3) ConstantComposite 24 24 24
|
||||
28: 6(int) Constant 0
|
||||
29: 14(PSInput) ConstantComposite 25 26 27 28
|
||||
31: TypeInt 32 1
|
||||
32: 31(int) Constant 0
|
||||
33: TypePointer Function 11(fvec4)
|
||||
36: 31(int) Constant 1
|
||||
37: TypePointer Function 12(fvec2)
|
||||
40: 31(int) Constant 2
|
||||
41: TypePointer Function 13(fvec3)
|
||||
44: 31(int) Constant 3
|
||||
45: TypePointer Function 6(int)
|
||||
47: TypePointer Function 31(int)
|
||||
55: TypeBool
|
||||
65(PSInput): TypeStruct 11(fvec4) 12(fvec2) 13(fvec3) 6(int)
|
||||
66: 6(int) Constant 3
|
||||
67: TypeArray 65(PSInput) 66
|
||||
68: 6(int) Constant 2
|
||||
69: TypeArray 67 68
|
||||
70: TypePointer Function 69
|
||||
75: TypePointer Function 65(PSInput)
|
||||
90: TypePointer Input 8
|
||||
91(v): 90(ptr) Variable Input
|
||||
22(PSInput): TypeStruct 11(fvec4) 12(fvec2) 13(fvec3) 6(int)
|
||||
23: 10(float) Constant 0
|
||||
24: 11(fvec4) ConstantComposite 23 23 23 23
|
||||
25: 12(fvec2) ConstantComposite 23 23
|
||||
26: 13(fvec3) ConstantComposite 23 23 23
|
||||
27: 6(int) Constant 0
|
||||
28: 22(PSInput) ConstantComposite 24 25 26 27
|
||||
30: TypeInt 32 1
|
||||
31: 30(int) Constant 0
|
||||
32: TypePointer Function 11(fvec4)
|
||||
35: 30(int) Constant 1
|
||||
36: TypePointer Function 12(fvec2)
|
||||
39: 30(int) Constant 2
|
||||
40: TypePointer Function 13(fvec3)
|
||||
43: 30(int) Constant 3
|
||||
44: TypePointer Function 6(int)
|
||||
46: TypePointer Function 30(int)
|
||||
54: TypeBool
|
||||
64(PSInput): TypeStruct 11(fvec4) 12(fvec2) 13(fvec3) 6(int)
|
||||
65: 6(int) Constant 3
|
||||
66: TypeArray 64(PSInput) 65
|
||||
67: 6(int) Constant 2
|
||||
68: TypeArray 66 67
|
||||
69: TypePointer Function 68
|
||||
74: TypePointer Function 64(PSInput)
|
||||
89: TypePointer Input 8
|
||||
90(v): 89(ptr) Variable Input
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
89(v): 9(ptr) Variable Function
|
||||
93(OutputStream): 15(ptr) Variable Function
|
||||
94(param): 9(ptr) Variable Function
|
||||
96(param): 15(ptr) Variable Function
|
||||
92: 8 Load 91(v)
|
||||
Store 89(v) 92
|
||||
95: 8 Load 89(v)
|
||||
Store 94(param) 95
|
||||
97: 2 FunctionCall 19(@main(u1[1];struct-PSInput-vf4-vf2-vf3-u11;) 94(param) 96(param)
|
||||
88(v): 9(ptr) Variable Function
|
||||
92(OutputStream): 15(ptr) Variable Function
|
||||
93(param): 9(ptr) Variable Function
|
||||
95(param): 15(ptr) Variable Function
|
||||
91: 8 Load 90(v)
|
||||
Store 88(v) 91
|
||||
94: 8 Load 88(v)
|
||||
Store 93(param) 94
|
||||
96: 2 FunctionCall 19(@main(u1[1];struct-PSInput-vf4-vf2-vf3-u11;) 93(param) 95(param)
|
||||
Return
|
||||
FunctionEnd
|
||||
19(@main(u1[1];struct-PSInput-vf4-vf2-vf3-u11;): 2 Function None 16
|
||||
17(v): 9(ptr) FunctionParameter
|
||||
18(OutputStream): 15(ptr) FunctionParameter
|
||||
20: Label
|
||||
23(Out): 22(ptr) Variable Function
|
||||
48(x): 47(ptr) Variable Function
|
||||
57(y): 47(ptr) Variable Function
|
||||
71(Verts): 70(ptr) Variable Function
|
||||
30: 11(fvec4) CompositeExtract 29 0
|
||||
34: 33(ptr) AccessChain 23(Out) 32
|
||||
Store 34 30
|
||||
35: 12(fvec2) CompositeExtract 29 1
|
||||
38: 37(ptr) AccessChain 23(Out) 36
|
||||
Store 38 35
|
||||
39: 13(fvec3) CompositeExtract 29 2
|
||||
42: 41(ptr) AccessChain 23(Out) 40
|
||||
Store 42 39
|
||||
43: 6(int) CompositeExtract 29 3
|
||||
46: 45(ptr) AccessChain 23(Out) 44
|
||||
Store 46 43
|
||||
Store 48(x) 32
|
||||
Branch 49
|
||||
49: Label
|
||||
LoopMerge 51 52 None
|
||||
Branch 53
|
||||
53: Label
|
||||
54: 31(int) Load 48(x)
|
||||
56: 55(bool) SLessThan 54 40
|
||||
BranchConditional 56 50 51
|
||||
50: Label
|
||||
Store 57(y) 32
|
||||
Branch 58
|
||||
58: Label
|
||||
LoopMerge 60 61 None
|
||||
Branch 62
|
||||
62: Label
|
||||
63: 31(int) Load 57(y)
|
||||
64: 55(bool) SLessThan 63 40
|
||||
BranchConditional 64 59 60
|
||||
59: Label
|
||||
72: 31(int) Load 48(x)
|
||||
73: 31(int) Load 57(y)
|
||||
74: 21(PSInput) Load 23(Out)
|
||||
76: 75(ptr) AccessChain 71(Verts) 72 73
|
||||
77: 11(fvec4) CompositeExtract 74 0
|
||||
78: 33(ptr) AccessChain 76 32
|
||||
Store 78 77
|
||||
79: 12(fvec2) CompositeExtract 74 1
|
||||
80: 37(ptr) AccessChain 76 36
|
||||
Store 80 79
|
||||
81: 13(fvec3) CompositeExtract 74 2
|
||||
82: 41(ptr) AccessChain 76 40
|
||||
Store 82 81
|
||||
83: 6(int) CompositeExtract 74 3
|
||||
84: 45(ptr) AccessChain 76 44
|
||||
Store 84 83
|
||||
Branch 61
|
||||
61: Label
|
||||
85: 31(int) Load 57(y)
|
||||
86: 31(int) IAdd 85 36
|
||||
Store 57(y) 86
|
||||
Branch 58
|
||||
60: Label
|
||||
Branch 52
|
||||
52: Label
|
||||
87: 31(int) Load 48(x)
|
||||
88: 31(int) IAdd 87 36
|
||||
Store 48(x) 88
|
||||
Branch 49
|
||||
51: Label
|
||||
21(Out): 15(ptr) Variable Function
|
||||
47(x): 46(ptr) Variable Function
|
||||
56(y): 46(ptr) Variable Function
|
||||
70(Verts): 69(ptr) Variable Function
|
||||
29: 11(fvec4) CompositeExtract 28 0
|
||||
33: 32(ptr) AccessChain 21(Out) 31
|
||||
Store 33 29
|
||||
34: 12(fvec2) CompositeExtract 28 1
|
||||
37: 36(ptr) AccessChain 21(Out) 35
|
||||
Store 37 34
|
||||
38: 13(fvec3) CompositeExtract 28 2
|
||||
41: 40(ptr) AccessChain 21(Out) 39
|
||||
Store 41 38
|
||||
42: 6(int) CompositeExtract 28 3
|
||||
45: 44(ptr) AccessChain 21(Out) 43
|
||||
Store 45 42
|
||||
Store 47(x) 31
|
||||
Branch 48
|
||||
48: Label
|
||||
LoopMerge 50 51 None
|
||||
Branch 52
|
||||
52: Label
|
||||
53: 30(int) Load 47(x)
|
||||
55: 54(bool) SLessThan 53 39
|
||||
BranchConditional 55 49 50
|
||||
49: Label
|
||||
Store 56(y) 31
|
||||
Branch 57
|
||||
57: Label
|
||||
LoopMerge 59 60 None
|
||||
Branch 61
|
||||
61: Label
|
||||
62: 30(int) Load 56(y)
|
||||
63: 54(bool) SLessThan 62 39
|
||||
BranchConditional 63 58 59
|
||||
58: Label
|
||||
71: 30(int) Load 47(x)
|
||||
72: 30(int) Load 56(y)
|
||||
73: 14(PSInput) Load 21(Out)
|
||||
75: 74(ptr) AccessChain 70(Verts) 71 72
|
||||
76: 11(fvec4) CompositeExtract 73 0
|
||||
77: 32(ptr) AccessChain 75 31
|
||||
Store 77 76
|
||||
78: 12(fvec2) CompositeExtract 73 1
|
||||
79: 36(ptr) AccessChain 75 35
|
||||
Store 79 78
|
||||
80: 13(fvec3) CompositeExtract 73 2
|
||||
81: 40(ptr) AccessChain 75 39
|
||||
Store 81 80
|
||||
82: 6(int) CompositeExtract 73 3
|
||||
83: 44(ptr) AccessChain 75 43
|
||||
Store 83 82
|
||||
Branch 60
|
||||
60: Label
|
||||
84: 30(int) Load 56(y)
|
||||
85: 30(int) IAdd 84 35
|
||||
Store 56(y) 85
|
||||
Branch 57
|
||||
59: Label
|
||||
Branch 51
|
||||
51: Label
|
||||
86: 30(int) Load 47(x)
|
||||
87: 30(int) IAdd 86 35
|
||||
Store 47(x) 87
|
||||
Branch 48
|
||||
50: Label
|
||||
Return
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user