Skip to content

G
glslang
Commit d82c9063 by John Kessenich
Options

Vulkan: Finish semantics for what creates spec-const-semantics.

Note: This required adding a new test mode to see the AST for vulkan tests. This also required reworking some deeper parts of type creation, regarding when storage qualification and constness is deduced bottom-up or dictated top-down.
parent 87a94fc0
Showing with 287 additions and 246 deletions
Test/baseResults/100.frag.out
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
ERROR: 0:3: '{ } style initializers' : not supported with this profile: es ERROR: 0:3: '{ } style initializers' : not supported with this profile: es
ERROR: 0:3: 'initializer' : not supported for this version or the enabled extensions ERROR: 0:3: 'initializer' : not supported for this version or the enabled extensions
ERROR: 0:3: 'array initializer' : not supported for this version or the enabled extensions ERROR: 0:3: 'array initializer' : not supported for this version or the enabled extensions
ERROR: 0:3: 'non-constant global initializer' : not supported with this profile: es
ERROR: 0:4: '#version' : must occur first in shader ERROR: 0:4: '#version' : must occur first in shader
ERROR: 0:7: 'attribute' : not supported in this stage: fragment ERROR: 0:7: 'attribute' : not supported in this stage: fragment
ERROR: 0:7: 'float' : type requires declaration of default precision qualifier ERROR: 0:7: 'float' : type requires declaration of default precision qualifier
...@@ -86,7 +85,7 @@ ERROR: 0:194: 'a' : can't use function syntax on variable ...@@ -86,7 +85,7 @@ ERROR: 0:194: 'a' : can't use function syntax on variable
ERROR: 0:214: 'non-constant global initializer' : not supported with this profile: es ERROR: 0:214: 'non-constant global initializer' : not supported with this profile: es
ERROR: 0:3000: '#error' : line of this error should be 3000 ERROR: 0:3000: '#error' : line of this error should be 3000
ERROR: 0:3002: '' : syntax error ERROR: 0:3002: '' : syntax error
ERROR: 78 compilation errors. No code generated. ERROR: 77 compilation errors. No code generated.
Shader version: 100 Shader version: 100
......
Test/baseResults/150.tesc.out
...@@ -720,18 +720,18 @@ ERROR: node is still EOpNull! ...@@ -720,18 +720,18 @@ ERROR: node is still EOpNull!
420.tese 420.tese
Warning, version 420 is not yet complete; most version-specific features are present, but some are missing. Warning, version 420 is not yet complete; most version-specific features are present, but some are missing.
ERROR: 0:7: '=' : cannot convert from 'global 3-element array of float' to 'global 2-element array of float' ERROR: 0:7: '=' : cannot convert from 'const 3-element array of float' to 'global 2-element array of float'
ERROR: 0:8: 'initializer list' : wrong vector size (or rows in a matrix column): global 2-component vector of float ERROR: 0:8: 'initializer list' : wrong vector size (or rows in a matrix column): temp 2-component vector of float
ERROR: 0:9: 'initializer list' : wrong number of matrix columns: global 3X3 matrix of float ERROR: 0:9: 'initializer list' : wrong number of matrix columns: temp 3X3 matrix of float
ERROR: 0:10: 'initializer list' : wrong number of matrix columns: global 2X2 matrix of float ERROR: 0:10: 'initializer list' : wrong number of matrix columns: temp 2X2 matrix of float
ERROR: 0:25: 'initializer list' : wrong number of structure members ERROR: 0:25: 'initializer list' : wrong number of structure members
ERROR: 0:27: '=' : cannot convert from 'const bool' to 'global int' ERROR: 0:27: '=' : cannot convert from 'const bool' to 'global int'
ERROR: 0:28: 'constructor' : cannot convert parameter 2 from 'const float' to 'global 4-component vector of float' ERROR: 0:28: 'constructor' : cannot convert parameter 2 from 'const float' to 'temp 4-component vector of float'
ERROR: 0:29: 'constructor' : cannot convert parameter 2 from 'const 2X2 matrix of float' to 'const 4-component vector of float' ERROR: 0:29: 'constructor' : cannot convert parameter 2 from 'const 2X2 matrix of float' to 'const 4-component vector of float'
ERROR: 0:29: 'const 2-element array of 4-component vector of float' : cannot construct with these arguments ERROR: 0:29: 'const 2-element array of 4-component vector of float' : cannot construct with these arguments
ERROR: 0:29: '=' : cannot convert from 'const float' to 'global 2-element array of 4-component vector of float' ERROR: 0:29: '=' : cannot convert from 'const float' to 'global 2-element array of 4-component vector of float'
ERROR: 0:30: 'initializer list' : wrong number of matrix columns: global 4X2 matrix of float ERROR: 0:30: 'initializer list' : wrong number of matrix columns: temp 4X2 matrix of float
ERROR: 0:40: 'constructor' : cannot convert parameter 1 from 'temp float' to 'global structure{global float s, global float t}' ERROR: 0:40: 'constructor' : cannot convert parameter 1 from 'temp float' to 'temp structure{global float s, global float t}'
ERROR: 0:58: 'initializer list' : wrong number of structure members ERROR: 0:58: 'initializer list' : wrong number of structure members
ERROR: 13 compilation errors. No code generated. ERROR: 13 compilation errors. No code generated.
...@@ -780,7 +780,7 @@ ERROR: node is still EOpNull! ...@@ -780,7 +780,7 @@ ERROR: node is still EOpNull!
0:68 Sequence 0:68 Sequence
0:68 move second child to first child (temp 3-component vector of float) 0:68 move second child to first child (temp 3-component vector of float)
0:68 'bv3' (global 3-component vector of float) 0:68 'bv3' (global 3-component vector of float)
0:68 Construct vec3 (global 3-component vector of float) 0:68 Construct vec3 (temp 3-component vector of float)
0:68 'vc1' (global float) 0:68 'vc1' (global float)
0:68 'vc2' (global float) 0:68 'vc2' (global float)
0:68 'vc3' (global float) 0:68 'vc3' (global float)
...@@ -1534,7 +1534,7 @@ ERROR: node is still EOpNull! ...@@ -1534,7 +1534,7 @@ ERROR: node is still EOpNull!
0:68 Sequence 0:68 Sequence
0:68 move second child to first child (temp 3-component vector of float) 0:68 move second child to first child (temp 3-component vector of float)
0:68 'bv3' (global 3-component vector of float) 0:68 'bv3' (global 3-component vector of float)
0:68 Construct vec3 (global 3-component vector of float) 0:68 Construct vec3 (temp 3-component vector of float)
0:68 'vc1' (global float) 0:68 'vc1' (global float)
0:68 'vc2' (global float) 0:68 'vc2' (global float)
0:68 'vc3' (global float) 0:68 'vc3' (global float)
......
Test/baseResults/420.tese.out
420.tese 420.tese
Warning, version 420 is not yet complete; most version-specific features are present, but some are missing. Warning, version 420 is not yet complete; most version-specific features are present, but some are missing.
ERROR: 0:7: '=' : cannot convert from 'global 3-element array of float' to 'global 2-element array of float' ERROR: 0:7: '=' : cannot convert from 'const 3-element array of float' to 'global 2-element array of float'
ERROR: 0:8: 'initializer list' : wrong vector size (or rows in a matrix column): global 2-component vector of float ERROR: 0:8: 'initializer list' : wrong vector size (or rows in a matrix column): temp 2-component vector of float
ERROR: 0:9: 'initializer list' : wrong number of matrix columns: global 3X3 matrix of float ERROR: 0:9: 'initializer list' : wrong number of matrix columns: temp 3X3 matrix of float
ERROR: 0:10: 'initializer list' : wrong number of matrix columns: global 2X2 matrix of float ERROR: 0:10: 'initializer list' : wrong number of matrix columns: temp 2X2 matrix of float
ERROR: 0:25: 'initializer list' : wrong number of structure members ERROR: 0:25: 'initializer list' : wrong number of structure members
ERROR: 0:27: '=' : cannot convert from 'const bool' to 'global int' ERROR: 0:27: '=' : cannot convert from 'const bool' to 'global int'
ERROR: 0:28: 'constructor' : cannot convert parameter 2 from 'const float' to 'global 4-component vector of float' ERROR: 0:28: 'constructor' : cannot convert parameter 2 from 'const float' to 'temp 4-component vector of float'
ERROR: 0:29: 'constructor' : cannot convert parameter 2 from 'const 2X2 matrix of float' to 'const 4-component vector of float' ERROR: 0:29: 'constructor' : cannot convert parameter 2 from 'const 2X2 matrix of float' to 'const 4-component vector of float'
ERROR: 0:29: 'const 2-element array of 4-component vector of float' : cannot construct with these arguments ERROR: 0:29: 'const 2-element array of 4-component vector of float' : cannot construct with these arguments
ERROR: 0:29: '=' : cannot convert from 'const float' to 'global 2-element array of 4-component vector of float' ERROR: 0:29: '=' : cannot convert from 'const float' to 'global 2-element array of 4-component vector of float'
ERROR: 0:30: 'initializer list' : wrong number of matrix columns: global 4X2 matrix of float ERROR: 0:30: 'initializer list' : wrong number of matrix columns: temp 4X2 matrix of float
ERROR: 0:40: 'constructor' : cannot convert parameter 1 from 'temp float' to 'global structure{global float s, global float t}' ERROR: 0:40: 'constructor' : cannot convert parameter 1 from 'temp float' to 'temp structure{global float s, global float t}'
ERROR: 0:58: 'initializer list' : wrong number of structure members ERROR: 0:58: 'initializer list' : wrong number of structure members
ERROR: 13 compilation errors. No code generated. ERROR: 13 compilation errors. No code generated.
...@@ -60,7 +60,7 @@ ERROR: node is still EOpNull! ...@@ -60,7 +60,7 @@ ERROR: node is still EOpNull!
0:68 Sequence 0:68 Sequence
0:68 move second child to first child (temp 3-component vector of float) 0:68 move second child to first child (temp 3-component vector of float)
0:68 'bv3' (global 3-component vector of float) 0:68 'bv3' (global 3-component vector of float)
0:68 Construct vec3 (global 3-component vector of float) 0:68 Construct vec3 (temp 3-component vector of float)
0:68 'vc1' (global float) 0:68 'vc1' (global float)
0:68 'vc2' (global float) 0:68 'vc2' (global float)
0:68 'vc3' (global float) 0:68 'vc3' (global float)
...@@ -210,7 +210,7 @@ ERROR: node is still EOpNull! ...@@ -210,7 +210,7 @@ ERROR: node is still EOpNull!
0:68 Sequence 0:68 Sequence
0:68 move second child to first child (temp 3-component vector of float) 0:68 move second child to first child (temp 3-component vector of float)
0:68 'bv3' (global 3-component vector of float) 0:68 'bv3' (global 3-component vector of float)
0:68 Construct vec3 (global 3-component vector of float) 0:68 Construct vec3 (temp 3-component vector of float)
0:68 'vc1' (global float) 0:68 'vc1' (global float)
0:68 'vc2' (global float) 0:68 'vc2' (global float)
0:68 'vc3' (global float) 0:68 'vc3' (global float)
......
Test/baseResults/430AofA.frag.out
...@@ -6,7 +6,7 @@ ERROR: 0:15: 'constructior' : array constructor argument not correct type to con ...@@ -6,7 +6,7 @@ ERROR: 0:15: 'constructior' : array constructor argument not correct type to con
ERROR: 0:28: '[' : array index out of range '4' ERROR: 0:28: '[' : array index out of range '4'
ERROR: 0:56: 'constructor' : cannot convert parameter 2 from 'const 3-element array of 4-component vector of float' to 'temp 2-element array of 4-component vector of float' ERROR: 0:56: 'constructor' : cannot convert parameter 2 from 'const 3-element array of 4-component vector of float' to 'temp 2-element array of 4-component vector of float'
ERROR: 0:60: 'constructor' : cannot convert parameter 2 from 'const 2-element array of 4-component vector of float' to 'temp 3-element array of 4-component vector of float' ERROR: 0:60: 'constructor' : cannot convert parameter 2 from 'const 2-element array of 4-component vector of float' to 'temp 3-element array of 4-component vector of float'
ERROR: 0:64: '=' : cannot convert from 'temp 3-element array of 2-element array of 4-component vector of float' to 'temp 4-element array of 2-element array of 4-component vector of float' ERROR: 0:64: '=' : cannot convert from 'const 3-element array of 2-element array of 4-component vector of float' to 'temp 4-element array of 2-element array of 4-component vector of float'
ERROR: 0:70: 'assign' : cannot convert from 'global 4-element array of 7-element array of float' to 'global 5-element array of 7-element array of float' ERROR: 0:70: 'assign' : cannot convert from 'global 4-element array of 7-element array of float' to 'global 5-element array of 7-element array of float'
ERROR: 0:71: 'assign' : cannot convert from 'global 4-element array of 7-element array of float' to 'global implicitly-sized array of 7-element array of float' ERROR: 0:71: 'assign' : cannot convert from 'global 4-element array of 7-element array of float' to 'global implicitly-sized array of 7-element array of float'
ERROR: 0:73: 'foo' : no matching overloaded function found ERROR: 0:73: 'foo' : no matching overloaded function found
......
Test/baseResults/spv.specConstantComposite.vert.out
...@@ -7,13 +7,13 @@ Linked vertex stage: ...@@ -7,13 +7,13 @@ Linked vertex stage:
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 119 // Id's are bound by 43
Capability Shader Capability Shader
Capability Float64 Capability Float64
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 27 118 EntryPoint Vertex 4 "main" 27 42
Source GLSL 450 Source GLSL 450
Name 4 "main" Name 4 "main"
Name 6 "refer_primary_spec_const(" Name 6 "refer_primary_spec_const("
...@@ -23,23 +23,12 @@ Linked vertex stage: ...@@ -23,23 +23,12 @@ Linked vertex stage:
Name 16 "refer_spec_const_array_length(" Name 16 "refer_spec_const_array_length("
Name 18 "declare_spec_const_in_func(" Name 18 "declare_spec_const_in_func("
Name 27 "color" Name 27 "color"
Name 42 "flat_struct" Name 33 "len"
MemberName 42(flat_struct) 0 "i" Name 42 "global_vec4_array_with_spec_length"
MemberName 42(flat_struct) 1 "f"
MemberName 42(flat_struct) 2 "d"
MemberName 42(flat_struct) 3 "b"
Name 44 "nesting_struct"
MemberName 44(nesting_struct) 0 "nested"
MemberName 44(nesting_struct) 1 "v"
MemberName 44(nesting_struct) 2 "i"
Name 72 "indexable"
Name 76 "indexable"
Name 83 "len"
Name 118 "global_vec4_array_with_spec_length"
Decorate 21 SpecId 203 Decorate 21 SpecId 203
Decorate 28 SpecId 200 Decorate 28 SpecId 200
Decorate 32 SpecId 201 Decorate 37 SpecId 201
Decorate 41 SpecId 202 Decorate 39 SpecId 202
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
14: TypeInt 32 1 14: TypeInt 32 1
...@@ -51,58 +40,13 @@ Linked vertex stage: ...@@ -51,58 +40,13 @@ Linked vertex stage:
26: TypePointer Output 25(fvec4) 26: TypePointer Output 25(fvec4)
27(color): 26(ptr) Variable Output 27(color): 26(ptr) Variable Output
28: 14(int) SpecConstant 3 28: 14(int) SpecConstant 3
32: 24(float) SpecConstant 1078523331 32: TypePointer Function 14(int)
33: 25(fvec4) SpecConstantComposite 32 32 32 32 37: 24(float) SpecConstant 1078523331
36: 24(float) Constant 1133908460 38: TypeFloat 64
37: 25(fvec4) SpecConstantComposite 32 32 36 36 39: 38(float) SpecConstant 1413754136 1074340347
40: TypeFloat 64 40: TypeArray 25(fvec4) 28
41: 40(float) SpecConstant 1413754136 1074340347 41: TypePointer Input 40
42(flat_struct): TypeStruct 14(int) 24(float) 40(float) 20(bool) 42(global_vec4_array_with_spec_length): 41(ptr) Variable Input
43:42(flat_struct) SpecConstantComposite 28 32 41 21
44(nesting_struct): TypeStruct 42(flat_struct) 25(fvec4) 14(int)
45:44(nesting_struct) SpecConstantComposite 43 33 28
46: 14(int) Constant 2
51: TypeInt 32 0
52: 51(int) Constant 0
57: 24(float) Constant 1065353216
58: 24(float) Constant 1073741824
59: 24(float) Constant 1077936128
60: 51(int) Constant 5
61: TypeArray 24(float) 60
62: 61 SpecConstantComposite 32 32 57 58 59
63: 14(int) Constant 1
68: 14(int) Constant 30
69: TypeArray 14(int) 60
70: 69 SpecConstantComposite 28 28 63 46 68
71: TypePointer Function 69
73: TypePointer Function 14(int)
87: 24(float) Constant 1106321080
88:42(flat_struct) SpecConstantComposite 68 87 41 21
89: 14(int) Constant 10
90:44(nesting_struct) SpecConstantComposite 88 37 89
96: 20(bool) ConstantFalse
97:42(flat_struct) SpecConstantComposite 28 32 41 96
98: 24(float) Constant 1036831949
99: 25(fvec4) ConstantComposite 98 98 98 98
100:44(nesting_struct) SpecConstantComposite 97 99 28
101: 25(fvec4) SpecConstantComposite 32 32 32 32
102: 24(float) Constant 1066192077
103: 24(float) Constant 1074580685
104: 24(float) Constant 1079194419
105: TypeVector 24(float) 3
106: TypeMatrix 105(fvec3) 2
107: 24(float) Constant 0
108: 105(fvec3) SpecConstantComposite 32 32 32
109: 105(fvec3) ConstantComposite 102 103 104
110: 106 SpecConstantComposite 108 109
111: 105(fvec3) SpecConstantComposite 32 107 107
112: 105(fvec3) SpecConstantComposite 107 32 107
113: 106 SpecConstantComposite 111 112
114: 14(int) Constant 3000
115:44(nesting_struct) SpecConstantComposite 88 37 114
116: TypeArray 25(fvec4) 28
117: TypePointer Input 116
118(global_vec4_array_with_spec_length): 117(ptr) Variable Input
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
Return Return
...@@ -122,64 +66,24 @@ Linked vertex stage: ...@@ -122,64 +66,24 @@ Linked vertex stage:
FunctionEnd FunctionEnd
8(refer_composite_spec_const(): 2 Function None 3 8(refer_composite_spec_const(): 2 Function None 3
9: Label 9: Label
34: 25(fvec4) Load 27(color)
35: 25(fvec4) FAdd 34 33
Store 27(color) 35
38: 25(fvec4) Load 27(color)
39: 25(fvec4) FSub 38 37
Store 27(color) 39
Return Return
FunctionEnd FunctionEnd
10(refer_copmosite_dot_dereference(): 2 Function None 3 10(refer_copmosite_dot_dereference(): 2 Function None 3
11: Label 11: Label
47: 14(int) CompositeExtract 45 2
48: 24(float) ConvertSToF 47
49: 25(fvec4) Load 27(color)
50: 25(fvec4) VectorTimesScalar 49 48
Store 27(color) 50
53: 24(float) CompositeExtract 33 0
54: 25(fvec4) Load 27(color)
55: 25(fvec4) CompositeConstruct 53 53 53 53
56: 25(fvec4) FAdd 54 55
Store 27(color) 56
Return Return
FunctionEnd FunctionEnd
12(refer_composite_bracket_dereference(): 2 Function None 3 12(refer_composite_bracket_dereference(): 2 Function None 3
13: Label 13: Label
72(indexable): 71(ptr) Variable Function
76(indexable): 71(ptr) Variable Function
64: 24(float) CompositeExtract 62 1
65: 25(fvec4) Load 27(color)
66: 25(fvec4) CompositeConstruct 64 64 64 64
67: 25(fvec4) FSub 65 66
Store 27(color) 67
Store 72(indexable) 70
74: 73(ptr) AccessChain 72(indexable) 28
75: 14(int) Load 74
Store 76(indexable) 70
77: 73(ptr) AccessChain 76(indexable) 75
78: 14(int) Load 77
79: 24(float) ConvertSToF 78
80: 25(fvec4) Load 27(color)
81: 25(fvec4) CompositeConstruct 79 79 79 79
82: 25(fvec4) FDiv 80 81
Store 27(color) 82
Return Return
FunctionEnd FunctionEnd
16(refer_spec_const_array_length(): 14(int) Function None 15 16(refer_spec_const_array_length(): 14(int) Function None 15
17: Label 17: Label
83(len): 73(ptr) Variable Function 33(len): 32(ptr) Variable Function
Store 83(len) 28 Store 33(len) 28
84: 14(int) Load 83(len) 34: 14(int) Load 33(len)
ReturnValue 84 ReturnValue 34
FunctionEnd FunctionEnd
18(declare_spec_const_in_func(): 2 Function None 3 18(declare_spec_const_in_func(): 2 Function None 3
19: Label 19: Label
91: 14(int) CompositeExtract 90 2
92: 24(float) ConvertSToF 91
93: 25(fvec4) Load 27(color)
94: 25(fvec4) CompositeConstruct 92 92 92 92
95: 25(fvec4) FDiv 93 94
Store 27(color) 95
Return Return
FunctionEnd FunctionEnd
Test/baseResults/spv.specConstantOperations.vert.out
...@@ -7,7 +7,7 @@ Linked vertex stage: ...@@ -7,7 +7,7 @@ Linked vertex stage:
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 134 // Id's are bound by 131
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
...@@ -91,48 +91,45 @@ Linked vertex stage: ...@@ -91,48 +91,45 @@ Linked vertex stage:
89: 41(int) Constant 4294967294 89: 41(int) Constant 4294967294
90: TypeVector 41(int) 4 90: TypeVector 41(int) 4
91: 90(ivec4) SpecConstantComposite 42 42 88 89 91: 90(ivec4) SpecConstantComposite 42 42 88 89
92: 39(float) Constant 1067450368 92: TypeVector 22(bool) 4
93: TypeVector 39(float) 4 93: 90(ivec4) ConstantComposite 44 44 44 44
94: 93(fvec4) SpecConstantComposite 40 92 40 92 94: 92(bvec4) SpecConstantOp 171 87 93
95: TypeVector 22(bool) 4 95: 92(bvec4) SpecConstantOp 171 91 93
96: 90(ivec4) ConstantComposite 44 44 44 44 96: 86(ivec4) ConstantComposite 12 12 12 12
97: 95(bvec4) SpecConstantOp 171 87 96 97: 86(ivec4) ConstantComposite 32 32 32 32
98: 95(bvec4) SpecConstantOp 171 91 96 98: 86(ivec4) SpecConstantOp 169 94 97 96
99: 86(ivec4) ConstantComposite 12 12 12 12 99: 90(ivec4) ConstantComposite 48 48 48 48
100: 86(ivec4) ConstantComposite 32 32 32 32 100: 90(ivec4) SpecConstantOp 169 94 99 93
101: 86(ivec4) SpecConstantOp 169 97 100 99 101: 90(ivec4) SpecConstantOp 128 87 93
102: 90(ivec4) ConstantComposite 48 48 48 48 102: 86(ivec4) SpecConstantOp 128 91 93
103: 90(ivec4) SpecConstantOp 169 97 102 96 103: 86(ivec4) SpecConstantOp 200 87
104: 90(ivec4) SpecConstantOp 128 87 96 104: 86(ivec4) SpecConstantOp 126 87
105: 86(ivec4) SpecConstantOp 128 91 96 105: 86(ivec4) ConstantComposite 20 20 20 20
106: 86(ivec4) SpecConstantOp 200 87 106: 86(ivec4) SpecConstantOp 128 87 105
107: 86(ivec4) SpecConstantOp 126 87 107: 86(ivec4) SpecConstantOp 128 87 105
108: 86(ivec4) ConstantComposite 20 20 20 20 108: 86(ivec4) ConstantComposite 56 56 56 56
109: 86(ivec4) SpecConstantOp 128 87 108 109: 86(ivec4) SpecConstantOp 130 107 108
110: 86(ivec4) SpecConstantOp 128 87 108 110: 86(ivec4) ConstantComposite 58 58 58 58
111: 86(ivec4) ConstantComposite 56 56 56 56 111: 86(ivec4) SpecConstantOp 130 109 110
112: 86(ivec4) SpecConstantOp 130 110 111 112: 86(ivec4) SpecConstantOp 132 87 105
113: 86(ivec4) ConstantComposite 58 58 58 58 113: 86(ivec4) ConstantComposite 63 63 63 63
114: 86(ivec4) SpecConstantOp 130 112 113 114: 86(ivec4) SpecConstantOp 135 112 113
115: 86(ivec4) SpecConstantOp 132 87 108 115: 86(ivec4) SpecConstantOp 139 87 110
116: 86(ivec4) ConstantComposite 63 63 63 63 116: 86(ivec4) ConstantComposite 72 72 72 72
117: 86(ivec4) SpecConstantOp 135 115 116 117: 86(ivec4) SpecConstantOp 195 87 116
118: 86(ivec4) SpecConstantOp 139 87 113 118: 86(ivec4) SpecConstantOp 196 87 105
119: 86(ivec4) ConstantComposite 72 72 72 72 119: 6(int) Constant 1024
120: 86(ivec4) SpecConstantOp 195 87 119 120: 86(ivec4) ConstantComposite 119 119 119 119
121: 86(ivec4) SpecConstantOp 196 87 108 121: 86(ivec4) SpecConstantOp 197 87 120
122: 6(int) Constant 1024 122: 41(int) Constant 2048
123: 86(ivec4) ConstantComposite 122 122 122 122 123: 90(ivec4) ConstantComposite 122 122 122 122
124: 86(ivec4) SpecConstantOp 197 87 123 124: 90(ivec4) SpecConstantOp 198 91 123
125: 41(int) Constant 2048 125: 6(int) SpecConstantOp 81 87 0
126: 90(ivec4) ConstantComposite 125 125 125 125 126: TypeVector 6(int) 2
127: 90(ivec4) SpecConstantOp 198 91 126 127: 126(ivec2) SpecConstantOp 79 87 87 1(GLSL.std.450) 0
128: 6(int) SpecConstantOp 81 87 0 128: TypeVector 6(int) 3
129: TypeVector 6(int) 2 129: 128(ivec3) SpecConstantOp 79 87 87 2 1(GLSL.std.450) 0
130: 129(ivec2) SpecConstantOp 79 87 87 1(GLSL.std.450) 0 130: 86(ivec4) SpecConstantOp 79 87 87 1(GLSL.std.450) 2 0 3
131: TypeVector 6(int) 3
132: 131(ivec3) SpecConstantOp 79 87 87 2 1(GLSL.std.450) 0
133: 86(ivec4) SpecConstantOp 79 87 87 1(GLSL.std.450) 2 0 3
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
Return Return
......
Test/spv.specConstantComposite.vert
...@@ -7,7 +7,7 @@ layout(constant_id = 202) const ...@@ -7,7 +7,7 @@ layout(constant_id = 202) const
double spec_double = 3.1415926535897932384626433832795; double spec_double = 3.1415926535897932384626433832795;
layout(constant_id = 203) const bool spec_bool = true; layout(constant_id = 203) const bool spec_bool = true;
const float cast_spec_float = float(spec_float); // const float cast_spec_float = float(spec_float);
// Flat struct // Flat struct
struct flat_struct { struct flat_struct {
...@@ -26,40 +26,40 @@ struct nesting_struct { ...@@ -26,40 +26,40 @@ struct nesting_struct {
// Expect OpSpecConstantComposite // Expect OpSpecConstantComposite
// Flat struct initializer // Flat struct initializer
const flat_struct spec_flat_struct_all_spec = {spec_int, spec_float, //const flat_struct spec_flat_struct_all_spec = {spec_int, spec_float,
spec_double, spec_bool}; // spec_double, spec_bool};
const flat_struct spec_flat_struct_partial_spec = {30, 30.14, spec_double, //const flat_struct spec_flat_struct_partial_spec = {30, 30.14, spec_double,
spec_bool}; // spec_bool};
// Nesting struct initializer // Nesting struct initializer
const nesting_struct nesting_struct_ctor = { //const nesting_struct nesting_struct_ctor = {
{spec_int, spec_float, spec_double, false}, // {spec_int, spec_float, spec_double, false},
vec4(0.1, 0.1, 0.1, 0.1), // vec4(0.1, 0.1, 0.1, 0.1),
spec_int}; // spec_int};
// Vector constructor // Vector constructor
const vec4 spec_vec4_all_spec = //const vec4 spec_vec4_all_spec =
vec4(spec_float, spec_float, spec_float, spec_float); // vec4(spec_float, spec_float, spec_float, spec_float);
const vec4 spec_vec4_partial_spec = //const vec4 spec_vec4_partial_spec =
vec4(spec_float, spec_float, 300.14, 300.14); // vec4(spec_float, spec_float, 300.14, 300.14);
const vec4 spec_vec4_from_one_scalar = vec4(spec_float); //const vec4 spec_vec4_from_one_scalar = vec4(spec_float);
// Matrix constructor // Matrix constructor
const mat2x3 spec_mat2x3 = mat2x3(spec_float, spec_float, spec_float, 1.1, 2.2, 3.3); //const mat2x3 spec_mat2x3 = mat2x3(spec_float, spec_float, spec_float, 1.1, 2.2, 3.3);
const mat2x3 spec_mat2x3_from_one_scalar = mat2x3(spec_float); //const mat2x3 spec_mat2x3_from_one_scalar = mat2x3(spec_float);
// Struct nesting constructor // Struct nesting constructor
const nesting_struct spec_nesting_struct_all_spec = { //const nesting_struct spec_nesting_struct_all_spec = {
spec_flat_struct_all_spec, spec_vec4_all_spec, spec_int}; // spec_flat_struct_all_spec, spec_vec4_all_spec, spec_int};
const nesting_struct spec_nesting_struct_partial_spec = { //const nesting_struct spec_nesting_struct_partial_spec = {
spec_flat_struct_partial_spec, spec_vec4_partial_spec, 3000}; // spec_flat_struct_partial_spec, spec_vec4_partial_spec, 3000};
const float spec_float_array[5] = {spec_float, spec_float, 1.0, 2.0, 3.0}; //const float spec_float_array[5] = {spec_float, spec_float, 1.0, 2.0, 3.0};
const int spec_int_array[5] = {spec_int, spec_int, 1, 2, 30}; //const int spec_int_array[5] = {spec_int, spec_int, 1, 2, 30};
// global_vec4_array_with_spec_length is not a spec constant, but its array // global_vec4_array_with_spec_length is not a spec constant, but its array
// size is. When calling global_vec4_array_with_spec_length.length(), A // size is. When calling global_vec4_array_with_spec_length.length(), A
// TIntermSymbol Node shoule be returned, instead of a TIntermConstantUnion // TIntermSymbol Node should be returned, instead of a TIntermConstantUnion
// node which represents a known constant value. // node which represents a known constant value.
in vec4 global_vec4_array_with_spec_length[spec_int]; in vec4 global_vec4_array_with_spec_length[spec_int];
...@@ -70,18 +70,18 @@ void refer_primary_spec_const() { ...@@ -70,18 +70,18 @@ void refer_primary_spec_const() {
} }
void refer_composite_spec_const() { void refer_composite_spec_const() {
color += spec_vec4_all_spec; //color += spec_vec4_all_spec;
color -= spec_vec4_partial_spec; //color -= spec_vec4_partial_spec;
} }
void refer_copmosite_dot_dereference() { void refer_copmosite_dot_dereference() {
color *= spec_nesting_struct_all_spec.i; //color *= spec_nesting_struct_all_spec.i;
color += spec_vec4_all_spec.x; //color += spec_vec4_all_spec.x;
} }
void refer_composite_bracket_dereference() { void refer_composite_bracket_dereference() {
color -= spec_float_array[1]; //color -= spec_float_array[1];
color /= spec_int_array[spec_int_array[spec_int]]; //color /= spec_int_array[spec_int_array[spec_int]];
} }
int refer_spec_const_array_length() { int refer_spec_const_array_length() {
...@@ -90,9 +90,9 @@ int refer_spec_const_array_length() { ...@@ -90,9 +90,9 @@ int refer_spec_const_array_length() {
} }
void declare_spec_const_in_func() { void declare_spec_const_in_func() {
const nesting_struct spec_const_declared_in_func = { //const nesting_struct spec_const_declared_in_func = {
spec_flat_struct_partial_spec, spec_vec4_partial_spec, 10}; // spec_flat_struct_partial_spec, spec_vec4_partial_spec, 10};
color /= spec_const_declared_in_func.i; //color /= spec_const_declared_in_func.i;
} }
void main() {} void main() {}
Test/spv.specConstantOperations.vert
...@@ -58,7 +58,7 @@ const bool sp_int_gt_sp_sint = sp_int > sp_sint; ...@@ -58,7 +58,7 @@ const bool sp_int_gt_sp_sint = sp_int > sp_sint;
// //
const ivec4 iv = ivec4(20, 30, sp_int, sp_int); const ivec4 iv = ivec4(20, 30, sp_int, sp_int);
const uvec4 uv = uvec4(sp_uint, sp_uint, -1, -2); const uvec4 uv = uvec4(sp_uint, sp_uint, -1, -2);
const vec4 fv = vec4(sp_float, 1.25, sp_float, 1.25); //const vec4 fv = vec4(sp_float, 1.25, sp_float, 1.25);
// uint/int <-> bool conversion // uint/int <-> bool conversion
const bvec4 bv_from_iv = bvec4(iv); const bvec4 bv_from_iv = bvec4(iv);
......
Test/vulkan.ast.vert 0 → 100644
#version 450
layout(constant_id = 200) const float scf1 = 1.0;
layout(constant_id = 201) const bool scbt = true;
layout(constant_id = 202) const int sci2 = 2;
void main()
{
bool(scf1); // not a spec-const
bool(scbt); // spec-const
bool(sci2); // spec-const
float(scf1); // not a spec-const
float(scbt); // not a spec-const
float(sci2); // not a spec-const
int(scf1); // not a spec-const
int(scbt); // spec-const
int(sci2); // spec-const
scf1 * scf1; // not a spec-const
scbt || scbt; // spec-const
sci2 * sci2; // spec-const
scf1 + sci2; // implicit conversion not a spec-const
-scf1; // not a spec-const
!scbt; // spec-const
-sci2; // spec-const
scf1 > scf1; // not a spec-const
sci2 > sci2; // spec-const
scf1 != scf1; // not a spec-const
scbt != scbt; // spec-const
sci2 != sci2; // spec-const
ivec2(sci2, sci2); // spec-const
ivec2[2](ivec2(sci2, sci2), ivec2(sci2, sci2)); // not a spec-const
vec2(scf1, scf1); // not spec-const
vec2[2](vec2(scf1, scf1), vec2(scf1, scf1)); // not a spec-const
}
glslang/Include/Types.h
...@@ -1253,6 +1253,7 @@ public: ...@@ -1253,6 +1253,7 @@ public:
virtual bool isImplicitlySizedArray() const { return isArray() && getOuterArraySize() == UnsizedArraySize && qualifier.storage != EvqBuffer; } virtual bool isImplicitlySizedArray() const { return isArray() && getOuterArraySize() == UnsizedArraySize && qualifier.storage != EvqBuffer; }
virtual bool isRuntimeSizedArray() const { return isArray() && getOuterArraySize() == UnsizedArraySize && qualifier.storage == EvqBuffer; } virtual bool isRuntimeSizedArray() const { return isArray() && getOuterArraySize() == UnsizedArraySize && qualifier.storage == EvqBuffer; }
virtual bool isStruct() const { return structure != nullptr; } virtual bool isStruct() const { return structure != nullptr; }
virtual bool isFloatingDomain() const { return basicType == EbtFloat || basicType == EbtDouble; }
// "Image" is a superset of "Subpass" // "Image" is a superset of "Subpass"
virtual bool isImage() const { return basicType == EbtSampler && getSampler().isImage(); } virtual bool isImage() const { return basicType == EbtSampler && getSampler().isImage(); }
......
glslang/MachineIndependent/Intermediate.cpp
...@@ -922,6 +922,7 @@ TIntermTyped* TIntermediate::addSelection(TIntermTyped* cond, TIntermTyped* true ...@@ -922,6 +922,7 @@ TIntermTyped* TIntermediate::addSelection(TIntermTyped* cond, TIntermTyped* true
TIntermConstantUnion* TIntermediate::addConstantUnion(const TConstUnionArray& unionArray, const TType& t, const TSourceLoc& loc, bool literal) const TIntermConstantUnion* TIntermediate::addConstantUnion(const TConstUnionArray& unionArray, const TType& t, const TSourceLoc& loc, bool literal) const
{ {
TIntermConstantUnion* node = new TIntermConstantUnion(unionArray, t); TIntermConstantUnion* node = new TIntermConstantUnion(unionArray, t);
node->getQualifier().storage = EvqConst;
node->setLoc(loc); node->setLoc(loc);
if (literal) if (literal)
node->setLiteral(); node->setLiteral();
...@@ -1165,20 +1166,44 @@ void TIntermediate::removeTree() ...@@ -1165,20 +1166,44 @@ void TIntermediate::removeTree()
// //
// "5.x Specialization Constant Operations" // "5.x Specialization Constant Operations"
// //
// ... // Only some operations discussed in this section may be applied to a
// // specialization constant and still yield a result that is as
// It also needs to allow basic construction, swizzling, and indexing // specialization constant. The operations allowed are listed below.
// operations. // When a specialization constant is operated on with one of these
// operators and with another constant or specialization constant, the
// result is implicitly a specialization constant.
//
// - int(), uint(), and bool() constructors for type conversions
// from any of the following types to any of the following types:
// * int
// * uint
// * bool
// - vector versions of the above conversion constructors
// - allowed implicit conversions of the above
// - swizzles (e.g., foo.yx)
// - The following when applied to integer or unsigned integer types:
// * unary negative ( - )
// * binary operations ( + , - , * , / , % )
// * shift ( <<, >> )
// * bitwise operations ( & , | , ^ )
// - The following when applied to integer or unsigned integer scalar types:
// * comparison ( == , != , > , >= , < , <= )
// - The following when applied to the Boolean scalar type:
// * not ( ! )
// * logical operations ( && , || , ^^ )
// * comparison ( == , != )"
//
// This function just handles binary and unary nodes. Construction
// rules are handled in construction paths that are not covered by the unary
// and binary paths, while required conversions will still show up here
// as unary converters in the from a construction operator.
// //
bool TIntermediate::isSpecializationOperation(const TIntermOperator& node) const bool TIntermediate::isSpecializationOperation(const TIntermOperator& node) const
{ {
// allow construction // The operations resulting in floating point are quite limited
if (node.isConstructor()) // (However, some floating-point operations result in bool, like ">",
return true; // so are handled later.)
if (node.getType().isFloatingDomain()) {
// The set for floating point is quite limited
if (node.getBasicType() == EbtFloat ||
node.getBasicType() == EbtDouble) {
switch (node.getOp()) { switch (node.getOp()) {
case EOpIndexDirect: case EOpIndexDirect:
case EOpIndexIndirect: case EOpIndexIndirect:
...@@ -1190,7 +1215,14 @@ bool TIntermediate::isSpecializationOperation(const TIntermOperator& node) const ...@@ -1190,7 +1215,14 @@ bool TIntermediate::isSpecializationOperation(const TIntermOperator& node) const
} }
} }
// Floating-point is out of the way. // Check for floating-point arguments
if (const TIntermBinary* bin = node.getAsBinaryNode())
if (bin->getLeft() ->getType().isFloatingDomain() ||
bin->getRight()->getType().isFloatingDomain())
return false;
// So, for now, we can assume everything left is non-floating-point...
// Now check for integer/bool-based operations // Now check for integer/bool-based operations
switch (node.getOp()) { switch (node.getOp()) {
......
glslang/MachineIndependent/ParseHelper.cpp
...@@ -2208,6 +2208,18 @@ bool TParseContext::builtInName(const TString& identifier) ...@@ -2208,6 +2208,18 @@ bool TParseContext::builtInName(const TString& identifier)
// constructor to build something of the type of the constructor. Also returns // constructor to build something of the type of the constructor. Also returns
// the type of the constructor. // the type of the constructor.
// //
// Part of establishing type is establishing specialization-constness.
// We don't yet know "top down" whether type is a specialization constant,
// but a const constructor can becomes a specialization constant if any of
// its children are, subject to KHR_vulkan_glsl rules:
//
// - int(), uint(), and bool() constructors for type conversions
// from any of the following types to any of the following types:
// * int
// * uint
// * bool
// - vector versions of the above conversion constructors
//
// Returns true if there was an error in construction. // Returns true if there was an error in construction.
// //
bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, TFunction& function, TOperator op, TType& type) bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, TFunction& function, TOperator op, TType& type)
...@@ -2253,6 +2265,7 @@ bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, T ...@@ -2253,6 +2265,7 @@ bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, T
bool overFull = false; bool overFull = false;
bool matrixInMatrix = false; bool matrixInMatrix = false;
bool arrayArg = false; bool arrayArg = false;
bool floatArgument = false;
for (int arg = 0; arg < function.getParamCount(); ++arg) { for (int arg = 0; arg < function.getParamCount(); ++arg) {
if (function[arg].type->isArray()) { if (function[arg].type->isArray()) {
if (! function[arg].type->isExplicitlySizedArray()) { if (! function[arg].type->isExplicitlySizedArray()) {
...@@ -2281,11 +2294,52 @@ bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, T ...@@ -2281,11 +2294,52 @@ bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, T
constType = false; constType = false;
if (function[arg].type->getQualifier().isSpecConstant()) if (function[arg].type->getQualifier().isSpecConstant())
specConstType = true; specConstType = true;
if (function[arg].type->isFloatingDomain())
floatArgument = true;
} }
// inherit constness from children
if (constType) { if (constType) {
if (specConstType) bool makeSpecConst;
// Finish pinning down spec-const semantics
if (specConstType) {
switch (op) {
case EOpConstructInt:
case EOpConstructUint:
case EOpConstructInt64:
case EOpConstructUint64:
case EOpConstructBool:
case EOpConstructBVec2:
case EOpConstructBVec3:
case EOpConstructBVec4:
case EOpConstructIVec2:
case EOpConstructIVec3:
case EOpConstructIVec4:
case EOpConstructUVec2:
case EOpConstructUVec3:
case EOpConstructUVec4:
case EOpConstructI64Vec2:
case EOpConstructI64Vec3:
case EOpConstructI64Vec4:
case EOpConstructU64Vec2:
case EOpConstructU64Vec3:
case EOpConstructU64Vec4:
// This was the list of valid ones, if they aren't converting from float
// and aren't making an array.
makeSpecConst = ! floatArgument && ! type.isArray();
break;
default:
// anything else wasn't white-listed in the spec as a conversion
makeSpecConst = false;
break;
}
} else
makeSpecConst = false;
if (makeSpecConst)
type.getQualifier().makeSpecConstant(); type.getQualifier().makeSpecConstant();
else if (specConstType)
type.getQualifier().makeTemporary();
else else
type.getQualifier().storage = EvqConst; type.getQualifier().storage = EvqConst;
} }
...@@ -4941,7 +4995,14 @@ TIntermNode* TParseContext::executeInitializer(const TSourceLoc& loc, TIntermTyp ...@@ -4941,7 +4995,14 @@ TIntermNode* TParseContext::executeInitializer(const TSourceLoc& loc, TIntermTyp
// constructor-style subtree, allowing the rest of the code to operate // constructor-style subtree, allowing the rest of the code to operate
// identically for both kinds of initializers. // identically for both kinds of initializers.
// //
initializer = convertInitializerList(loc, variable->getType(), initializer); // Type can't be deduced from the initializer list, so a skeletal type to
// follow has to be passed in. Constness and specialization-constness
// should be deduced bottom up, not dictated by the skeletal type.
//
TType skeletalType;
skeletalType.shallowCopy(variable->getType());
skeletalType.getQualifier().makeTemporary();
initializer = convertInitializerList(loc, skeletalType, initializer);
if (! initializer) { if (! initializer) {
// error recovery; don't leave const without constant values // error recovery; don't leave const without constant values
if (qualifier == EvqConst) if (qualifier == EvqConst)
...@@ -5030,7 +5091,7 @@ TIntermNode* TParseContext::executeInitializer(const TSourceLoc& loc, TIntermTyp ...@@ -5030,7 +5091,7 @@ TIntermNode* TParseContext::executeInitializer(const TSourceLoc& loc, TIntermTyp
// normal assigning of a value to a variable... // normal assigning of a value to a variable...
specializationCheck(loc, initializer->getType(), "initializer"); specializationCheck(loc, initializer->getType(), "initializer");
TIntermSymbol* intermSymbol = intermediate.addSymbol(*variable, loc); TIntermSymbol* intermSymbol = intermediate.addSymbol(*variable, loc);
TIntermNode* initNode = intermediate.addAssign(EOpAssign, intermSymbol, initializer, loc); TIntermTyped* initNode = intermediate.addAssign(EOpAssign, intermSymbol, initializer, loc);
if (! initNode) if (! initNode)
assignError(loc, "=", intermSymbol->getCompleteString(), initializer->getCompleteString()); assignError(loc, "=", intermSymbol->getCompleteString(), initializer->getCompleteString());
...@@ -5041,11 +5102,14 @@ TIntermNode* TParseContext::executeInitializer(const TSourceLoc& loc, TIntermTyp ...@@ -5041,11 +5102,14 @@ TIntermNode* TParseContext::executeInitializer(const TSourceLoc& loc, TIntermTyp
} }
// //
// Reprocess any initializer-list { ... } parts of the initializer. // Reprocess any initializer-list (the "{ ... }" syntax) parts of the
// initializer.
//
// Need to hierarchically assign correct types and implicit // Need to hierarchically assign correct types and implicit
// conversions. Will do this mimicking the same process used for // conversions. Will do this mimicking the same process used for
// creating a constructor-style initializer, ensuring we get the // creating a constructor-style initializer, ensuring we get the
// same form. // same form. However, it has to in parallel walk the 'type'
// passed in, as type cannot be deduced from an initializer list.
// //
TIntermTyped* TParseContext::convertInitializerList(const TSourceLoc& loc, const TType& type, TIntermTyped* initializer) TIntermTyped* TParseContext::convertInitializerList(const TSourceLoc& loc, const TType& type, TIntermTyped* initializer)
{ {
...@@ -5191,12 +5255,6 @@ TIntermTyped* TParseContext::addConstructor(const TSourceLoc& loc, TIntermNode* ...@@ -5191,12 +5255,6 @@ TIntermTyped* TParseContext::addConstructor(const TSourceLoc& loc, TIntermNode*
// for each parameter to the constructor call, check to see if the right type is passed or convert them // for each parameter to the constructor call, check to see if the right type is passed or convert them
// to the right type if possible (and allowed). // to the right type if possible (and allowed).
// for structure constructors, just check if the right type is passed, no conversion is allowed. // for structure constructors, just check if the right type is passed, no conversion is allowed.
// We don't know "top down" whether type is a specialization constant,
// but a const becomes a specialization constant if any of its children are.
bool hasSpecConst = false;
bool isConstConstrutor = true;
for (TIntermSequence::iterator p = sequenceVector.begin(); for (TIntermSequence::iterator p = sequenceVector.begin();
p != sequenceVector.end(); p++, paramCount++) { p != sequenceVector.end(); p++, paramCount++) {
if (type.isArray()) if (type.isArray())
...@@ -5206,21 +5264,13 @@ TIntermTyped* TParseContext::addConstructor(const TSourceLoc& loc, TIntermNode* ...@@ -5206,21 +5264,13 @@ TIntermTyped* TParseContext::addConstructor(const TSourceLoc& loc, TIntermNode*
else else
newNode = constructBuiltIn(type, op, (*p)->getAsTyped(), node->getLoc(), true); newNode = constructBuiltIn(type, op, (*p)->getAsTyped(), node->getLoc(), true);
if (newNode) { if (newNode)
*p = newNode; *p = newNode;
if (! newNode->getType().getQualifier().isConstant()) else
isConstConstrutor = false;
if (newNode->getType().getQualifier().isSpecConstant())
hasSpecConst = true;
} else
return nullptr; return nullptr;
} }
TIntermTyped* constructor = intermediate.setAggregateOperator(aggrNode, op, type, loc); return intermediate.setAggregateOperator(aggrNode, op, type, loc);
if (isConstConstrutor && hasSpecConst)
constructor->getWritableType().getQualifier().makeSpecConstant();
return constructor;
} }
// Function for constructor implementation. Calls addUnaryMath with appropriate EOp value // Function for constructor implementation. Calls addUnaryMath with appropriate EOp value
......
glslang/MachineIndependent/localintermediate.h
...@@ -346,7 +346,6 @@ protected: ...@@ -346,7 +346,6 @@ protected:
static int getBaseAlignmentScalar(const TType&, int& size); static int getBaseAlignmentScalar(const TType&, int& size);
bool isSpecializationOperation(const TIntermOperator&) const; bool isSpecializationOperation(const TIntermOperator&) const;
const EShLanguage language; // stage, known at construction time const EShLanguage language; // stage, known at construction time
EShSource source; // source language, known a bit later EShSource source; // source language, known a bit later
std::string entryPoint; std::string entryPoint;
......
gtests/Spv.FromFile.cpp
...@@ -43,6 +43,7 @@ namespace { ...@@ -43,6 +43,7 @@ namespace {
using CompileToSpirvTest = GlslangTest<::testing::TestWithParam<std::string>>; using CompileToSpirvTest = GlslangTest<::testing::TestWithParam<std::string>>;
using VulkanSemantics = GlslangTest<::testing::TestWithParam<std::string>>; using VulkanSemantics = GlslangTest<::testing::TestWithParam<std::string>>;
using VulkanAstSemantics = GlslangTest<::testing::TestWithParam<std::string>>;
// Compiling GLSL to SPIR-V under Vulkan semantics. Expected to successfully // Compiling GLSL to SPIR-V under Vulkan semantics. Expected to successfully
// generate SPIR-V. // generate SPIR-V.
...@@ -62,6 +63,14 @@ TEST_P(VulkanSemantics, FromFile) ...@@ -62,6 +63,14 @@ TEST_P(VulkanSemantics, FromFile)
Target::Spv); Target::Spv);
} }
// GLSL-level Vulkan semantics test that need to see the AST for validation.
TEST_P(VulkanAstSemantics, FromFile)
{
loadFileCompileAndCheck(GLSLANG_TEST_DIRECTORY, GetParam(),
Source::GLSL, Semantics::Vulkan,
Target::AST);
}
// clang-format off // clang-format off
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
Glsl, CompileToSpirvTest, Glsl, CompileToSpirvTest,
...@@ -187,6 +196,14 @@ INSTANTIATE_TEST_CASE_P( ...@@ -187,6 +196,14 @@ INSTANTIATE_TEST_CASE_P(
})), })),
FileNameAsCustomTestSuffix FileNameAsCustomTestSuffix
); );
INSTANTIATE_TEST_CASE_P(
Glsl, VulkanAstSemantics,
::testing::ValuesIn(std::vector<std::string>({
"vulkan.ast.vert",
})),
FileNameAsCustomTestSuffix
);
// clang-format on // clang-format on
} // anonymous namespace } // anonymous namespace
......
gtests/TestFixture.cpp
...@@ -94,7 +94,7 @@ EShMessages DeriveOptions(Source source, Semantics semantics, Target target) ...@@ -94,7 +94,7 @@ EShMessages DeriveOptions(Source source, Semantics semantics, Target target)
case Semantics::OpenGL: case Semantics::OpenGL:
break; break;
case Semantics::Vulkan: case Semantics::Vulkan:
result = static_cast<EShMessages>(result | EShMsgVulkanRules); result = static_cast<EShMessages>(result | EShMsgVulkanRules | EShMsgSpvRules);
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment