mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HLSL: Wrap the entry-point; need to write 'in' args, and support 'inout' args.

Browse Source 
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
2017-01-19 15:41:47 -07:00
parent 18adbdbbb8
commit 02467d8d94
171 changed files with 37604 additions and 32679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

409
Test/baseResults/hlsl.gather.array.dx10.frag.out
View File

@@ -2,7 +2,7 @@ hlsl.gather.array.dx10.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:24 Function Definition: main( (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Definition: @main( (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Parameters:
0:? Sequence
0:29 Sequence
@@ -91,24 +91,28 @@ gl_FragCoord origin is upper left
0:40 1 (const int)
0:40 Constant:
0:40 1.000000
0:42 Sequence
0:42 Sequence
0:42 move second child to first child (temp 4-component vector of float)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:42 Color: direct index for structure (temp 4-component vector of float)
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:42 Constant:
0:42 0 (const int)
0:42 move second child to first child (temp float)
0:? 'Depth' (out float FragDepth)
0:42 Depth: direct index for structure (temp float)
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:42 Constant:
0:42 1 (const int)
0:42 Branch: Return
0:42 Branch: Return with expression
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Definition: main( (temp void)
0:24 Function Parameters:
0:? Sequence
0:24 Sequence
0:24 move second child to first child (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 'flattenTemp' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Call: @main( (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 move second child to first child (temp 4-component vector of float)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:24 Color: direct index for structure (temp 4-component vector of float)
0:24 'flattenTemp' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Constant:
0:24 0 (const int)
0:24 move second child to first child (temp float)
0:? 'Depth' (out float FragDepth)
0:24 Depth: direct index for structure (temp float)
0:24 'flattenTemp' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Constant:
0:24 1 (const int)
0:? Linker Objects
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:? 'Depth' (out float FragDepth)
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray)
0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray)
@@ -120,6 +124,8 @@ gl_FragCoord origin is upper left
0:? 'g_tTexcdf4a' (uniform textureCubeArray)
0:? 'g_tTexcdi4a' (uniform itextureCubeArray)
0:? 'g_tTexcdu4a' (uniform utextureCubeArray)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:? 'Depth' (out float FragDepth)
Linked fragment stage:
@@ -128,7 +134,7 @@ Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:24 Function Definition: main( (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Definition: @main( (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Parameters:
0:? Sequence
0:29 Sequence
@@ -217,24 +223,28 @@ gl_FragCoord origin is upper left
0:40 1 (const int)
0:40 Constant:
0:40 1.000000
0:42 Sequence
0:42 Sequence
0:42 move second child to first child (temp 4-component vector of float)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:42 Color: direct index for structure (temp 4-component vector of float)
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:42 Constant:
0:42 0 (const int)
0:42 move second child to first child (temp float)
0:? 'Depth' (out float FragDepth)
0:42 Depth: direct index for structure (temp float)
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:42 Constant:
0:42 1 (const int)
0:42 Branch: Return
0:42 Branch: Return with expression
0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Definition: main( (temp void)
0:24 Function Parameters:
0:? Sequence
0:24 Sequence
0:24 move second child to first child (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 'flattenTemp' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Function Call: @main( (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 move second child to first child (temp 4-component vector of float)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:24 Color: direct index for structure (temp 4-component vector of float)
0:24 'flattenTemp' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Constant:
0:24 0 (const int)
0:24 move second child to first child (temp float)
0:? 'Depth' (out float FragDepth)
0:24 Depth: direct index for structure (temp float)
0:24 'flattenTemp' (temp structure{temp 4-component vector of float Color, temp float Depth})
0:24 Constant:
0:24 1 (const int)
0:? Linker Objects
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:? 'Depth' (out float FragDepth)
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray)
0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray)
@@ -246,181 +256,194 @@ gl_FragCoord origin is upper left
0:? 'g_tTexcdf4a' (uniform textureCubeArray)
0:? 'g_tTexcdi4a' (uniform itextureCubeArray)
0:? 'g_tTexcdu4a' (uniform utextureCubeArray)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:? 'Depth' (out float FragDepth)
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 117
// Id's are bound by 124
Capability Shader
Capability Sampled1D
Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 99 103
EntryPoint Fragment 4 "main" 107 111
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval20"
Name 12 "g_tTex2df4a"
Name 16 "g_sSamp"
Name 30 "txval21"
Name 33 "g_tTex2di4a"
Name 45 "txval22"
Name 48 "g_tTex2du4a"
Name 57 "txval40"
Name 60 "g_tTexcdf4a"
Name 67 "txval41"
Name 70 "g_tTexcdi4a"
Name 77 "txval42"
Name 80 "g_tTexcdu4a"
Name 90 "PS_OUTPUT"
MemberName 90(PS_OUTPUT) 0 "Color"
MemberName 90(PS_OUTPUT) 1 "Depth"
Name 92 "psout"
Name 99 "Color"
Name 103 "Depth"
Name 109 "g_tTex1df4a"
Name 110 "g_tTex1df4"
Name 113 "g_tTex1di4a"
Name 116 "g_tTex1du4a"
Decorate 12(g_tTex2df4a) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0
Decorate 33(g_tTex2di4a) DescriptorSet 0
Decorate 48(g_tTex2du4a) DescriptorSet 0
Decorate 60(g_tTexcdf4a) DescriptorSet 0
Decorate 70(g_tTexcdi4a) DescriptorSet 0
Decorate 80(g_tTexcdu4a) DescriptorSet 0
Decorate 99(Color) Location 0
Decorate 103(Depth) BuiltIn FragDepth
Decorate 109(g_tTex1df4a) DescriptorSet 0
Decorate 109(g_tTex1df4a) Binding 1
Decorate 110(g_tTex1df4) DescriptorSet 0
Decorate 110(g_tTex1df4) Binding 0
Decorate 113(g_tTex1di4a) DescriptorSet 0
Decorate 116(g_tTex1du4a) DescriptorSet 0
Name 8 "PS_OUTPUT"
MemberName 8(PS_OUTPUT) 0 "Color"
MemberName 8(PS_OUTPUT) 1 "Depth"
Name 10 "@main("
Name 13 "txval20"
Name 16 "g_tTex2df4a"
Name 20 "g_sSamp"
Name 34 "txval21"
Name 37 "g_tTex2di4a"
Name 49 "txval22"
Name 52 "g_tTex2du4a"
Name 61 "txval40"
Name 64 "g_tTexcdf4a"
Name 71 "txval41"
Name 74 "g_tTexcdi4a"
Name 81 "txval42"
Name 84 "g_tTexcdu4a"
Name 95 "psout"
Name 104 "flattenTemp"
Name 107 "Color"
Name 111 "Depth"
Name 116 "g_tTex1df4a"
Name 117 "g_tTex1df4"
Name 120 "g_tTex1di4a"
Name 123 "g_tTex1du4a"
Decorate 16(g_tTex2df4a) DescriptorSet 0
Decorate 20(g_sSamp) DescriptorSet 0
Decorate 20(g_sSamp) Binding 0
Decorate 37(g_tTex2di4a) DescriptorSet 0
Decorate 52(g_tTex2du4a) DescriptorSet 0
Decorate 64(g_tTexcdf4a) DescriptorSet 0
Decorate 74(g_tTexcdi4a) DescriptorSet 0
Decorate 84(g_tTexcdu4a) DescriptorSet 0
Decorate 107(Color) Location 0
Decorate 111(Depth) BuiltIn FragDepth
Decorate 116(g_tTex1df4a) DescriptorSet 0
Decorate 116(g_tTex1df4a) Binding 1
Decorate 117(g_tTex1df4) DescriptorSet 0
Decorate 117(g_tTex1df4) Binding 0
Decorate 120(g_tTex1di4a) DescriptorSet 0
Decorate 123(g_tTex1du4a) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
10: TypeImage 6(float) 2D array sampled format:Unknown
11: TypePointer UniformConstant 10
12(g_tTex2df4a): 11(ptr) Variable UniformConstant
14: TypeSampler
8(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
9: TypeFunction 8(PS_OUTPUT)
12: TypePointer Function 7(fvec4)
14: TypeImage 6(float) 2D array sampled format:Unknown
15: TypePointer UniformConstant 14
16(g_sSamp): 15(ptr) Variable UniformConstant
18: TypeSampledImage 10
20: TypeVector 6(float) 3
21: 6(float) Constant 1036831949
22: 6(float) Constant 1045220557
23: 6(float) Constant 1050253722
24: 20(fvec3) ConstantComposite 21 22 23
25: TypeInt 32 1
26: 25(int) Constant 0
28: TypeVector 25(int) 4
29: TypePointer Function 28(ivec4)
31: TypeImage 25(int) 2D array sampled format:Unknown
32: TypePointer UniformConstant 31
33(g_tTex2di4a): 32(ptr) Variable UniformConstant
36: TypeSampledImage 31
38: 6(float) Constant 1053609165
39: 6(float) Constant 1056964608
40: 20(fvec3) ConstantComposite 23 38 39
42: TypeInt 32 0
43: TypeVector 42(int) 4
44: TypePointer Function 43(ivec4)
46: TypeImage 42(int) 2D array sampled format:Unknown
47: TypePointer UniformConstant 46
48(g_tTex2du4a): 47(ptr) Variable UniformConstant
51: TypeSampledImage 46
53: 6(float) Constant 1058642330
54: 6(float) Constant 1060320051
55: 20(fvec3) ConstantComposite 39 53 54
58: TypeImage 6(float) Cube array sampled format:Unknown
59: TypePointer UniformConstant 58
60(g_tTexcdf4a): 59(ptr) Variable UniformConstant
63: TypeSampledImage 58
65: 7(fvec4) ConstantComposite 21 22 23 38
68: TypeImage 25(int) Cube array sampled format:Unknown
69: TypePointer UniformConstant 68
70(g_tTexcdi4a): 69(ptr) Variable UniformConstant
73: TypeSampledImage 68
75: 7(fvec4) ConstantComposite 38 39 53 54
78: TypeImage 42(int) Cube array sampled format:Unknown
79: TypePointer UniformConstant 78
80(g_tTexcdu4a): 79(ptr) Variable UniformConstant
83: TypeSampledImage 78
85: 6(float) Constant 1061997773
86: 6(float) Constant 1063675494
87: 6(float) Constant 1065353216
88: 7(fvec4) ConstantComposite 54 85 86 87
90(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
91: TypePointer Function 90(PS_OUTPUT)
93: 7(fvec4) ConstantComposite 87 87 87 87
95: 25(int) Constant 1
96: TypePointer Function 6(float)
98: TypePointer Output 7(fvec4)
99(Color): 98(ptr) Variable Output
102: TypePointer Output 6(float)
103(Depth): 102(ptr) Variable Output
107: TypeImage 6(float) 1D array sampled format:Unknown
108: TypePointer UniformConstant 107
109(g_tTex1df4a): 108(ptr) Variable UniformConstant
110(g_tTex1df4): 108(ptr) Variable UniformConstant
111: TypeImage 25(int) 1D array sampled format:Unknown
112: TypePointer UniformConstant 111
113(g_tTex1di4a): 112(ptr) Variable UniformConstant
114: TypeImage 42(int) 1D array sampled format:Unknown
16(g_tTex2df4a): 15(ptr) Variable UniformConstant
18: TypeSampler
19: TypePointer UniformConstant 18
20(g_sSamp): 19(ptr) Variable UniformConstant
22: TypeSampledImage 14
24: TypeVector 6(float) 3
25: 6(float) Constant 1036831949
26: 6(float) Constant 1045220557
27: 6(float) Constant 1050253722
28: 24(fvec3) ConstantComposite 25 26 27
29: TypeInt 32 1
30: 29(int) Constant 0
32: TypeVector 29(int) 4
33: TypePointer Function 32(ivec4)
35: TypeImage 29(int) 2D array sampled format:Unknown
36: TypePointer UniformConstant 35
37(g_tTex2di4a): 36(ptr) Variable UniformConstant
40: TypeSampledImage 35
42: 6(float) Constant 1053609165
43: 6(float) Constant 1056964608
44: 24(fvec3) ConstantComposite 27 42 43
46: TypeInt 32 0
47: TypeVector 46(int) 4
48: TypePointer Function 47(ivec4)
50: TypeImage 46(int) 2D array sampled format:Unknown
51: TypePointer UniformConstant 50
52(g_tTex2du4a): 51(ptr) Variable UniformConstant
55: TypeSampledImage 50
57: 6(float) Constant 1058642330
58: 6(float) Constant 1060320051
59: 24(fvec3) ConstantComposite 43 57 58
62: TypeImage 6(float) Cube array sampled format:Unknown
63: TypePointer UniformConstant 62
64(g_tTexcdf4a): 63(ptr) Variable UniformConstant
67: TypeSampledImage 62
69: 7(fvec4) ConstantComposite 25 26 27 42
72: TypeImage 29(int) Cube array sampled format:Unknown
73: TypePointer UniformConstant 72
74(g_tTexcdi4a): 73(ptr) Variable UniformConstant
77: TypeSampledImage 72
79: 7(fvec4) ConstantComposite 42 43 57 58
82: TypeImage 46(int) Cube array sampled format:Unknown
83: TypePointer UniformConstant 82
84(g_tTexcdu4a): 83(ptr) Variable UniformConstant
87: TypeSampledImage 82
89: 6(float) Constant 1061997773
90: 6(float) Constant 1063675494
91: 6(float) Constant 1065353216
92: 7(fvec4) ConstantComposite 58 89 90 91
94: TypePointer Function 8(PS_OUTPUT)
96: 7(fvec4) ConstantComposite 91 91 91 91
98: 29(int) Constant 1
99: TypePointer Function 6(float)
106: TypePointer Output 7(fvec4)
107(Color): 106(ptr) Variable Output
110: TypePointer Output 6(float)
111(Depth): 110(ptr) Variable Output
114: TypeImage 6(float) 1D array sampled format:Unknown
115: TypePointer UniformConstant 114
116(g_tTex1du4a): 115(ptr) Variable UniformConstant
116(g_tTex1df4a): 115(ptr) Variable UniformConstant
117(g_tTex1df4): 115(ptr) Variable UniformConstant
118: TypeImage 29(int) 1D array sampled format:Unknown
119: TypePointer UniformConstant 118
120(g_tTex1di4a): 119(ptr) Variable UniformConstant
121: TypeImage 46(int) 1D array sampled format:Unknown
122: TypePointer UniformConstant 121
123(g_tTex1du4a): 122(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval20): 8(ptr) Variable Function
30(txval21): 29(ptr) Variable Function
45(txval22): 44(ptr) Variable Function
57(txval40): 8(ptr) Variable Function
67(txval41): 29(ptr) Variable Function
77(txval42): 44(ptr) Variable Function
92(psout): 91(ptr) Variable Function
13: 10 Load 12(g_tTex2df4a)
17: 14 Load 16(g_sSamp)
19: 18 SampledImage 13 17
27: 7(fvec4) ImageGather 19 24 26
Store 9(txval20) 27
34: 31 Load 33(g_tTex2di4a)
35: 14 Load 16(g_sSamp)
37: 36 SampledImage 34 35
41: 28(ivec4) ImageGather 37 40 26
Store 30(txval21) 41
49: 46 Load 48(g_tTex2du4a)
50: 14 Load 16(g_sSamp)
52: 51 SampledImage 49 50
56: 43(ivec4) ImageGather 52 55 26
Store 45(txval22) 56
61: 58 Load 60(g_tTexcdf4a)
62: 14 Load 16(g_sSamp)
64: 63 SampledImage 61 62
66: 7(fvec4) ImageGather 64 65 26
Store 57(txval40) 66
71: 68 Load 70(g_tTexcdi4a)
72: 14 Load 16(g_sSamp)
74: 73 SampledImage 71 72
76: 28(ivec4) ImageGather 74 75 26
Store 67(txval41) 76
81: 78 Load 80(g_tTexcdu4a)
82: 14 Load 16(g_sSamp)
84: 83 SampledImage 81 82
89: 43(ivec4) ImageGather 84 88 26
Store 77(txval42) 89
94: 8(ptr) AccessChain 92(psout) 26
Store 94 93
97: 96(ptr) AccessChain 92(psout) 95
Store 97 87
100: 8(ptr) AccessChain 92(psout) 26
101: 7(fvec4) Load 100
Store 99(Color) 101
104: 96(ptr) AccessChain 92(psout) 95
105: 6(float) Load 104
Store 103(Depth) 105
104(flattenTemp): 94(ptr) Variable Function
105:8(PS_OUTPUT) FunctionCall 10(@main()
Store 104(flattenTemp) 105
108: 12(ptr) AccessChain 104(flattenTemp) 30
109: 7(fvec4) Load 108
Store 107(Color) 109
112: 99(ptr) AccessChain 104(flattenTemp) 98
113: 6(float) Load 112
Store 111(Depth) 113
Return
FunctionEnd
10(@main():8(PS_OUTPUT) Function None 9
11: Label
13(txval20): 12(ptr) Variable Function
34(txval21): 33(ptr) Variable Function
49(txval22): 48(ptr) Variable Function
61(txval40): 12(ptr) Variable Function
71(txval41): 33(ptr) Variable Function
81(txval42): 48(ptr) Variable Function
95(psout): 94(ptr) Variable Function
17: 14 Load 16(g_tTex2df4a)
21: 18 Load 20(g_sSamp)
23: 22 SampledImage 17 21
31: 7(fvec4) ImageGather 23 28 30
Store 13(txval20) 31
38: 35 Load 37(g_tTex2di4a)
39: 18 Load 20(g_sSamp)
41: 40 SampledImage 38 39
45: 32(ivec4) ImageGather 41 44 30
Store 34(txval21) 45
53: 50 Load 52(g_tTex2du4a)
54: 18 Load 20(g_sSamp)
56: 55 SampledImage 53 54
60: 47(ivec4) ImageGather 56 59 30
Store 49(txval22) 60
65: 62 Load 64(g_tTexcdf4a)
66: 18 Load 20(g_sSamp)
68: 67 SampledImage 65 66
70: 7(fvec4) ImageGather 68 69 30
Store 61(txval40) 70
75: 72 Load 74(g_tTexcdi4a)
76: 18 Load 20(g_sSamp)
78: 77 SampledImage 75 76
80: 32(ivec4) ImageGather 78 79 30
Store 71(txval41) 80
85: 82 Load 84(g_tTexcdu4a)
86: 18 Load 20(g_sSamp)
88: 87 SampledImage 85 86
93: 47(ivec4) ImageGather 88 92 30
Store 81(txval42) 93
97: 12(ptr) AccessChain 95(psout) 30
Store 97 96
100: 99(ptr) AccessChain 95(psout) 98
Store 100 91
101:8(PS_OUTPUT) Load 95(psout)
ReturnValue 101
FunctionEnd