Skip to content

Fix for #3607 #3631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ravi688 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix for #3607 #3631

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 60 additions & 24 deletions glslang/MachineIndependent/ParseHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8570,12 +8570,21 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
TType tempType(EbtInt, EvqTemporary, type.getVectorSize());
newNode = node;
if (tempType != newNode->getType()) {
TOperator aggregateOp;
if (op == EOpConstructInt8)
aggregateOp = EOpConstructInt;
else
aggregateOp = (TOperator)(EOpConstructIVec2 + op - EOpConstructI8Vec2);
newNode = intermediate.setAggregateOperator(newNode, aggregateOp, tempType, node->getLoc());
// if the source and target size matches then we need to emit OpSConvert instruction
// which would convert 8-bit or 16-bit integer types to 32-bit sized integer type (including vector composites)
if (type.getVectorSize() == node->getType().getVectorSize()) {
newNode = intermediate.addConversion(EbtInt, newNode);
}
// otherwise create aggregate operator
// which internally emits OpCompositeExtract followed by OpCompositeConstruct instruction.
else {
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);
return newNode;
Expand All @@ -8594,12 +8603,21 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
TType tempType(EbtUint, EvqTemporary, type.getVectorSize());
newNode = node;
if (tempType != newNode->getType()) {
TOperator aggregateOp;
if (op == EOpConstructUint8)
aggregateOp = EOpConstructUint;
else
aggregateOp = (TOperator)(EOpConstructUVec2 + op - EOpConstructU8Vec2);
newNode = intermediate.setAggregateOperator(newNode, aggregateOp, tempType, node->getLoc());
// if the source and target size matches then we need to emit OpUConvert instruction
// which would convert 8-bit or 16-bit integer types to 32-bit sized integer type (including vector composites)
if (type.getVectorSize() == node->getType().getVectorSize()) {
newNode = intermediate.addConversion(EbtUint, newNode);
}
// otherwise create aggregate operator
// which internally emits OpCompositeExtract followed by OpCompositeConstruct instruction.
else {
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);
return newNode;
Expand All @@ -8618,12 +8636,21 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
TType tempType(EbtInt, EvqTemporary, type.getVectorSize());
newNode = node;
if (tempType != newNode->getType()) {
TOperator aggregateOp;
if (op == EOpConstructInt16)
aggregateOp = EOpConstructInt;
else
aggregateOp = (TOperator)(EOpConstructIVec2 + op - EOpConstructI16Vec2);
newNode = intermediate.setAggregateOperator(newNode, aggregateOp, tempType, node->getLoc());
// if the source and target size matches then we need to emit OpSConvert instruction
// which would convert 8-bit or 16-bit integer types to 32-bit sized integer type (including vector composites)
if (type.getVectorSize() == node->getType().getVectorSize()) {
newNode = intermediate.addConversion(EbtInt, newNode);
}
// otherwise create aggregate operator
// which internally emits OpCompositeExtract followed by OpCompositeConstruct instruction.
else {
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);
return newNode;
Expand All @@ -8642,12 +8669,21 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
TType tempType(EbtUint, EvqTemporary, type.getVectorSize());
newNode = node;
if (tempType != newNode->getType()) {
TOperator aggregateOp;
if (op == EOpConstructUint16)
aggregateOp = EOpConstructUint;
else
aggregateOp = (TOperator)(EOpConstructUVec2 + op - EOpConstructU16Vec2);
newNode = intermediate.setAggregateOperator(newNode, aggregateOp, tempType, node->getLoc());
// if the source and target size matches then we need to emit OpUConvert instruction
// which would convert 8-bit or 16-bit integer types to 32-bit sized integer type (including vector composites)
if (type.getVectorSize() == node->getType().getVectorSize()) {
newNode = intermediate.addConversion(EbtUint, newNode);
}
// otherwise create aggregate operator
// which internally emits OpCompositeExtract followed by OpCompositeConstruct instruction.
else {
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);
return newNode;
Expand Down