AST: Remove convertToBasicType() which was obfuscating the conversion design.
Reinforces that conversion rules are operation-specific. Side effect is that HLSL logical-operator conversions are more direct (e.g. float -> bool, rather than float -> int -> bool).
This commit is contained in:
John Kessenich
parent
2ad4737dc2
commit
137a24dffa
@ -74,8 +74,7 @@ gl_FragCoord origin is upper left
|
||||
0:17 'anon@0' (layout( row_major std140) uniform block{ uniform float condf, uniform int condi, uniform 1-component vector of float condf1, uniform 1-component vector of int condi1})
|
||||
0:17 Constant:
|
||||
0:17 1 (const uint)
|
||||
0:17 Convert int to bool ( temp bool)
|
||||
0:17 Convert float to int ( temp int)
|
||||
0:17 Convert float to bool ( temp bool)
|
||||
0:17 condf: direct index for structure ( uniform float)
|
||||
0:17 'anon@0' (layout( row_major std140) uniform block{ uniform float condf, uniform int condi, uniform 1-component vector of float condf1, uniform 1-component vector of int condi1})
|
||||
0:17 Constant:
|
||||
@ -243,8 +242,7 @@ gl_FragCoord origin is upper left
|
||||
0:17 'anon@0' (layout( row_major std140) uniform block{ uniform float condf, uniform int condi, uniform 1-component vector of float condf1, uniform 1-component vector of int condi1})
|
||||
0:17 Constant:
|
||||
0:17 1 (const uint)
|
||||
0:17 Convert int to bool ( temp bool)
|
||||
0:17 Convert float to int ( temp int)
|
||||
0:17 Convert float to bool ( temp bool)
|
||||
0:17 condf: direct index for structure ( uniform float)
|
||||
0:17 'anon@0' (layout( row_major std140) uniform block{ uniform float condf, uniform int condi, uniform 1-component vector of float condf1, uniform 1-component vector of int condi1})
|
||||
0:17 Constant:
|
||||
@ -335,12 +333,12 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80006
|
||||
// Id's are bound by 140
|
||||
// Id's are bound by 139
|
||||
|
||||
Capability Shader
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 138
|
||||
EntryPoint Fragment 4 "main" 137
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Source HLSL 500
|
||||
Name 4 "main"
|
||||
@ -352,17 +350,17 @@ gl_FragCoord origin is upper left
|
||||
MemberName 16($Global) 2 "condf1"
|
||||
MemberName 16($Global) 3 "condi1"
|
||||
Name 18 ""
|
||||
Name 88 "f"
|
||||
Name 101 "i"
|
||||
Name 121 "g"
|
||||
Name 138 "@entryPointOutput"
|
||||
Name 87 "f"
|
||||
Name 100 "i"
|
||||
Name 120 "g"
|
||||
Name 137 "@entryPointOutput"
|
||||
MemberDecorate 16($Global) 0 Offset 0
|
||||
MemberDecorate 16($Global) 1 Offset 4
|
||||
MemberDecorate 16($Global) 2 Offset 8
|
||||
MemberDecorate 16($Global) 3 Offset 12
|
||||
Decorate 16($Global) Block
|
||||
Decorate 18 DescriptorSet 0
|
||||
Decorate 138(@entryPointOutput) Location 0
|
||||
Decorate 137(@entryPointOutput) Location 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
@ -388,25 +386,25 @@ gl_FragCoord origin is upper left
|
||||
53: 6(float) Constant 1077936128
|
||||
57: 15(int) Constant 3
|
||||
64: 6(float) Constant 1082130432
|
||||
83: 6(float) Constant 1084227584
|
||||
87: TypePointer Function 6(float)
|
||||
100: TypePointer Function 15(int)
|
||||
125: 6(float) Constant 1088421888
|
||||
126: 6(float) Constant 1090519040
|
||||
137: TypePointer Output 7(fvec4)
|
||||
138(@entryPointOutput): 137(ptr) Variable Output
|
||||
82: 6(float) Constant 1084227584
|
||||
86: TypePointer Function 6(float)
|
||||
99: TypePointer Function 15(int)
|
||||
124: 6(float) Constant 1088421888
|
||||
125: 6(float) Constant 1090519040
|
||||
136: TypePointer Output 7(fvec4)
|
||||
137(@entryPointOutput): 136(ptr) Variable Output
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
139: 7(fvec4) FunctionCall 9(@main()
|
||||
Store 138(@entryPointOutput) 139
|
||||
138: 7(fvec4) FunctionCall 9(@main()
|
||||
Store 137(@entryPointOutput) 138
|
||||
Return
|
||||
FunctionEnd
|
||||
9(@main(): 7(fvec4) Function None 8
|
||||
10: Label
|
||||
12(a): 11(ptr) Variable Function
|
||||
88(f): 87(ptr) Variable Function
|
||||
101(i): 100(ptr) Variable Function
|
||||
121(g): 87(ptr) Variable Function
|
||||
87(f): 86(ptr) Variable Function
|
||||
100(i): 99(ptr) Variable Function
|
||||
120(g): 86(ptr) Variable Function
|
||||
Store 12(a) 14
|
||||
21: 20(ptr) AccessChain 18 19
|
||||
22: 15(int) Load 21
|
||||
@ -457,85 +455,84 @@ gl_FragCoord origin is upper left
|
||||
70: 23(bool) INotEqual 69 25
|
||||
71: 35(ptr) AccessChain 18 34
|
||||
72: 6(float) Load 71
|
||||
73: 15(int) ConvertFToS 72
|
||||
74: 23(bool) INotEqual 73 25
|
||||
75: 23(bool) LogicalAnd 70 74
|
||||
76: 35(ptr) AccessChain 18 46
|
||||
77: 6(float) Load 76
|
||||
78: 23(bool) FOrdNotEqual 77 38
|
||||
79: 23(bool) LogicalOr 75 78
|
||||
SelectionMerge 81 None
|
||||
BranchConditional 79 80 81
|
||||
73: 23(bool) FOrdNotEqual 72 38
|
||||
74: 23(bool) LogicalAnd 70 73
|
||||
75: 35(ptr) AccessChain 18 46
|
||||
76: 6(float) Load 75
|
||||
77: 23(bool) FOrdNotEqual 76 38
|
||||
78: 23(bool) LogicalOr 74 77
|
||||
SelectionMerge 80 None
|
||||
BranchConditional 78 79 80
|
||||
79: Label
|
||||
81: 7(fvec4) Load 12(a)
|
||||
83: 7(fvec4) CompositeConstruct 82 82 82 82
|
||||
84: 7(fvec4) FAdd 81 83
|
||||
ReturnValue 84
|
||||
80: Label
|
||||
82: 7(fvec4) Load 12(a)
|
||||
84: 7(fvec4) CompositeConstruct 83 83 83 83
|
||||
85: 7(fvec4) FAdd 82 84
|
||||
ReturnValue 85
|
||||
81: Label
|
||||
89: 35(ptr) AccessChain 18 34
|
||||
90: 6(float) Load 89
|
||||
Store 88(f) 90
|
||||
Branch 91
|
||||
91: Label
|
||||
LoopMerge 93 94 None
|
||||
Branch 95
|
||||
95: Label
|
||||
96: 6(float) Load 88(f)
|
||||
97: 23(bool) FOrdNotEqual 96 38
|
||||
BranchConditional 97 92 93
|
||||
92: Label
|
||||
98: 6(float) Load 88(f)
|
||||
99: 6(float) FSub 98 30
|
||||
Store 88(f) 99
|
||||
88: 35(ptr) AccessChain 18 34
|
||||
89: 6(float) Load 88
|
||||
Store 87(f) 89
|
||||
Branch 90
|
||||
90: Label
|
||||
LoopMerge 92 93 None
|
||||
Branch 94
|
||||
94: Label
|
||||
Branch 91
|
||||
95: 6(float) Load 87(f)
|
||||
96: 23(bool) FOrdNotEqual 95 38
|
||||
BranchConditional 96 91 92
|
||||
91: Label
|
||||
97: 6(float) Load 87(f)
|
||||
98: 6(float) FSub 97 30
|
||||
Store 87(f) 98
|
||||
Branch 93
|
||||
93: Label
|
||||
102: 20(ptr) AccessChain 18 19
|
||||
103: 15(int) Load 102
|
||||
Store 101(i) 103
|
||||
Branch 90
|
||||
92: Label
|
||||
101: 20(ptr) AccessChain 18 19
|
||||
102: 15(int) Load 101
|
||||
Store 100(i) 102
|
||||
Branch 103
|
||||
103: Label
|
||||
LoopMerge 105 106 None
|
||||
Branch 104
|
||||
104: Label
|
||||
LoopMerge 106 107 None
|
||||
Branch 105
|
||||
105: Label
|
||||
108: 15(int) Load 101(i)
|
||||
109: 15(int) ISub 108 19
|
||||
Store 101(i) 109
|
||||
Branch 107
|
||||
107: Label
|
||||
110: 15(int) Load 101(i)
|
||||
111: 23(bool) INotEqual 110 25
|
||||
BranchConditional 111 104 106
|
||||
107: 15(int) Load 100(i)
|
||||
108: 15(int) ISub 107 19
|
||||
Store 100(i) 108
|
||||
Branch 106
|
||||
106: Label
|
||||
Branch 112
|
||||
112: Label
|
||||
LoopMerge 114 115 None
|
||||
Branch 116
|
||||
116: Label
|
||||
117: 15(int) Load 101(i)
|
||||
118: 23(bool) INotEqual 117 25
|
||||
BranchConditional 118 113 114
|
||||
113: Label
|
||||
119: 15(int) Load 101(i)
|
||||
120: 15(int) ISub 119 19
|
||||
Store 101(i) 120
|
||||
109: 15(int) Load 100(i)
|
||||
110: 23(bool) INotEqual 109 25
|
||||
BranchConditional 110 103 105
|
||||
105: Label
|
||||
Branch 111
|
||||
111: Label
|
||||
LoopMerge 113 114 None
|
||||
Branch 115
|
||||
115: Label
|
||||
Branch 112
|
||||
116: 15(int) Load 100(i)
|
||||
117: 23(bool) INotEqual 116 25
|
||||
BranchConditional 117 112 113
|
||||
112: Label
|
||||
118: 15(int) Load 100(i)
|
||||
119: 15(int) ISub 118 19
|
||||
Store 100(i) 119
|
||||
Branch 114
|
||||
114: Label
|
||||
122: 35(ptr) AccessChain 18 34
|
||||
123: 6(float) Load 122
|
||||
124: 23(bool) FOrdNotEqual 123 38
|
||||
127: 6(float) Select 124 125 126
|
||||
Store 121(g) 127
|
||||
128: 6(float) Load 121(g)
|
||||
129: 7(fvec4) Load 12(a)
|
||||
130: 7(fvec4) CompositeConstruct 128 128 128 128
|
||||
131: 7(fvec4) FAdd 129 130
|
||||
Store 12(a) 131
|
||||
132: 7(fvec4) Load 12(a)
|
||||
133: 7(fvec4) CompositeConstruct 30 30 30 30
|
||||
134: 7(fvec4) FSub 132 133
|
||||
ReturnValue 134
|
||||
Branch 111
|
||||
113: Label
|
||||
121: 35(ptr) AccessChain 18 34
|
||||
122: 6(float) Load 121
|
||||
123: 23(bool) FOrdNotEqual 122 38
|
||||
126: 6(float) Select 123 124 125
|
||||
Store 120(g) 126
|
||||
127: 6(float) Load 120(g)
|
||||
128: 7(fvec4) Load 12(a)
|
||||
129: 7(fvec4) CompositeConstruct 127 127 127 127
|
||||
130: 7(fvec4) FAdd 128 129
|
||||
Store 12(a) 130
|
||||
131: 7(fvec4) Load 12(a)
|
||||
132: 7(fvec4) CompositeConstruct 30 30 30 30
|
||||
133: 7(fvec4) FSub 131 132
|
||||
ReturnValue 133
|
||||
FunctionEnd
|
||||
|
||||
@ -13,8 +13,7 @@ gl_FragCoord origin is upper left
|
||||
0:13 'anon@0' (layout( row_major std140) uniform block{ uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4})
|
||||
0:13 Constant:
|
||||
0:13 0 (const uint)
|
||||
0:13 Convert int to bool ( temp bool)
|
||||
0:13 Convert float to int ( temp int)
|
||||
0:13 Convert float to bool ( temp bool)
|
||||
0:13 fval: direct index for structure ( uniform float)
|
||||
0:13 'anon@0' (layout( row_major std140) uniform block{ uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4})
|
||||
0:13 Constant:
|
||||
@ -28,8 +27,7 @@ gl_FragCoord origin is upper left
|
||||
0:14 'anon@0' (layout( row_major std140) uniform block{ uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4})
|
||||
0:14 Constant:
|
||||
0:14 0 (const uint)
|
||||
0:14 Convert int to bool ( temp bool)
|
||||
0:14 Convert float to int ( temp int)
|
||||
0:14 Convert float to bool ( temp bool)
|
||||
0:14 fval: direct index for structure ( uniform float)
|
||||
0:14 'anon@0' (layout( row_major std140) uniform block{ uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4})
|
||||
0:14 Constant:
|
||||
@ -79,8 +77,7 @@ gl_FragCoord origin is upper left
|
||||
0:13 'anon@0' (layout( row_major std140) uniform block{ uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4})
|
||||
0:13 Constant:
|
||||
0:13 0 (const uint)
|
||||
0:13 Convert int to bool ( temp bool)
|
||||
0:13 Convert float to int ( temp int)
|
||||
0:13 Convert float to bool ( temp bool)
|
||||
0:13 fval: direct index for structure ( uniform float)
|
||||
0:13 'anon@0' (layout( row_major std140) uniform block{ uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4})
|
||||
0:13 Constant:
|
||||
@ -94,8 +91,7 @@ gl_FragCoord origin is upper left
|
||||
0:14 'anon@0' (layout( row_major std140) uniform block{ uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4})
|
||||
0:14 Constant:
|
||||
0:14 0 (const uint)
|
||||
0:14 Convert int to bool ( temp bool)
|
||||
0:14 Convert float to int ( temp int)
|
||||
0:14 Convert float to bool ( temp bool)
|
||||
0:14 fval: direct index for structure ( uniform float)
|
||||
0:14 'anon@0' (layout( row_major std140) uniform block{ uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4})
|
||||
0:14 Constant:
|
||||
@ -129,12 +125,12 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80006
|
||||
// Id's are bound by 57
|
||||
// Id's are bound by 56
|
||||
|
||||
Capability Shader
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint Fragment 4 "main" 54
|
||||
EntryPoint Fragment 4 "main" 53
|
||||
ExecutionMode 4 OriginUpperLeft
|
||||
Source HLSL 500
|
||||
Name 4 "main"
|
||||
@ -147,15 +143,15 @@ gl_FragCoord origin is upper left
|
||||
MemberName 14($Global) 2 "fval"
|
||||
MemberName 14($Global) 3 "fval4"
|
||||
Name 16 ""
|
||||
Name 45 "psout"
|
||||
Name 54 "@entryPointOutput.Color"
|
||||
Name 44 "psout"
|
||||
Name 53 "@entryPointOutput.Color"
|
||||
MemberDecorate 14($Global) 0 Offset 0
|
||||
MemberDecorate 14($Global) 1 Offset 16
|
||||
MemberDecorate 14($Global) 2 Offset 32
|
||||
MemberDecorate 14($Global) 3 Offset 48
|
||||
Decorate 14($Global) Block
|
||||
Decorate 16 DescriptorSet 0
|
||||
Decorate 54(@entryPointOutput.Color) Location 0
|
||||
Decorate 53(@entryPointOutput.Color) Location 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
@ -174,29 +170,29 @@ gl_FragCoord origin is upper left
|
||||
23: 22(int) Constant 0
|
||||
25: 12(int) Constant 2
|
||||
26: TypePointer Uniform 6(float)
|
||||
44: TypePointer Function 8(PS_OUTPUT)
|
||||
46: 6(float) Constant 1065353216
|
||||
47: 7(fvec4) ConstantComposite 46 46 46 46
|
||||
48: TypePointer Function 7(fvec4)
|
||||
53: TypePointer Output 7(fvec4)
|
||||
54(@entryPointOutput.Color): 53(ptr) Variable Output
|
||||
29: 6(float) Constant 0
|
||||
43: TypePointer Function 8(PS_OUTPUT)
|
||||
45: 6(float) Constant 1065353216
|
||||
46: 7(fvec4) ConstantComposite 45 45 45 45
|
||||
47: TypePointer Function 7(fvec4)
|
||||
52: TypePointer Output 7(fvec4)
|
||||
53(@entryPointOutput.Color): 52(ptr) Variable Output
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
55:8(PS_OUTPUT) FunctionCall 10(@main()
|
||||
56: 7(fvec4) CompositeExtract 55 0
|
||||
Store 54(@entryPointOutput.Color) 56
|
||||
54:8(PS_OUTPUT) FunctionCall 10(@main()
|
||||
55: 7(fvec4) CompositeExtract 54 0
|
||||
Store 53(@entryPointOutput.Color) 55
|
||||
Return
|
||||
FunctionEnd
|
||||
10(@main():8(PS_OUTPUT) Function None 9
|
||||
11: Label
|
||||
45(psout): 44(ptr) Variable Function
|
||||
44(psout): 43(ptr) Variable Function
|
||||
19: 18(ptr) AccessChain 16 17
|
||||
20: 12(int) Load 19
|
||||
24: 21(bool) INotEqual 20 23
|
||||
27: 26(ptr) AccessChain 16 25
|
||||
28: 6(float) Load 27
|
||||
29: 12(int) ConvertFToS 28
|
||||
30: 21(bool) INotEqual 29 23
|
||||
30: 21(bool) FOrdNotEqual 28 29
|
||||
31: 21(bool) LogicalAnd 24 30
|
||||
SelectionMerge 33 None
|
||||
BranchConditional 31 32 33
|
||||
@ -208,16 +204,15 @@ gl_FragCoord origin is upper left
|
||||
36: 21(bool) INotEqual 35 23
|
||||
37: 26(ptr) AccessChain 16 25
|
||||
38: 6(float) Load 37
|
||||
39: 12(int) ConvertFToS 38
|
||||
40: 21(bool) INotEqual 39 23
|
||||
41: 21(bool) LogicalOr 36 40
|
||||
SelectionMerge 43 None
|
||||
BranchConditional 41 42 43
|
||||
39: 21(bool) FOrdNotEqual 38 29
|
||||
40: 21(bool) LogicalOr 36 39
|
||||
SelectionMerge 42 None
|
||||
BranchConditional 40 41 42
|
||||
41: Label
|
||||
Branch 42
|
||||
42: Label
|
||||
Branch 43
|
||||
43: Label
|
||||
49: 48(ptr) AccessChain 45(psout) 17
|
||||
Store 49 47
|
||||
50:8(PS_OUTPUT) Load 45(psout)
|
||||
ReturnValue 50
|
||||
48: 47(ptr) AccessChain 44(psout) 17
|
||||
Store 48 46
|
||||
49:8(PS_OUTPUT) Load 44(psout)
|
||||
ReturnValue 49
|
||||
FunctionEnd
|
||||
|
||||
@ -475,7 +475,7 @@ bool TIntermediate::isConversionAllowed(TOperator op, TIntermTyped* node) const
|
||||
|
||||
// This is 'mechanism' here, it does any conversion told.
|
||||
// It is about basic type, not about shape.
|
||||
// The policy comes from the shader or the above code.
|
||||
// The policy comes from the shader or the calling code.
|
||||
TIntermUnary* TIntermediate::createConversion(TBasicType convertTo, TIntermTyped* node) const
|
||||
{
|
||||
//
|
||||
@ -491,7 +491,7 @@ TIntermUnary* TIntermediate::createConversion(TBasicType convertTo, TIntermTyped
|
||||
case EbtInt8: newOp = EOpConvInt8ToDouble; break;
|
||||
case EbtUint8: newOp = EOpConvUint8ToDouble; break;
|
||||
case EbtInt16: newOp = EOpConvInt16ToDouble; break;
|
||||
case EbtUint16:newOp = EOpConvUint16ToDouble;break;
|
||||
case EbtUint16: newOp = EOpConvUint16ToDouble; break;
|
||||
case EbtInt: newOp = EOpConvIntToDouble; break;
|
||||
case EbtUint: newOp = EOpConvUintToDouble; break;
|
||||
case EbtBool: newOp = EOpConvBoolToDouble; break;
|
||||
@ -714,24 +714,33 @@ TIntermUnary* TIntermediate::createConversion(TBasicType convertTo, TIntermTyped
|
||||
return newNode;
|
||||
}
|
||||
|
||||
// For converting a pair of operands to a binary operation to compatible
|
||||
// types with each other, relative to the operation in 'op'.
|
||||
// This does not cover assignment operations, which is asymmetric in that the
|
||||
// left type is not changeable.
|
||||
// See addConversion(op, type, node) for assignments and unary operation
|
||||
// conversions.
|
||||
//
|
||||
// Generally, this is focused on basic type conversion, not shape conversion.
|
||||
// See addShapeConversion() for shape conversions.
|
||||
//
|
||||
// Returns the converted pair of nodes.
|
||||
// Returns <nullptr, nullptr> when there is no conversion.
|
||||
std::tuple<TIntermTyped*, TIntermTyped*>
|
||||
TIntermediate::addConversion(TOperator op, TIntermTyped* node0, TIntermTyped* node1) const
|
||||
{
|
||||
if (!isConversionAllowed(op, node0) || !isConversionAllowed(op, node1)) {
|
||||
if (!isConversionAllowed(op, node0) || !isConversionAllowed(op, node1))
|
||||
return std::make_tuple(nullptr, nullptr);
|
||||
}
|
||||
|
||||
// If types are identical, no problem
|
||||
if (node0->getType() == node1->getType())
|
||||
return std::make_tuple(node0, node1);
|
||||
|
||||
// If one's a structure, then no conversions.
|
||||
if (node0->getType() != node1->getType()) {
|
||||
// If differing structure, then no conversions.
|
||||
if (node0->isStruct() || node1->isStruct())
|
||||
return std::make_tuple(nullptr, nullptr);
|
||||
|
||||
// If one's an array, then no conversions.
|
||||
// If differing arrays, then no conversions.
|
||||
if (node0->getType().isArray() || node1->getType().isArray())
|
||||
return std::make_tuple(nullptr, nullptr);
|
||||
}
|
||||
|
||||
auto promoteTo = std::make_tuple(EbtNumTypes, EbtNumTypes);
|
||||
|
||||
@ -767,11 +776,8 @@ TIntermediate::addConversion(TOperator op, TIntermTyped* node0, TIntermTyped* no
|
||||
case EOpAndAssign:
|
||||
case EOpInclusiveOrAssign:
|
||||
case EOpExclusiveOrAssign:
|
||||
case EOpLogicalNot:
|
||||
case EOpLogicalAnd:
|
||||
case EOpLogicalOr:
|
||||
case EOpLogicalXor:
|
||||
|
||||
case EOpLogicalNot:
|
||||
case EOpFunctionCall:
|
||||
case EOpReturn:
|
||||
case EOpAssign:
|
||||
@ -782,7 +788,6 @@ TIntermediate::addConversion(TOperator op, TIntermTyped* node0, TIntermTyped* no
|
||||
case EOpMatrixTimesScalarAssign:
|
||||
case EOpDivAssign:
|
||||
case EOpModAssign:
|
||||
|
||||
case EOpAtan:
|
||||
case EOpClamp:
|
||||
case EOpCross:
|
||||
@ -803,10 +808,10 @@ TIntermediate::addConversion(TOperator op, TIntermTyped* node0, TIntermTyped* no
|
||||
case EOpRefract:
|
||||
case EOpSmoothStep:
|
||||
case EOpStep:
|
||||
|
||||
case EOpSequence:
|
||||
case EOpConstructStruct:
|
||||
|
||||
case EOpSequence: // used by ?:
|
||||
|
||||
if (type0 == type1)
|
||||
return std::make_tuple(node0, node1);
|
||||
|
||||
@ -816,6 +821,15 @@ TIntermediate::addConversion(TOperator op, TIntermTyped* node0, TIntermTyped* no
|
||||
|
||||
break;
|
||||
|
||||
case EOpLogicalAnd:
|
||||
case EOpLogicalOr:
|
||||
case EOpLogicalXor:
|
||||
if (source == EShSourceHlsl)
|
||||
promoteTo = std::make_tuple(EbtBool, EbtBool);
|
||||
else
|
||||
return std::make_tuple(node0, node1);
|
||||
break;
|
||||
|
||||
// Shifts can have mixed types as long as they are integer and of the same rank,
|
||||
// without converting.
|
||||
// It's the left operand's type that determines the resulting type, so no issue
|
||||
@ -824,6 +838,8 @@ TIntermediate::addConversion(TOperator op, TIntermTyped* node0, TIntermTyped* no
|
||||
case EOpRightShift:
|
||||
case EOpLeftShiftAssign:
|
||||
case EOpRightShiftAssign:
|
||||
if (node0->getType() == node1->getType())
|
||||
return std::make_tuple(node0, node1);
|
||||
|
||||
if (isTypeInt(type0) && isTypeInt(type1)) {
|
||||
if (getTypeRank(type0) == getTypeRank(type1)) {
|
||||
@ -838,6 +854,9 @@ TIntermediate::addConversion(TOperator op, TIntermTyped* node0, TIntermTyped* no
|
||||
break;
|
||||
|
||||
default:
|
||||
if (node0->getType() == node1->getType())
|
||||
return std::make_tuple(node0, node1);
|
||||
|
||||
return std::make_tuple(nullptr, nullptr);
|
||||
}
|
||||
|
||||
@ -872,7 +891,7 @@ TIntermediate::addConversion(TOperator op, TIntermTyped* node0, TIntermTyped* no
|
||||
// node passed in if no conversion was needed.
|
||||
//
|
||||
// Generally, this is focused on basic type conversion, not shape conversion.
|
||||
// See addShapeConversion().
|
||||
// See addShapeConversion() for shape conversions.
|
||||
//
|
||||
// Return nullptr if a conversion can't be done.
|
||||
//
|
||||
@ -2952,7 +2971,7 @@ bool TIntermediate::promoteUnary(TIntermUnary& node)
|
||||
// Convert operand to a boolean type
|
||||
if (operand->getBasicType() != EbtBool) {
|
||||
// Add constructor to boolean type. If that fails, we can't do it, so return false.
|
||||
TIntermTyped* converted = convertToBasicType(op, EbtBool, operand);
|
||||
TIntermTyped* converted = addConversion(op, TType(EbtBool), operand);
|
||||
if (converted == nullptr)
|
||||
return false;
|
||||
|
||||
@ -2997,24 +3016,6 @@ void TIntermUnary::updatePrecision()
|
||||
}
|
||||
}
|
||||
|
||||
// If it is not already, convert this node to the given basic type.
|
||||
TIntermTyped* TIntermediate::convertToBasicType(TOperator op, TBasicType basicType, TIntermTyped* node) const
|
||||
{
|
||||
if (node == nullptr)
|
||||
return nullptr;
|
||||
|
||||
// It's already this basic type: nothing needs to be done, so use the node directly.
|
||||
if (node->getBasicType() == basicType)
|
||||
return node;
|
||||
|
||||
const TType& type = node->getType();
|
||||
const TType newType(basicType, type.getQualifier().storage,
|
||||
type.getVectorSize(), type.getMatrixCols(), type.getMatrixRows(), type.isVector());
|
||||
|
||||
// Add constructor to the right vectorness of the right type. If that fails, we can't do it, so return nullptr.
|
||||
return addConversion(op, newType, node);
|
||||
}
|
||||
|
||||
//
|
||||
// See TIntermediate::promote
|
||||
//
|
||||
@ -3139,21 +3140,17 @@ bool TIntermediate::promoteBinary(TIntermBinary& node)
|
||||
case EOpLogicalAnd:
|
||||
case EOpLogicalOr:
|
||||
case EOpLogicalXor:
|
||||
if (getSource() == EShSourceHlsl) {
|
||||
TIntermTyped* convertedL = convertToBasicType(op, EbtBool, left);
|
||||
TIntermTyped* convertedR = convertToBasicType(op, EbtBool, right);
|
||||
if (convertedL == nullptr || convertedR == nullptr)
|
||||
// logical ops operate only on Booleans or vectors of Booleans.
|
||||
if (left->getBasicType() != EbtBool || left->isMatrix())
|
||||
return false;
|
||||
node.setLeft(left = convertedL); // also updates stack variable
|
||||
node.setRight(right = convertedR); // also updates stack variable
|
||||
} else {
|
||||
|
||||
if (getSource() == EShSourceGlsl) {
|
||||
// logical ops operate only on scalar Booleans and will promote to scalar Boolean.
|
||||
if (left->getBasicType() != EbtBool || left->isVector() || left->isMatrix())
|
||||
if (left->isVector())
|
||||
return false;
|
||||
}
|
||||
|
||||
node.setType(TType(EbtBool, EvqTemporary, left->getVectorSize()));
|
||||
|
||||
break;
|
||||
|
||||
case EOpRightShift:
|
||||
|
||||
@ -459,9 +459,6 @@ public:
|
||||
TIntermUnary* addUnaryNode(TOperator op, TIntermTyped* child, TSourceLoc) const;
|
||||
TIntermUnary* addUnaryNode(TOperator op, TIntermTyped* child, TSourceLoc, const TType&) const;
|
||||
|
||||
// Add conversion from node's type to given basic type.
|
||||
TIntermTyped* convertToBasicType(TOperator op, TBasicType basicType, TIntermTyped* node) const;
|
||||
|
||||
// Constant folding (in Constant.cpp)
|
||||
TIntermTyped* fold(TIntermAggregate* aggrNode);
|
||||
TIntermTyped* foldConstructor(TIntermAggregate* aggrNode);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user