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

231
Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out
View File

@@ -2,7 +2,7 @@ hlsl.sample.sub-vec4.dx10.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:14 Function Definition: main( (temp structure{temp 4-component vector of float Color})
0:14 Function Definition: @main( (temp structure{temp 4-component vector of float Color})
0:14 Function Parameters:
0:? Sequence
0:17 Sequence
@@ -54,22 +54,25 @@ gl_FragCoord origin is upper left
0:22 1.000000
0:22 1.000000
0:22 1.000000
0:23 Sequence
0:23 Sequence
0:23 move second child to first child (temp 4-component vector of float)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:23 Color: direct index for structure (temp 4-component vector of float)
0:23 'psout' (temp structure{temp 4-component vector of float Color})
0:23 Constant:
0:23 0 (const int)
0:23 Branch: Return
0:23 Branch: Return with expression
0:23 'psout' (temp structure{temp 4-component vector of float Color})
0:14 Function Definition: main( (temp void)
0:14 Function Parameters:
0:? Sequence
0:14 Sequence
0:14 move second child to first child (temp 4-component vector of float)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:14 Color: direct index for structure (temp 4-component vector of float)
0:14 Function Call: @main( (temp structure{temp 4-component vector of float Color})
0:14 Constant:
0:14 0 (const int)
0:? Linker Objects
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df1' (uniform texture1D)
0:? 'g_tTex1df2' (uniform texture1D)
0:? 'g_tTex1df3' (uniform texture1D)
0:? 'g_tTex1df4' (uniform texture1D)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
Linked fragment stage:
@@ -78,7 +81,7 @@ Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:14 Function Definition: main( (temp structure{temp 4-component vector of float Color})
0:14 Function Definition: @main( (temp structure{temp 4-component vector of float Color})
0:14 Function Parameters:
0:? Sequence
0:17 Sequence
@@ -130,123 +133,133 @@ gl_FragCoord origin is upper left
0:22 1.000000
0:22 1.000000
0:22 1.000000
0:23 Sequence
0:23 Sequence
0:23 move second child to first child (temp 4-component vector of float)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:23 Color: direct index for structure (temp 4-component vector of float)
0:23 'psout' (temp structure{temp 4-component vector of float Color})
0:23 Constant:
0:23 0 (const int)
0:23 Branch: Return
0:23 Branch: Return with expression
0:23 'psout' (temp structure{temp 4-component vector of float Color})
0:14 Function Definition: main( (temp void)
0:14 Function Parameters:
0:? Sequence
0:14 Sequence
0:14 move second child to first child (temp 4-component vector of float)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:14 Color: direct index for structure (temp 4-component vector of float)
0:14 Function Call: @main( (temp structure{temp 4-component vector of float Color})
0:14 Constant:
0:14 0 (const int)
0:? Linker Objects
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_tTex1df1' (uniform texture1D)
0:? 'g_tTex1df2' (uniform texture1D)
0:? 'g_tTex1df3' (uniform texture1D)
0:? 'g_tTex1df4' (uniform texture1D)
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 67
// Id's are bound by 72
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 63
EntryPoint Fragment 4 "main" 69
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 8 "txval10"
Name 11 "g_tTex1df1"
Name 15 "g_sSamp"
Name 25 "txval11"
Name 26 "g_tTex1df2"
Name 37 "txval12"
Name 38 "g_tTex1df3"
Name 48 "txval13"
Name 49 "g_tTex1df4"
Name 54 "PS_OUTPUT"
MemberName 54(PS_OUTPUT) 0 "Color"
Name 56 "psout"
Name 63 "Color"
Decorate 11(g_tTex1df1) DescriptorSet 0
Decorate 15(g_sSamp) DescriptorSet 0
Decorate 15(g_sSamp) Binding 0
Decorate 26(g_tTex1df2) DescriptorSet 0
Decorate 38(g_tTex1df3) DescriptorSet 0
Decorate 49(g_tTex1df4) DescriptorSet 0
Decorate 63(Color) Location 0
Name 8 "PS_OUTPUT"
MemberName 8(PS_OUTPUT) 0 "Color"
Name 10 "@main("
Name 13 "txval10"
Name 16 "g_tTex1df1"
Name 20 "g_sSamp"
Name 29 "txval11"
Name 30 "g_tTex1df2"
Name 41 "txval12"
Name 42 "g_tTex1df3"
Name 52 "txval13"
Name 53 "g_tTex1df4"
Name 59 "psout"
Name 69 "Color"
Decorate 16(g_tTex1df1) DescriptorSet 0
Decorate 20(g_sSamp) DescriptorSet 0
Decorate 20(g_sSamp) Binding 0
Decorate 30(g_tTex1df2) DescriptorSet 0
Decorate 42(g_tTex1df3) DescriptorSet 0
Decorate 53(g_tTex1df4) DescriptorSet 0
Decorate 69(Color) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
7: TypePointer Function 6(float)
9: TypeImage 6(float) 1D sampled format:Unknown
10: TypePointer UniformConstant 9
11(g_tTex1df1): 10(ptr) Variable UniformConstant
13: TypeSampler
14: TypePointer UniformConstant 13
15(g_sSamp): 14(ptr) Variable UniformConstant
17: TypeSampledImage 9
19: 6(float) Constant 1036831949
20: TypeVector 6(float) 4
23: TypeVector 6(float) 2
24: TypePointer Function 23(fvec2)
26(g_tTex1df2): 10(ptr) Variable UniformConstant
30: 6(float) Constant 1045220557
35: TypeVector 6(float) 3
36: TypePointer Function 35(fvec3)
38(g_tTex1df3): 10(ptr) Variable UniformConstant
47: TypePointer Function 20(fvec4)
49(g_tTex1df4): 10(ptr) Variable UniformConstant
54(PS_OUTPUT): TypeStruct 20(fvec4)
55: TypePointer Function 54(PS_OUTPUT)
57: TypeInt 32 1
58: 57(int) Constant 0
59: 6(float) Constant 1065353216
60: 20(fvec4) ConstantComposite 59 59 59 59
62: TypePointer Output 20(fvec4)
63(Color): 62(ptr) Variable Output
7: TypeVector 6(float) 4
8(PS_OUTPUT): TypeStruct 7(fvec4)
9: TypeFunction 8(PS_OUTPUT)
12: TypePointer Function 6(float)
14: TypeImage 6(float) 1D sampled format:Unknown
15: TypePointer UniformConstant 14
16(g_tTex1df1): 15(ptr) Variable UniformConstant
18: TypeSampler
19: TypePointer UniformConstant 18
20(g_sSamp): 19(ptr) Variable UniformConstant
22: TypeSampledImage 14
24: 6(float) Constant 1036831949
27: TypeVector 6(float) 2
28: TypePointer Function 27(fvec2)
30(g_tTex1df2): 15(ptr) Variable UniformConstant
34: 6(float) Constant 1045220557
39: TypeVector 6(float) 3
40: TypePointer Function 39(fvec3)
42(g_tTex1df3): 15(ptr) Variable UniformConstant
51: TypePointer Function 7(fvec4)
53(g_tTex1df4): 15(ptr) Variable UniformConstant
58: TypePointer Function 8(PS_OUTPUT)
60: TypeInt 32 1
61: 60(int) Constant 0
62: 6(float) Constant 1065353216
63: 7(fvec4) ConstantComposite 62 62 62 62
68: TypePointer Output 7(fvec4)
69(Color): 68(ptr) Variable Output
4(main): 2 Function None 3
5: Label
8(txval10): 7(ptr) Variable Function
25(txval11): 24(ptr) Variable Function
37(txval12): 36(ptr) Variable Function
48(txval13): 47(ptr) Variable Function
56(psout): 55(ptr) Variable Function
12: 9 Load 11(g_tTex1df1)
16: 13 Load 15(g_sSamp)
18: 17 SampledImage 12 16
21: 20(fvec4) ImageSampleImplicitLod 18 19
22: 6(float) CompositeExtract 21 0
Store 8(txval10) 22
27: 9 Load 26(g_tTex1df2)
28: 13 Load 15(g_sSamp)
29: 17 SampledImage 27 28
31: 20(fvec4) ImageSampleImplicitLod 29 30
32: 6(float) CompositeExtract 31 0
33: 6(float) CompositeExtract 31 1
34: 23(fvec2) CompositeConstruct 32 33
Store 25(txval11) 34
39: 9 Load 38(g_tTex1df3)
40: 13 Load 15(g_sSamp)
41: 17 SampledImage 39 40
42: 20(fvec4) ImageSampleImplicitLod 41 30
43: 6(float) CompositeExtract 42 0
44: 6(float) CompositeExtract 42 1
45: 6(float) CompositeExtract 42 2
46: 35(fvec3) CompositeConstruct 43 44 45
Store 37(txval12) 46
50: 9 Load 49(g_tTex1df4)
51: 13 Load 15(g_sSamp)
52: 17 SampledImage 50 51
53: 20(fvec4) ImageSampleImplicitLod 52 30
Store 48(txval13) 53
61: 47(ptr) AccessChain 56(psout) 58
Store 61 60
64: 47(ptr) AccessChain 56(psout) 58
65: 20(fvec4) Load 64
Store 63(Color) 65
70:8(PS_OUTPUT) FunctionCall 10(@main()
71: 7(fvec4) CompositeExtract 70 0
Store 69(Color) 71
Return
FunctionEnd
10(@main():8(PS_OUTPUT) Function None 9
11: Label
13(txval10): 12(ptr) Variable Function
29(txval11): 28(ptr) Variable Function
41(txval12): 40(ptr) Variable Function
52(txval13): 51(ptr) Variable Function
59(psout): 58(ptr) Variable Function
17: 14 Load 16(g_tTex1df1)
21: 18 Load 20(g_sSamp)
23: 22 SampledImage 17 21
25: 7(fvec4) ImageSampleImplicitLod 23 24
26: 6(float) CompositeExtract 25 0
Store 13(txval10) 26
31: 14 Load 30(g_tTex1df2)
32: 18 Load 20(g_sSamp)
33: 22 SampledImage 31 32
35: 7(fvec4) ImageSampleImplicitLod 33 34
36: 6(float) CompositeExtract 35 0
37: 6(float) CompositeExtract 35 1
38: 27(fvec2) CompositeConstruct 36 37
Store 29(txval11) 38
43: 14 Load 42(g_tTex1df3)
44: 18 Load 20(g_sSamp)
45: 22 SampledImage 43 44
46: 7(fvec4) ImageSampleImplicitLod 45 34
47: 6(float) CompositeExtract 46 0
48: 6(float) CompositeExtract 46 1
49: 6(float) CompositeExtract 46 2
50: 39(fvec3) CompositeConstruct 47 48 49
Store 41(txval12) 50
54: 14 Load 53(g_tTex1df4)
55: 18 Load 20(g_sSamp)
56: 22 SampledImage 54 55
57: 7(fvec4) ImageSampleImplicitLod 56 34
Store 52(txval13) 57
64: 51(ptr) AccessChain 59(psout) 61
Store 64 63
65:8(PS_OUTPUT) Load 59(psout)
ReturnValue 65
FunctionEnd