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

100
Test/baseResults/hlsl.shapeConvRet.frag.out
View File

@@ -10,16 +10,23 @@ gl_FragCoord origin is upper left
0:3 13 (const int)
0:3 13 (const int)
0:3 13 (const int)
0:7 Function Definition: main(f1; (temp 4-component vector of float)
0:7 Function Definition: @main(f1; (temp 4-component vector of float)
0:7 Function Parameters:
0:7 'f' (layout(location=0 ) in float)
0:7 'f' (in float)
0:? Sequence
0:8 Sequence
0:8 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:8 Construct vec4 (temp 4-component vector of float)
0:8 'f' (layout(location=0 ) in float)
0:8 Branch: Return
0:8 Branch: Return with expression
0:8 Construct vec4 (temp 4-component vector of float)
0:8 'f' (in float)
0:7 Function Definition: main( (temp void)
0:7 Function Parameters:
0:? Sequence
0:7 move second child to first child (temp float)
0:? 'f' (temp float)
0:? 'f' (layout(location=0 ) in float)
0:7 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:7 Function Call: @main(f1; (temp 4-component vector of float)
0:? 'f' (temp float)
0:? Linker Objects
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:? 'f' (layout(location=0 ) in float)
@@ -39,56 +46,81 @@ gl_FragCoord origin is upper left
0:3 13 (const int)
0:3 13 (const int)
0:3 13 (const int)
0:7 Function Definition: main(f1; (temp 4-component vector of float)
0:7 Function Definition: @main(f1; (temp 4-component vector of float)
0:7 Function Parameters:
0:7 'f' (layout(location=0 ) in float)
0:7 'f' (in float)
0:? Sequence
0:8 Sequence
0:8 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:8 Construct vec4 (temp 4-component vector of float)
0:8 'f' (layout(location=0 ) in float)
0:8 Branch: Return
0:8 Branch: Return with expression
0:8 Construct vec4 (temp 4-component vector of float)
0:8 'f' (in float)
0:7 Function Definition: main( (temp void)
0:7 Function Parameters:
0:? Sequence
0:7 move second child to first child (temp float)
0:? 'f' (temp float)
0:? 'f' (layout(location=0 ) in float)
0:7 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:7 Function Call: @main(f1; (temp 4-component vector of float)
0:? 'f' (temp float)
0:? Linker Objects
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:? 'f' (layout(location=0 ) in float)
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 24
// Id's are bound by 35
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 18 20
EntryPoint Fragment 4 "main" 28 31
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "foo("
Name 18 "@entryPointOutput"
Name 20 "f"
Decorate 18(@entryPointOutput) Location 0
Decorate 20(f) Location 0
Name 16 "@main(f1;"
Name 15 "f"
Name 26 "f"
Name 28 "f"
Name 31 "@entryPointOutput"
Name 32 "param"
Decorate 28(f) Location 0
Decorate 31(@entryPointOutput) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 1
7: TypeVector 6(int) 3
8: TypeFunction 7(ivec3)
11: 6(int) Constant 13
12: 7(ivec3) ConstantComposite 11 11 11
15: TypeFloat 32
16: TypeVector 15(float) 4
17: TypePointer Output 16(fvec4)
18(@entryPointOutput): 17(ptr) Variable Output
19: TypePointer Input 15(float)
20(f): 19(ptr) Variable Input
11: TypeFloat 32
12: TypePointer Function 11(float)
13: TypeVector 11(float) 4
14: TypeFunction 13(fvec4) 12(ptr)
18: 6(int) Constant 13
19: 7(ivec3) ConstantComposite 18 18 18
27: TypePointer Input 11(float)
28(f): 27(ptr) Variable Input
30: TypePointer Output 13(fvec4)
31(@entryPointOutput): 30(ptr) Variable Output
4(main): 2 Function None 3
5: Label
21: 15(float) Load 20(f)
22: 16(fvec4) CompositeConstruct 21 21 21 21
Store 18(@entryPointOutput) 22
26(f): 12(ptr) Variable Function
32(param): 12(ptr) Variable Function
29: 11(float) Load 28(f)
Store 26(f) 29
33: 11(float) Load 26(f)
Store 32(param) 33
34: 13(fvec4) FunctionCall 16(@main(f1;) 32(param)
Store 31(@entryPointOutput) 34
Return
FunctionEnd
9(foo(): 7(ivec3) Function None 8
10: Label
ReturnValue 12
ReturnValue 19
FunctionEnd
16(@main(f1;): 13(fvec4) Function None 14
15(f): 12(ptr) FunctionParameter
17: Label
22: 11(float) Load 15(f)
23: 13(fvec4) CompositeConstruct 22 22 22 22
ReturnValue 23
FunctionEnd