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:
John Kessenich
@@ -2,7 +2,7 @@ hlsl.intrinsics.promote.outputs.frag
|
||||
Shader version: 450
|
||||
gl_FragCoord origin is upper left
|
||||
0:? Sequence
|
||||
0:20 Function Definition: main( (temp structure{temp 4-component vector of float color})
|
||||
0:20 Function Definition: @main( (temp structure{temp 4-component vector of float color})
|
||||
0:20 Function Parameters:
|
||||
0:? Sequence
|
||||
0:37 clamp (temp float)
|
||||
@@ -79,19 +79,22 @@ gl_FragCoord origin is upper left
|
||||
0:47 0.000000
|
||||
0:47 0.000000
|
||||
0:47 0.000000
|
||||
0:48 Sequence
|
||||
0:48 Sequence
|
||||
0:48 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:48 color: direct index for structure (temp 4-component vector of float)
|
||||
0:48 'ps_output' (temp structure{temp 4-component vector of float color})
|
||||
0:48 Constant:
|
||||
0:48 0 (const int)
|
||||
0:48 Branch: Return
|
||||
0:48 Branch: Return with expression
|
||||
0:48 'ps_output' (temp structure{temp 4-component vector of float color})
|
||||
0:20 Function Definition: main( (temp void)
|
||||
0:20 Function Parameters:
|
||||
0:? Sequence
|
||||
0:20 Sequence
|
||||
0:20 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:20 color: direct index for structure (temp 4-component vector of float)
|
||||
0:20 Function Call: @main( (temp structure{temp 4-component vector of float color})
|
||||
0:20 Constant:
|
||||
0:20 0 (const int)
|
||||
0:? Linker Objects
|
||||
0:? 'color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:? 'g_tTexbfs' (layout(r32f ) uniform samplerBuffer)
|
||||
0:? 'g_tTex1df4' (uniform texture1D)
|
||||
0:? 'color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:? 'anon@0' (layout(row_major std140 ) uniform block{layout(offset=0 ) uniform int i, layout(offset=4 ) uniform uint u, layout(offset=8 ) uniform float f, layout(offset=12 ) uniform bool b, layout(offset=16 ) uniform 2-component vector of int i2, layout(offset=24 ) uniform 2-component vector of uint u2, layout(offset=32 ) uniform 2-component vector of float f2, layout(offset=40 ) uniform 2-component vector of bool b2, layout(offset=48 ) uniform uint upos, layout(offset=52 ) uniform float fpos})
|
||||
|
||||
|
||||
@@ -101,7 +104,7 @@ Linked fragment stage:
|
||||
Shader version: 450
|
||||
gl_FragCoord origin is upper left
|
||||
0:? Sequence
|
||||
0:20 Function Definition: main( (temp structure{temp 4-component vector of float color})
|
||||
0:20 Function Definition: @main( (temp structure{temp 4-component vector of float color})
|
||||
0:20 Function Parameters:
|
||||
0:? Sequence
|
||||
0:37 clamp (temp float)
|
||||
@@ -178,24 +181,27 @@ gl_FragCoord origin is upper left
|
||||
0:47 0.000000
|
||||
0:47 0.000000
|
||||
0:47 0.000000
|
||||
0:48 Sequence
|
||||
0:48 Sequence
|
||||
0:48 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:48 color: direct index for structure (temp 4-component vector of float)
|
||||
0:48 'ps_output' (temp structure{temp 4-component vector of float color})
|
||||
0:48 Constant:
|
||||
0:48 0 (const int)
|
||||
0:48 Branch: Return
|
||||
0:48 Branch: Return with expression
|
||||
0:48 'ps_output' (temp structure{temp 4-component vector of float color})
|
||||
0:20 Function Definition: main( (temp void)
|
||||
0:20 Function Parameters:
|
||||
0:? Sequence
|
||||
0:20 Sequence
|
||||
0:20 move second child to first child (temp 4-component vector of float)
|
||||
0:? 'color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:20 color: direct index for structure (temp 4-component vector of float)
|
||||
0:20 Function Call: @main( (temp structure{temp 4-component vector of float color})
|
||||
0:20 Constant:
|
||||
0:20 0 (const int)
|
||||
0:? Linker Objects
|
||||
0:? 'color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:? 'g_tTexbfs' (layout(r32f ) uniform samplerBuffer)
|
||||
0:? 'g_tTex1df4' (uniform texture1D)
|
||||
0:? 'color' (layout(location=0 ) out 4-component vector of float)
|
||||
0:? 'anon@0' (layout(row_major std140 ) uniform block{layout(offset=0 ) uniform int i, layout(offset=4 ) uniform uint u, layout(offset=8 ) uniform float f, layout(offset=12 ) uniform bool b, layout(offset=16 ) uniform 2-component vector of int i2, layout(offset=24 ) uniform 2-component vector of uint u2, layout(offset=32 ) uniform 2-component vector of float f2, layout(offset=40 ) uniform 2-component vector of bool b2, layout(offset=48 ) uniform uint upos, layout(offset=52 ) uniform float fpos})
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 76
|
||||
// Id's are bound by 81
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
@@ -203,135 +209,142 @@ gl_FragCoord origin is upper left
|
||||
Capability ImageQuery
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 68
|
||||
EntryPoint Fragment 4 "main" 74
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Name 4 "main"
|
||||
Name 12 "$Global"
|
||||
MemberName 12($Global) 0 "i"
|
||||
MemberName 12($Global) 1 "u"
|
||||
MemberName 12($Global) 2 "f"
|
||||
MemberName 12($Global) 3 "b"
|
||||
MemberName 12($Global) 4 "i2"
|
||||
MemberName 12($Global) 5 "u2"
|
||||
MemberName 12($Global) 6 "f2"
|
||||
MemberName 12($Global) 7 "b2"
|
||||
MemberName 12($Global) 8 "upos"
|
||||
MemberName 12($Global) 9 "fpos"
|
||||
Name 14 ""
|
||||
Name 23 "sizeQueryTemp"
|
||||
Name 26 "g_tTex1df4"
|
||||
Name 30 "WidthI"
|
||||
Name 33 "sizeQueryTemp"
|
||||
Name 39 "NumberOfLevelsU"
|
||||
Name 42 "sizeQueryTemp"
|
||||
Name 45 "WidthU"
|
||||
Name 47 "NumberOfLevelsI"
|
||||
Name 51 "sizeQueryTemp"
|
||||
Name 60 "PS_OUTPUT"
|
||||
MemberName 60(PS_OUTPUT) 0 "color"
|
||||
Name 62 "ps_output"
|
||||
Name 68 "color"
|
||||
Name 75 "g_tTexbfs"
|
||||
MemberDecorate 12($Global) 0 Offset 0
|
||||
MemberDecorate 12($Global) 1 Offset 4
|
||||
MemberDecorate 12($Global) 2 Offset 8
|
||||
MemberDecorate 12($Global) 3 Offset 12
|
||||
MemberDecorate 12($Global) 4 Offset 16
|
||||
MemberDecorate 12($Global) 5 Offset 24
|
||||
MemberDecorate 12($Global) 6 Offset 32
|
||||
MemberDecorate 12($Global) 7 Offset 40
|
||||
MemberDecorate 12($Global) 8 Offset 48
|
||||
MemberDecorate 12($Global) 9 Offset 52
|
||||
Decorate 12($Global) Block
|
||||
Decorate 14 DescriptorSet 0
|
||||
Decorate 26(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 68(color) Location 0
|
||||
Decorate 75(g_tTexbfs) DescriptorSet 0
|
||||
Name 8 "PS_OUTPUT"
|
||||
MemberName 8(PS_OUTPUT) 0 "color"
|
||||
Name 10 "@main("
|
||||
Name 17 "$Global"
|
||||
MemberName 17($Global) 0 "i"
|
||||
MemberName 17($Global) 1 "u"
|
||||
MemberName 17($Global) 2 "f"
|
||||
MemberName 17($Global) 3 "b"
|
||||
MemberName 17($Global) 4 "i2"
|
||||
MemberName 17($Global) 5 "u2"
|
||||
MemberName 17($Global) 6 "f2"
|
||||
MemberName 17($Global) 7 "b2"
|
||||
MemberName 17($Global) 8 "upos"
|
||||
MemberName 17($Global) 9 "fpos"
|
||||
Name 19 ""
|
||||
Name 28 "sizeQueryTemp"
|
||||
Name 31 "g_tTex1df4"
|
||||
Name 35 "WidthI"
|
||||
Name 38 "sizeQueryTemp"
|
||||
Name 44 "NumberOfLevelsU"
|
||||
Name 47 "sizeQueryTemp"
|
||||
Name 50 "WidthU"
|
||||
Name 52 "NumberOfLevelsI"
|
||||
Name 56 "sizeQueryTemp"
|
||||
Name 65 "ps_output"
|
||||
Name 74 "color"
|
||||
Name 80 "g_tTexbfs"
|
||||
MemberDecorate 17($Global) 0 Offset 0
|
||||
MemberDecorate 17($Global) 1 Offset 4
|
||||
MemberDecorate 17($Global) 2 Offset 8
|
||||
MemberDecorate 17($Global) 3 Offset 12
|
||||
MemberDecorate 17($Global) 4 Offset 16
|
||||
MemberDecorate 17($Global) 5 Offset 24
|
||||
MemberDecorate 17($Global) 6 Offset 32
|
||||
MemberDecorate 17($Global) 7 Offset 40
|
||||
MemberDecorate 17($Global) 8 Offset 48
|
||||
MemberDecorate 17($Global) 9 Offset 52
|
||||
Decorate 17($Global) Block
|
||||
Decorate 19 DescriptorSet 0
|
||||
Decorate 31(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 74(color) Location 0
|
||||
Decorate 80(g_tTexbfs) DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeInt 32 1
|
||||
7: TypeInt 32 0
|
||||
8: TypeFloat 32
|
||||
9: TypeVector 6(int) 2
|
||||
10: TypeVector 7(int) 2
|
||||
11: TypeVector 8(float) 2
|
||||
12($Global): TypeStruct 6(int) 7(int) 8(float) 7(int) 9(ivec2) 10(ivec2) 11(fvec2) 10(ivec2) 7(int) 8(float)
|
||||
13: TypePointer Uniform 12($Global)
|
||||
14: 13(ptr) Variable Uniform
|
||||
15: 6(int) Constant 9
|
||||
16: TypePointer Uniform 8(float)
|
||||
19: 8(float) Constant 0
|
||||
20: 8(float) Constant 1065353216
|
||||
22: TypePointer Function 7(int)
|
||||
24: TypeImage 8(float) 1D sampled format:Unknown
|
||||
25: TypePointer UniformConstant 24
|
||||
26(g_tTex1df4): 25(ptr) Variable UniformConstant
|
||||
29: TypePointer Function 6(int)
|
||||
35: 7(int) Constant 6
|
||||
59: TypeVector 8(float) 4
|
||||
60(PS_OUTPUT): TypeStruct 59(fvec4)
|
||||
61: TypePointer Function 60(PS_OUTPUT)
|
||||
63: 6(int) Constant 0
|
||||
64: 59(fvec4) ConstantComposite 19 19 19 19
|
||||
65: TypePointer Function 59(fvec4)
|
||||
67: TypePointer Output 59(fvec4)
|
||||
68(color): 67(ptr) Variable Output
|
||||
72: TypeImage 8(float) Buffer sampled format:R32f
|
||||
73: TypeSampledImage 72
|
||||
74: TypePointer UniformConstant 73
|
||||
75(g_tTexbfs): 74(ptr) Variable UniformConstant
|
||||
6: TypeFloat 32
|
||||
7: TypeVector 6(float) 4
|
||||
8(PS_OUTPUT): TypeStruct 7(fvec4)
|
||||
9: TypeFunction 8(PS_OUTPUT)
|
||||
12: TypeInt 32 1
|
||||
13: TypeInt 32 0
|
||||
14: TypeVector 12(int) 2
|
||||
15: TypeVector 13(int) 2
|
||||
16: TypeVector 6(float) 2
|
||||
17($Global): TypeStruct 12(int) 13(int) 6(float) 13(int) 14(ivec2) 15(ivec2) 16(fvec2) 15(ivec2) 13(int) 6(float)
|
||||
18: TypePointer Uniform 17($Global)
|
||||
19: 18(ptr) Variable Uniform
|
||||
20: 12(int) Constant 9
|
||||
21: TypePointer Uniform 6(float)
|
||||
24: 6(float) Constant 0
|
||||
25: 6(float) Constant 1065353216
|
||||
27: TypePointer Function 13(int)
|
||||
29: TypeImage 6(float) 1D sampled format:Unknown
|
||||
30: TypePointer UniformConstant 29
|
||||
31(g_tTex1df4): 30(ptr) Variable UniformConstant
|
||||
34: TypePointer Function 12(int)
|
||||
40: 13(int) Constant 6
|
||||
64: TypePointer Function 8(PS_OUTPUT)
|
||||
66: 12(int) Constant 0
|
||||
67: 7(fvec4) ConstantComposite 24 24 24 24
|
||||
68: TypePointer Function 7(fvec4)
|
||||
73: TypePointer Output 7(fvec4)
|
||||
74(color): 73(ptr) Variable Output
|
||||
77: TypeImage 6(float) Buffer sampled format:R32f
|
||||
78: TypeSampledImage 77
|
||||
79: TypePointer UniformConstant 78
|
||||
80(g_tTexbfs): 79(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
23(sizeQueryTemp): 22(ptr) Variable Function
|
||||
30(WidthI): 29(ptr) Variable Function
|
||||
33(sizeQueryTemp): 22(ptr) Variable Function
|
||||
39(NumberOfLevelsU): 22(ptr) Variable Function
|
||||
42(sizeQueryTemp): 22(ptr) Variable Function
|
||||
45(WidthU): 22(ptr) Variable Function
|
||||
47(NumberOfLevelsI): 29(ptr) Variable Function
|
||||
51(sizeQueryTemp): 22(ptr) Variable Function
|
||||
62(ps_output): 61(ptr) Variable Function
|
||||
17: 16(ptr) AccessChain 14 15
|
||||
18: 8(float) Load 17
|
||||
21: 8(float) ExtInst 1(GLSL.std.450) 43(FClamp) 18 19 20
|
||||
27: 24 Load 26(g_tTex1df4)
|
||||
28: 6(int) ImageQuerySize 27
|
||||
Store 23(sizeQueryTemp) 28
|
||||
31: 7(int) Load 23(sizeQueryTemp)
|
||||
32: 6(int) Bitcast 31
|
||||
Store 30(WidthI) 32
|
||||
34: 24 Load 26(g_tTex1df4)
|
||||
36: 6(int) ImageQuerySizeLod 34 35
|
||||
Store 33(sizeQueryTemp) 36
|
||||
37: 7(int) Load 33(sizeQueryTemp)
|
||||
38: 6(int) Bitcast 37
|
||||
Store 30(WidthI) 38
|
||||
40: 24 Load 26(g_tTex1df4)
|
||||
41: 6(int) ImageQueryLevels 40
|
||||
Store 39(NumberOfLevelsU) 41
|
||||
43: 24 Load 26(g_tTex1df4)
|
||||
44: 6(int) ImageQuerySizeLod 43 35
|
||||
Store 42(sizeQueryTemp) 44
|
||||
46: 7(int) Load 42(sizeQueryTemp)
|
||||
Store 45(WidthU) 46
|
||||
48: 24 Load 26(g_tTex1df4)
|
||||
49: 6(int) ImageQueryLevels 48
|
||||
50: 6(int) Bitcast 49
|
||||
Store 47(NumberOfLevelsI) 50
|
||||
52: 24 Load 26(g_tTex1df4)
|
||||
53: 6(int) ImageQuerySizeLod 52 35
|
||||
Store 51(sizeQueryTemp) 53
|
||||
54: 7(int) Load 51(sizeQueryTemp)
|
||||
55: 6(int) Bitcast 54
|
||||
Store 30(WidthI) 55
|
||||
56: 24 Load 26(g_tTex1df4)
|
||||
57: 6(int) ImageQueryLevels 56
|
||||
58: 6(int) Bitcast 57
|
||||
Store 47(NumberOfLevelsI) 58
|
||||
66: 65(ptr) AccessChain 62(ps_output) 63
|
||||
Store 66 64
|
||||
69: 65(ptr) AccessChain 62(ps_output) 63
|
||||
70: 59(fvec4) Load 69
|
||||
Store 68(color) 70
|
||||
75:8(PS_OUTPUT) FunctionCall 10(@main()
|
||||
76: 7(fvec4) CompositeExtract 75 0
|
||||
Store 74(color) 76
|
||||
Return
|
||||
FunctionEnd
|
||||
10(@main():8(PS_OUTPUT) Function None 9
|
||||
11: Label
|
||||
28(sizeQueryTemp): 27(ptr) Variable Function
|
||||
35(WidthI): 34(ptr) Variable Function
|
||||
38(sizeQueryTemp): 27(ptr) Variable Function
|
||||
44(NumberOfLevelsU): 27(ptr) Variable Function
|
||||
47(sizeQueryTemp): 27(ptr) Variable Function
|
||||
50(WidthU): 27(ptr) Variable Function
|
||||
52(NumberOfLevelsI): 34(ptr) Variable Function
|
||||
56(sizeQueryTemp): 27(ptr) Variable Function
|
||||
65(ps_output): 64(ptr) Variable Function
|
||||
22: 21(ptr) AccessChain 19 20
|
||||
23: 6(float) Load 22
|
||||
26: 6(float) ExtInst 1(GLSL.std.450) 43(FClamp) 23 24 25
|
||||
32: 29 Load 31(g_tTex1df4)
|
||||
33: 12(int) ImageQuerySize 32
|
||||
Store 28(sizeQueryTemp) 33
|
||||
36: 13(int) Load 28(sizeQueryTemp)
|
||||
37: 12(int) Bitcast 36
|
||||
Store 35(WidthI) 37
|
||||
39: 29 Load 31(g_tTex1df4)
|
||||
41: 12(int) ImageQuerySizeLod 39 40
|
||||
Store 38(sizeQueryTemp) 41
|
||||
42: 13(int) Load 38(sizeQueryTemp)
|
||||
43: 12(int) Bitcast 42
|
||||
Store 35(WidthI) 43
|
||||
45: 29 Load 31(g_tTex1df4)
|
||||
46: 12(int) ImageQueryLevels 45
|
||||
Store 44(NumberOfLevelsU) 46
|
||||
48: 29 Load 31(g_tTex1df4)
|
||||
49: 12(int) ImageQuerySizeLod 48 40
|
||||
Store 47(sizeQueryTemp) 49
|
||||
51: 13(int) Load 47(sizeQueryTemp)
|
||||
Store 50(WidthU) 51
|
||||
53: 29 Load 31(g_tTex1df4)
|
||||
54: 12(int) ImageQueryLevels 53
|
||||
55: 12(int) Bitcast 54
|
||||
Store 52(NumberOfLevelsI) 55
|
||||
57: 29 Load 31(g_tTex1df4)
|
||||
58: 12(int) ImageQuerySizeLod 57 40
|
||||
Store 56(sizeQueryTemp) 58
|
||||
59: 13(int) Load 56(sizeQueryTemp)
|
||||
60: 12(int) Bitcast 59
|
||||
Store 35(WidthI) 60
|
||||
61: 29 Load 31(g_tTex1df4)
|
||||
62: 12(int) ImageQueryLevels 61
|
||||
63: 12(int) Bitcast 62
|
||||
Store 52(NumberOfLevelsI) 63
|
||||
69: 68(ptr) AccessChain 65(ps_output) 66
|
||||
Store 69 67
|
||||
70:8(PS_OUTPUT) Load 65(ps_output)
|
||||
ReturnValue 70
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user