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

SPV return from main: Simplify a legacy design such returns are not jumps to exit block.

Browse Source 
Structured control-flow rules allow leaving the middle of a construct through
a return, but not through a jump to a block that does a return.

Addresses issue #58.
This commit is contained in:
John Kessenich
2015-09-14 20:58:02 -06:00
parent 5f5b205ce9
commit e770b3e6cf
74 changed files with 9648 additions and 9816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
Test/baseResults/spv.whileLoop.frag.out
View File

@@ -5,7 +5,7 @@ Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 32
// Id's are bound by 31
Source GLSL 110
Capability Shader
@@ -14,50 +14,48 @@ Linked fragment stage:
EntryPoint Fragment 4 "main"
ExecutionMode 4 OriginLowerLeft
Name 4 "main"
Name 10 "color"
Name 12 "BaseColor"
Name 20 "d"
Name 25 "bigColor"
Name 30 "gl_FragColor"
Decorate 12(BaseColor) Smooth
Decorate 30(gl_FragColor) BuiltIn FragColor
Name 9 "color"
Name 11 "BaseColor"
Name 19 "d"
Name 24 "bigColor"
Name 29 "gl_FragColor"
Decorate 11(BaseColor) Smooth
Decorate 29(gl_FragColor) BuiltIn FragColor
2: TypeVoid
3: TypeFunction 2
7: TypeFloat 32
8: TypeVector 7(float) 4
9: TypePointer Function 8(fvec4)
11: TypePointer Input 8(fvec4)
12(BaseColor): 11(ptr) Variable Input
19: TypePointer UniformConstant 7(float)
20(d): 19(ptr) Variable UniformConstant
22: TypeBool
24: TypePointer UniformConstant 8(fvec4)
25(bigColor): 24(ptr) Variable UniformConstant
29: TypePointer Output 8(fvec4)
30(gl_FragColor): 29(ptr) Variable Output
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
10: TypePointer Input 7(fvec4)
11(BaseColor): 10(ptr) Variable Input
18: TypePointer UniformConstant 6(float)
19(d): 18(ptr) Variable UniformConstant
21: TypeBool
23: TypePointer UniformConstant 7(fvec4)
24(bigColor): 23(ptr) Variable UniformConstant
28: TypePointer Output 7(fvec4)
29(gl_FragColor): 28(ptr) Variable Output
4(main): 2 Function None 3
5: Label
10(color): 9(ptr) Variable Function
13: 8(fvec4) Load 12(BaseColor)
Store 10(color) 13
Branch 14
9(color): 8(ptr) Variable Function
12: 7(fvec4) Load 11(BaseColor)
Store 9(color) 12
Branch 13
13: Label
16: 7(fvec4) Load 9(color)
17: 6(float) CompositeExtract 16 0
20: 6(float) Load 19(d)
22: 21(bool) FOrdLessThan 17 20
LoopMerge 14 None
BranchConditional 22 15 14
15: Label
25: 7(fvec4) Load 24(bigColor)
26: 7(fvec4) Load 9(color)
27: 7(fvec4) FAdd 26 25
Store 9(color) 27
Branch 13
14: Label
17: 8(fvec4) Load 10(color)
18: 7(float) CompositeExtract 17 0
21: 7(float) Load 20(d)
23: 22(bool) FOrdLessThan 18 21
LoopMerge 15 None
BranchConditional 23 16 15
16: Label
26: 8(fvec4) Load 25(bigColor)
27: 8(fvec4) Load 10(color)
28: 8(fvec4) FAdd 27 26
Store 10(color) 28
Branch 14
15: Label
31: 8(fvec4) Load 10(color)
Store 30(gl_FragColor) 31
Branch 6
6: Label
30: 7(fvec4) Load 9(color)
Store 29(gl_FragColor) 30
Return
FunctionEnd