GLSL: The execution scope for barriers should be Workgroup.

This commit is contained in:
chrgau01@arm.com
2016-11-14 10:10:05 +01:00
parent 84d11e1859
commit c3f1cdfa57
3 changed files with 202 additions and 201 deletions

192
Test/baseResults/spv.400.tesc.out Executable file → Normal file
View File

@@ -14,26 +14,26 @@ Linked tessellation control stage:
Capability ClipDistance
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint TessellationControl 4 "main" 23 40 43 46 54 68 73 79 83 84 87 88 91 92
EntryPoint TessellationControl 4 "main" 24 41 44 47 54 68 73 79 83 84 87 88 91 92
ExecutionMode 4 OutputVertices 4
Source GLSL 400
SourceExtension "GL_ARB_separate_shader_objects"
Name 4 "main"
Name 11 "a"
Name 16 "p"
Name 19 "gl_PerVertex"
MemberName 19(gl_PerVertex) 0 "gl_Position"
MemberName 19(gl_PerVertex) 1 "gl_PointSize"
MemberName 19(gl_PerVertex) 2 "gl_ClipDistance"
Name 23 "gl_in"
Name 30 "ps"
Name 34 "cd"
Name 38 "pvi"
Name 40 "gl_PatchVerticesIn"
Name 42 "pid"
Name 43 "gl_PrimitiveID"
Name 45 "iid"
Name 46 "gl_InvocationID"
Name 12 "a"
Name 17 "p"
Name 20 "gl_PerVertex"
MemberName 20(gl_PerVertex) 0 "gl_Position"
MemberName 20(gl_PerVertex) 1 "gl_PointSize"
MemberName 20(gl_PerVertex) 2 "gl_ClipDistance"
Name 24 "gl_in"
Name 31 "ps"
Name 35 "cd"
Name 39 "pvi"
Name 41 "gl_PatchVerticesIn"
Name 43 "pid"
Name 44 "gl_PrimitiveID"
Name 46 "iid"
Name 47 "gl_InvocationID"
Name 50 "gl_PerVertex"
MemberName 50(gl_PerVertex) 0 "gl_Position"
MemberName 50(gl_PerVertex) 1 "gl_PointSize"
@@ -49,13 +49,13 @@ Linked tessellation control stage:
Name 88 "ivlb"
Name 91 "ovla"
Name 92 "ovlb"
MemberDecorate 19(gl_PerVertex) 0 BuiltIn Position
MemberDecorate 19(gl_PerVertex) 1 BuiltIn PointSize
MemberDecorate 19(gl_PerVertex) 2 BuiltIn ClipDistance
Decorate 19(gl_PerVertex) Block
Decorate 40(gl_PatchVerticesIn) BuiltIn PatchVertices
Decorate 43(gl_PrimitiveID) BuiltIn PrimitiveId
Decorate 46(gl_InvocationID) BuiltIn InvocationId
MemberDecorate 20(gl_PerVertex) 0 BuiltIn Position
MemberDecorate 20(gl_PerVertex) 1 BuiltIn PointSize
MemberDecorate 20(gl_PerVertex) 2 BuiltIn ClipDistance
Decorate 20(gl_PerVertex) Block
Decorate 41(gl_PatchVerticesIn) BuiltIn PatchVertices
Decorate 44(gl_PrimitiveID) BuiltIn PrimitiveId
Decorate 47(gl_InvocationID) BuiltIn InvocationId
MemberDecorate 50(gl_PerVertex) 0 BuiltIn Position
MemberDecorate 50(gl_PerVertex) 1 BuiltIn PointSize
MemberDecorate 50(gl_PerVertex) 2 BuiltIn ClipDistance
@@ -72,106 +72,106 @@ Linked tessellation control stage:
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 0
7: 6(int) Constant 1
8: 6(int) Constant 0
9: TypeInt 32 1
10: TypePointer Function 9(int)
12: 9(int) Constant 5392
13: TypeFloat 32
14: TypeVector 13(float) 4
15: TypePointer Function 14(fvec4)
17: 6(int) Constant 3
18: TypeArray 13(float) 17
19(gl_PerVertex): TypeStruct 14(fvec4) 13(float) 18
20: 6(int) Constant 32
21: TypeArray 19(gl_PerVertex) 20
22: TypePointer Input 21
23(gl_in): 22(ptr) Variable Input
24: 9(int) Constant 1
25: 9(int) Constant 0
26: TypePointer Input 14(fvec4)
29: TypePointer Function 13(float)
31: TypePointer Input 13(float)
35: 9(int) Constant 2
39: TypePointer Input 9(int)
40(gl_PatchVerticesIn): 39(ptr) Variable Input
43(gl_PrimitiveID): 39(ptr) Variable Input
46(gl_InvocationID): 39(ptr) Variable Input
48: 6(int) Constant 2
49: TypeArray 13(float) 48
50(gl_PerVertex): TypeStruct 14(fvec4) 13(float) 49
7: 6(int) Constant 2
8: 6(int) Constant 1
9: 6(int) Constant 0
10: TypeInt 32 1
11: TypePointer Function 10(int)
13: 10(int) Constant 5392
14: TypeFloat 32
15: TypeVector 14(float) 4
16: TypePointer Function 15(fvec4)
18: 6(int) Constant 3
19: TypeArray 14(float) 18
20(gl_PerVertex): TypeStruct 15(fvec4) 14(float) 19
21: 6(int) Constant 32
22: TypeArray 20(gl_PerVertex) 21
23: TypePointer Input 22
24(gl_in): 23(ptr) Variable Input
25: 10(int) Constant 1
26: 10(int) Constant 0
27: TypePointer Input 15(fvec4)
30: TypePointer Function 14(float)
32: TypePointer Input 14(float)
36: 10(int) Constant 2
40: TypePointer Input 10(int)
41(gl_PatchVerticesIn): 40(ptr) Variable Input
44(gl_PrimitiveID): 40(ptr) Variable Input
47(gl_InvocationID): 40(ptr) Variable Input
49: TypeArray 14(float) 7
50(gl_PerVertex): TypeStruct 15(fvec4) 14(float) 49
51: 6(int) Constant 4
52: TypeArray 50(gl_PerVertex) 51
53: TypePointer Output 52
54(gl_out): 53(ptr) Variable Output
57: TypePointer Output 14(fvec4)
61: TypePointer Output 13(float)
66: TypeArray 13(float) 51
57: TypePointer Output 15(fvec4)
61: TypePointer Output 14(float)
66: TypeArray 14(float) 51
67: TypePointer Output 66
68(gl_TessLevelOuter): 67(ptr) Variable Output
69: 9(int) Constant 3
70: 13(float) Constant 1078774989
69: 10(int) Constant 3
70: 14(float) Constant 1078774989
72: TypePointer Output 49
73(gl_TessLevelInner): 72(ptr) Variable Output
74: 13(float) Constant 1067869798
76: TypeArray 9(int) 51
74: 14(float) Constant 1067869798
76: TypeArray 10(int) 51
77: TypePointer Private 76
78(outa): 77(ptr) Variable Private
79(patchOut): 57(ptr) Variable Output
80: TypeVector 13(float) 2
81: TypeArray 80(fvec2) 20
80: TypeVector 14(float) 2
81: TypeArray 80(fvec2) 21
82: TypePointer Input 81
83(inb): 82(ptr) Variable Input
84(ind): 82(ptr) Variable Input
85: TypeArray 14(fvec4) 20
85: TypeArray 15(fvec4) 21
86: TypePointer Input 85
87(ivla): 86(ptr) Variable Input
88(ivlb): 86(ptr) Variable Input
89: TypeArray 14(fvec4) 51
89: TypeArray 15(fvec4) 51
90: TypePointer Output 89
91(ovla): 90(ptr) Variable Output
92(ovlb): 90(ptr) Variable Output
4(main): 2 Function None 3
5: Label
11(a): 10(ptr) Variable Function
16(p): 15(ptr) Variable Function
30(ps): 29(ptr) Variable Function
34(cd): 29(ptr) Variable Function
38(pvi): 10(ptr) Variable Function
42(pid): 10(ptr) Variable Function
45(iid): 10(ptr) Variable Function
ControlBarrier 7 7 8
Store 11(a) 12
27: 26(ptr) AccessChain 23(gl_in) 24 25
28: 14(fvec4) Load 27
Store 16(p) 28
32: 31(ptr) AccessChain 23(gl_in) 24 24
33: 13(float) Load 32
Store 30(ps) 33
36: 31(ptr) AccessChain 23(gl_in) 24 35 35
37: 13(float) Load 36
Store 34(cd) 37
41: 9(int) Load 40(gl_PatchVerticesIn)
Store 38(pvi) 41
44: 9(int) Load 43(gl_PrimitiveID)
Store 42(pid) 44
47: 9(int) Load 46(gl_InvocationID)
Store 45(iid) 47
55: 9(int) Load 46(gl_InvocationID)
56: 14(fvec4) Load 16(p)
58: 57(ptr) AccessChain 54(gl_out) 55 25
12(a): 11(ptr) Variable Function
17(p): 16(ptr) Variable Function
31(ps): 30(ptr) Variable Function
35(cd): 30(ptr) Variable Function
39(pvi): 11(ptr) Variable Function
43(pid): 11(ptr) Variable Function
46(iid): 11(ptr) Variable Function
ControlBarrier 7 8 9
Store 12(a) 13
28: 27(ptr) AccessChain 24(gl_in) 25 26
29: 15(fvec4) Load 28
Store 17(p) 29
33: 32(ptr) AccessChain 24(gl_in) 25 25
34: 14(float) Load 33
Store 31(ps) 34
37: 32(ptr) AccessChain 24(gl_in) 25 36 36
38: 14(float) Load 37
Store 35(cd) 38
42: 10(int) Load 41(gl_PatchVerticesIn)
Store 39(pvi) 42
45: 10(int) Load 44(gl_PrimitiveID)
Store 43(pid) 45
48: 10(int) Load 47(gl_InvocationID)
Store 46(iid) 48
55: 10(int) Load 47(gl_InvocationID)
56: 15(fvec4) Load 17(p)
58: 57(ptr) AccessChain 54(gl_out) 55 26
Store 58 56
59: 9(int) Load 46(gl_InvocationID)
60: 13(float) Load 30(ps)
62: 61(ptr) AccessChain 54(gl_out) 59 24
59: 10(int) Load 47(gl_InvocationID)
60: 14(float) Load 31(ps)
62: 61(ptr) AccessChain 54(gl_out) 59 25
Store 62 60
63: 9(int) Load 46(gl_InvocationID)
64: 13(float) Load 34(cd)
65: 61(ptr) AccessChain 54(gl_out) 63 35 24
63: 10(int) Load 47(gl_InvocationID)
64: 14(float) Load 35(cd)
65: 61(ptr) AccessChain 54(gl_out) 63 36 25
Store 65 64
71: 61(ptr) AccessChain 68(gl_TessLevelOuter) 69
Store 71 70
75: 61(ptr) AccessChain 73(gl_TessLevelInner) 24
75: 61(ptr) AccessChain 73(gl_TessLevelInner) 25
Store 75 74
Return
FunctionEnd