BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

109
Test/baseResults/hlsl.promote.vec1.frag.out
View file

@ -2,7 +2,7 @@ hlsl.promote.vec1.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:3 Function Definition: main( (temp 4-component vector of float)
0:3 Function Definition: @main( (temp 4-component vector of float)
0:3 Function Parameters:
0:? Sequence
0:7 move second child to first child (temp float)
@ -22,15 +22,18 @@ gl_FragCoord origin is upper left
0:13 sine (temp float)
0:13 Construct float (in float)
0:13 'f1b' (temp 1-component vector of float)
0:15 Sequence
0:15 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:? Constant:
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:15 Branch: Return
0:15 Branch: Return with expression
0:? Constant:
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:3 Function Definition: main( (temp void)
0:3 Function Parameters:
0:? Sequence
0:3 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:3 Function Call: @main( (temp 4-component vector of float)
0:? Linker Objects
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
@ -41,7 +44,7 @@ Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:3 Function Definition: main( (temp 4-component vector of float)
0:3 Function Definition: @main( (temp 4-component vector of float)
0:3 Function Parameters:
0:? Sequence
0:7 move second child to first child (temp float)
@ -61,58 +64,68 @@ gl_FragCoord origin is upper left
0:13 sine (temp float)
0:13 Construct float (in float)
0:13 'f1b' (temp 1-component vector of float)
0:15 Sequence
0:15 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:? Constant:
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:15 Branch: Return
0:15 Branch: Return with expression
0:? Constant:
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:3 Function Definition: main( (temp void)
0:3 Function Parameters:
0:? Sequence
0:3 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:3 Function Call: @main( (temp 4-component vector of float)
0:? Linker Objects
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 26
// Id's are bound by 31
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 23
EntryPoint Fragment 4 "main" 29
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 8 "f1a"
Name 9 "f1b"
Name 16 "f3"
Name 23 "@entryPointOutput"
Decorate 23(@entryPointOutput) Location 0
Name 9 "@main("
Name 12 "f1a"
Name 13 "f1b"
Name 20 "f3"
Name 29 "@entryPointOutput"
Decorate 29(@entryPointOutput) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
7: TypePointer Function 6(float)
12: TypeVector 6(float) 3
13: 6(float) Constant 0
14: 12(fvec3) ConstantComposite 13 13 13
15: TypePointer Function 12(fvec3)
21: TypeVector 6(float) 4
22: TypePointer Output 21(fvec4)
23(@entryPointOutput): 22(ptr) Variable Output
24: 21(fvec4) ConstantComposite 13 13 13 13
7: TypeVector 6(float) 4
8: TypeFunction 7(fvec4)
11: TypePointer Function 6(float)
16: TypeVector 6(float) 3
17: 6(float) Constant 0
18: 16(fvec3) ConstantComposite 17 17 17
19: TypePointer Function 16(fvec3)
25: 7(fvec4) ConstantComposite 17 17 17 17
28: TypePointer Output 7(fvec4)
29(@entryPointOutput): 28(ptr) Variable Output
4(main): 2 Function None 3
5: Label
8(f1a): 7(ptr) Variable Function
9(f1b): 7(ptr) Variable Function
16(f3): 15(ptr) Variable Function
10: 6(float) Load 9(f1b)
Store 8(f1a) 10
11: 6(float) Load 8(f1a)
Store 9(f1b) 11
17: 12(fvec3) Load 16(f3)
18: 12(fvec3) ExtInst 1(GLSL.std.450) 48(Step) 14 17
19: 6(float) Load 9(f1b)
20: 6(float) ExtInst 1(GLSL.std.450) 13(Sin) 19
Store 23(@entryPointOutput) 24
30: 7(fvec4) FunctionCall 9(@main()
Store 29(@entryPointOutput) 30
Return
FunctionEnd
9(@main(): 7(fvec4) Function None 8
10: Label
12(f1a): 11(ptr) Variable Function
13(f1b): 11(ptr) Variable Function
20(f3): 19(ptr) Variable Function
14: 6(float) Load 13(f1b)
Store 12(f1a) 14
15: 6(float) Load 12(f1a)
Store 13(f1b) 15
21: 16(fvec3) Load 20(f3)
22: 16(fvec3) ExtInst 1(GLSL.std.450) 48(Step) 18 21
23: 6(float) Load 13(f1b)
24: 6(float) ExtInst 1(GLSL.std.450) 13(Sin) 23
ReturnValue 25
FunctionEnd