Skip to content

G
glslang
Commit 1b93de4f by Andreas Flöjt
Options

Fix construction issue for 8 and 16 bit types.

The problem is that constructing a float16_t, int8_t, uint8_t, int16_t, or uint16_t with a non 32-bit argument generates an aggregate with the wrong construction op. For int8_t and uint8_t, this resulted in a crash.
parent f34cdc70
Showing with 40 additions and 10 deletions
glslang/MachineIndependent/ParseHelper.cpp
...@@ -7017,8 +7017,14 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T ...@@ -7017,8 +7017,14 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
if (!intermediate.getArithemeticFloat16Enabled()) { if (!intermediate.getArithemeticFloat16Enabled()) {
TType tempType(EbtFloat, EvqTemporary, type.getVectorSize()); TType tempType(EbtFloat, EvqTemporary, type.getVectorSize());
newNode = node; newNode = node;
if (tempType != newNode->getType()) if (tempType != newNode->getType()) {
newNode = intermediate.setAggregateOperator(newNode, (TOperator)(EOpConstructVec2 + op - EOpConstructF16Vec2), tempType, node->getLoc()); TOperator aggregateOp;
if (op == EOpConstructFloat16)
aggregateOp = EOpConstructFloat;
else
aggregateOp = (TOperator)(EOpConstructVec2 + op - EOpConstructF16Vec2);
newNode = intermediate.setAggregateOperator(newNode, aggregateOp, tempType, node->getLoc());
}
newNode = intermediate.addConversion(EbtFloat16, newNode); newNode = intermediate.addConversion(EbtFloat16, newNode);
return newNode; return newNode;
} }
...@@ -7034,8 +7040,14 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T ...@@ -7034,8 +7040,14 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
if (!intermediate.getArithemeticInt8Enabled()) { if (!intermediate.getArithemeticInt8Enabled()) {
TType tempType(EbtInt, EvqTemporary, type.getVectorSize()); TType tempType(EbtInt, EvqTemporary, type.getVectorSize());
newNode = node; newNode = node;
if (tempType != newNode->getType()) if (tempType != newNode->getType()) {
newNode = intermediate.setAggregateOperator(newNode, (TOperator)(EOpConstructIVec2 + op - EOpConstructI8Vec2), tempType, node->getLoc()); TOperator aggregateOp;
if (op == EOpConstructInt8)
aggregateOp = EOpConstructInt;
else
aggregateOp = (TOperator)(EOpConstructIVec2 + op - EOpConstructI8Vec2);
newNode = intermediate.setAggregateOperator(newNode, aggregateOp, tempType, node->getLoc());
}
newNode = intermediate.addConversion(EbtInt8, newNode); newNode = intermediate.addConversion(EbtInt8, newNode);
return newNode; return newNode;
} }
...@@ -7051,8 +7063,14 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T ...@@ -7051,8 +7063,14 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
if (!intermediate.getArithemeticInt8Enabled()) { if (!intermediate.getArithemeticInt8Enabled()) {
TType tempType(EbtUint, EvqTemporary, type.getVectorSize()); TType tempType(EbtUint, EvqTemporary, type.getVectorSize());
newNode = node; newNode = node;
if (tempType != newNode->getType()) if (tempType != newNode->getType()) {
newNode = intermediate.setAggregateOperator(newNode, (TOperator)(EOpConstructUVec2 + op - EOpConstructU8Vec2), tempType, node->getLoc()); TOperator aggregateOp;
if (op == EOpConstructUint8)
aggregateOp = EOpConstructUint;
else
aggregateOp = (TOperator)(EOpConstructUVec2 + op - EOpConstructU8Vec2);
newNode = intermediate.setAggregateOperator(newNode, aggregateOp, tempType, node->getLoc());
}
newNode = intermediate.addConversion(EbtUint8, newNode); newNode = intermediate.addConversion(EbtUint8, newNode);
return newNode; return newNode;
} }
...@@ -7068,8 +7086,14 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T ...@@ -7068,8 +7086,14 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
if (!intermediate.getArithemeticInt16Enabled()) { if (!intermediate.getArithemeticInt16Enabled()) {
TType tempType(EbtInt, EvqTemporary, type.getVectorSize()); TType tempType(EbtInt, EvqTemporary, type.getVectorSize());
newNode = node; newNode = node;
if (tempType != newNode->getType()) if (tempType != newNode->getType()) {
newNode = intermediate.setAggregateOperator(newNode, (TOperator)(EOpConstructIVec2 + op - EOpConstructI16Vec2), tempType, node->getLoc()); TOperator aggregateOp;
if (op == EOpConstructInt16)
aggregateOp = EOpConstructInt;
else
aggregateOp = (TOperator)(EOpConstructIVec2 + op - EOpConstructI16Vec2);
newNode = intermediate.setAggregateOperator(newNode, aggregateOp, tempType, node->getLoc());
}
newNode = intermediate.addConversion(EbtInt16, newNode); newNode = intermediate.addConversion(EbtInt16, newNode);
return newNode; return newNode;
} }
...@@ -7085,8 +7109,14 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T ...@@ -7085,8 +7109,14 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
if (!intermediate.getArithemeticInt16Enabled()) { if (!intermediate.getArithemeticInt16Enabled()) {
TType tempType(EbtUint, EvqTemporary, type.getVectorSize()); TType tempType(EbtUint, EvqTemporary, type.getVectorSize());
newNode = node; newNode = node;
if (tempType != newNode->getType()) if (tempType != newNode->getType()) {
newNode = intermediate.setAggregateOperator(newNode, (TOperator)(EOpConstructUVec2 + op - EOpConstructU16Vec2), tempType, node->getLoc()); TOperator aggregateOp;
if (op == EOpConstructUint16)
aggregateOp = EOpConstructUint;
else
aggregateOp = (TOperator)(EOpConstructUVec2 + op - EOpConstructU16Vec2);
newNode = intermediate.setAggregateOperator(newNode, aggregateOp, tempType, node->getLoc());
}
newNode = intermediate.addConversion(EbtUint16, newNode); newNode = intermediate.addConversion(EbtUint16, newNode);
return newNode; return newNode;
} }
......
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