Skip to content

A
angle
Commit aebd002d by Jamie Madill
Options

Revert "Make sure type gets set consistently in folded binary operations"

This is blocking the revert of the geometric constant folding patch, which is breaking gpu_unittests and blocking the roll. BUG=angleproject:817 This reverts commit b07aba07. Change-Id: Ia00fc45b1ddd9d3c079742dea0627aa12304f93b Reviewed-on: https://chromium-review.googlesource.com/275321Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent c84e20ee
Showing with 366 additions and 286 deletions
src/compiler/translator/IntermNode.cpp
...@@ -747,385 +747,458 @@ bool TIntermBinary::promote(TInfoSink &infoSink) ...@@ -747,385 +747,458 @@ bool TIntermBinary::promote(TInfoSink &infoSink)
return true; return true;
} }
TIntermTyped *TIntermBinary::fold(TInfoSink &infoSink)
{
TIntermConstantUnion *leftConstant = mLeft->getAsConstantUnion();
TIntermConstantUnion *rightConstant = mRight->getAsConstantUnion();
if (leftConstant == nullptr || rightConstant == nullptr)
{
return nullptr;
}
TConstantUnion *constArray = leftConstant->foldBinary(mOp, rightConstant, infoSink);
if (constArray == nullptr)
{
return nullptr;
}
TIntermTyped *folded = new TIntermConstantUnion(constArray, getType());
folded->getTypePointer()->setQualifier(EvqConst);
folded->setLine(getLine());
return folded;
}
// //
// The fold functions see if an operation on a constant can be done in place, // The fold functions see if an operation on a constant can be done in place,
// without generating run-time code. // without generating run-time code.
// //
// Returns the constant value to keep using or nullptr. // Returns the node to keep using, which may or may not be the node passed in.
// //
TConstantUnion *TIntermConstantUnion::foldBinary(TOperator op, TIntermConstantUnion *rightNode, TInfoSink &infoSink) TIntermTyped *TIntermConstantUnion::fold(
TOperator op, TIntermConstantUnion *rightNode, TInfoSink &infoSink)
{ {
TConstantUnion *leftArray = getUnionArrayPointer(); TConstantUnion *unionArray = getUnionArrayPointer();
TConstantUnion *rightArray = rightNode->getUnionArrayPointer();
if (!leftArray) if (!unionArray)
return nullptr;
if (!rightArray)
return nullptr; return nullptr;
size_t objectSize = getType().getObjectSize(); size_t objectSize = getType().getObjectSize();
// for a case like float f = vec4(2, 3, 4, 5) + 1.2; if (rightNode)
if (rightNode->getType().getObjectSize() == 1 && objectSize > 1)
{
rightArray = Vectorize(*rightNode->getUnionArrayPointer(), objectSize);
}
else if (rightNode->getType().getObjectSize() > 1 && objectSize == 1)
{ {
// for a case like float f = 1.2 + vec4(2, 3, 4, 5); // binary operations
leftArray = Vectorize(*getUnionArrayPointer(), rightNode->getType().getObjectSize()); TConstantUnion *rightUnionArray = rightNode->getUnionArrayPointer();
objectSize = rightNode->getType().getObjectSize(); TType returnType = getType();
}
TConstantUnion *resultArray = nullptr; if (!rightUnionArray)
return nullptr;
switch(op) // for a case like float f = vec4(2, 3, 4, 5) + 1.2;
{ if (rightNode->getType().getObjectSize() == 1 && objectSize > 1)
case EOpAdd: {
resultArray = new TConstantUnion[objectSize]; rightUnionArray = Vectorize(*rightNode->getUnionArrayPointer(), objectSize);
for (size_t i = 0; i < objectSize; i++) returnType = getType();
resultArray[i] = leftArray[i] + rightArray[i]; }
break; else if (rightNode->getType().getObjectSize() > 1 && objectSize == 1)
case EOpSub: {
resultArray = new TConstantUnion[objectSize]; // for a case like float f = 1.2 + vec4(2, 3, 4, 5);
for (size_t i = 0; i < objectSize; i++) unionArray = Vectorize(*getUnionArrayPointer(), rightNode->getType().getObjectSize());
resultArray[i] = leftArray[i] - rightArray[i]; returnType = rightNode->getType();
break; objectSize = rightNode->getType().getObjectSize();
}
case EOpMul: TConstantUnion *tempConstArray = nullptr;
case EOpVectorTimesScalar: TIntermConstantUnion *tempNode;
case EOpMatrixTimesScalar:
resultArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
resultArray[i] = leftArray[i] * rightArray[i];
break;
case EOpMatrixTimesMatrix: bool boolNodeFlag = false;
switch(op)
{ {
if (getType().getBasicType() != EbtFloat || case EOpAdd:
rightNode->getBasicType() != EbtFloat) tempConstArray = new TConstantUnion[objectSize];
{ for (size_t i = 0; i < objectSize; i++)
infoSink.info.message( tempConstArray[i] = unionArray[i] + rightUnionArray[i];
EPrefixInternalError, getLine(), break;
"Constant Folding cannot be done for matrix multiply"); case EOpSub:
return nullptr; tempConstArray = new TConstantUnion[objectSize];
} for (size_t i = 0; i < objectSize; i++)
tempConstArray[i] = unionArray[i] - rightUnionArray[i];
break;
const int leftCols = getCols(); case EOpMul:
const int leftRows = getRows(); case EOpVectorTimesScalar:
const int rightCols = rightNode->getType().getCols(); case EOpMatrixTimesScalar:
const int rightRows = rightNode->getType().getRows(); tempConstArray = new TConstantUnion[objectSize];
const int resultCols = rightCols; for (size_t i = 0; i < objectSize; i++)
const int resultRows = leftRows; tempConstArray[i] = unionArray[i] * rightUnionArray[i];
break;
resultArray = new TConstantUnion[resultCols * resultRows]; case EOpMatrixTimesMatrix:
for (int row = 0; row < resultRows; row++)
{ {
for (int column = 0; column < resultCols; column++) if (getType().getBasicType() != EbtFloat ||
rightNode->getBasicType() != EbtFloat)
{ {
resultArray[resultRows * column + row].setFConst(0.0f); infoSink.info.message(
for (int i = 0; i < leftCols; i++) EPrefixInternalError, getLine(),
"Constant Folding cannot be done for matrix multiply");
return nullptr;
}
const int leftCols = getCols();
const int leftRows = getRows();
const int rightCols = rightNode->getType().getCols();
const int rightRows = rightNode->getType().getRows();
const int resultCols = rightCols;
const int resultRows = leftRows;
tempConstArray = new TConstantUnion[resultCols * resultRows];
for (int row = 0; row < resultRows; row++)
{
for (int column = 0; column < resultCols; column++)
{ {
resultArray[resultRows * column + row].setFConst( tempConstArray[resultRows * column + row].setFConst(0.0f);
resultArray[resultRows * column + row].getFConst() + for (int i = 0; i < leftCols; i++)
leftArray[i * leftRows + row].getFConst() * {
rightArray[column * rightRows + i].getFConst()); tempConstArray[resultRows * column + row].setFConst(
tempConstArray[resultRows * column + row].getFConst() +
unionArray[i * leftRows + row].getFConst() *
rightUnionArray[column * rightRows + i].getFConst());
}
} }
} }
// update return type for matrix product
returnType.setPrimarySize(static_cast<unsigned char>(resultCols));
returnType.setSecondarySize(static_cast<unsigned char>(resultRows));
} }
} break;
break;
case EOpDiv: case EOpDiv:
case EOpIMod: case EOpIMod:
{
resultArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
{ {
switch (getType().getBasicType()) tempConstArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
{ {
case EbtFloat: switch (getType().getBasicType())
if (rightArray[i] == 0.0f)
{
infoSink.info.message(EPrefixWarning, getLine(),
"Divide by zero error during constant folding");
resultArray[i].setFConst(leftArray[i].getFConst() < 0 ? -FLT_MAX : FLT_MAX);
}
else
{ {
ASSERT(op == EOpDiv); case EbtFloat:
resultArray[i].setFConst(leftArray[i].getFConst() / rightArray[i].getFConst()); if (rightUnionArray[i] == 0.0f)
} {
break; infoSink.info.message(
EPrefixWarning, getLine(),
"Divide by zero error during constant folding");
tempConstArray[i].setFConst(
unionArray[i].getFConst() < 0 ? -FLT_MAX : FLT_MAX);
}
else
{
ASSERT(op == EOpDiv);
tempConstArray[i].setFConst(
unionArray[i].getFConst() /
rightUnionArray[i].getFConst());
}
break;
case EbtInt: case EbtInt:
if (rightArray[i] == 0) if (rightUnionArray[i] == 0)
{
infoSink.info.message(EPrefixWarning, getLine(),
"Divide by zero error during constant folding");
resultArray[i].setIConst(INT_MAX);
}
else
{
if (op == EOpDiv)
{ {
resultArray[i].setIConst(leftArray[i].getIConst() / rightArray[i].getIConst()); infoSink.info.message(
EPrefixWarning, getLine(),
"Divide by zero error during constant folding");
tempConstArray[i].setIConst(INT_MAX);
} }
else else
{ {
ASSERT(op == EOpIMod); if (op == EOpDiv)
resultArray[i].setIConst(leftArray[i].getIConst() % rightArray[i].getIConst()); {
tempConstArray[i].setIConst(
unionArray[i].getIConst() /
rightUnionArray[i].getIConst());
}
else
{
ASSERT(op == EOpIMod);
tempConstArray[i].setIConst(
unionArray[i].getIConst() %
rightUnionArray[i].getIConst());
}
} }
} break;
break;
case EbtUInt: case EbtUInt:
if (rightArray[i] == 0) if (rightUnionArray[i] == 0)
{
infoSink.info.message(EPrefixWarning, getLine(),
"Divide by zero error during constant folding");
resultArray[i].setUConst(UINT_MAX);
}
else
{
if (op == EOpDiv)
{ {
resultArray[i].setUConst(leftArray[i].getUConst() / rightArray[i].getUConst()); infoSink.info.message(
EPrefixWarning, getLine(),
"Divide by zero error during constant folding");
tempConstArray[i].setUConst(UINT_MAX);
} }
else else
{ {
ASSERT(op == EOpIMod); if (op == EOpDiv)
resultArray[i].setUConst(leftArray[i].getUConst() % rightArray[i].getUConst()); {
tempConstArray[i].setUConst(
unionArray[i].getUConst() /
rightUnionArray[i].getUConst());
}
else
{
ASSERT(op == EOpIMod);
tempConstArray[i].setUConst(
unionArray[i].getUConst() %
rightUnionArray[i].getUConst());
}
} }
break;
default:
infoSink.info.message(
EPrefixInternalError, getLine(),
"Constant folding cannot be done for \"/\"");
return nullptr;
} }
break; }
}
break;
default: case EOpMatrixTimesVector:
infoSink.info.message(EPrefixInternalError, getLine(), {
"Constant folding cannot be done for \"/\""); if (rightNode->getBasicType() != EbtFloat)
{
infoSink.info.message(
EPrefixInternalError, getLine(),
"Constant Folding cannot be done for matrix times vector");
return nullptr; return nullptr;
} }
const int matrixCols = getCols();
const int matrixRows = getRows();
tempConstArray = new TConstantUnion[matrixRows];
for (int matrixRow = 0; matrixRow < matrixRows; matrixRow++)
{
tempConstArray[matrixRow].setFConst(0.0f);
for (int col = 0; col < matrixCols; col++)
{
tempConstArray[matrixRow].setFConst(
tempConstArray[matrixRow].getFConst() +
unionArray[col * matrixRows + matrixRow].getFConst() *
rightUnionArray[col].getFConst());
}
}
returnType = rightNode->getType();
returnType.setPrimarySize(static_cast<unsigned char>(matrixRows));
tempNode = new TIntermConstantUnion(tempConstArray, returnType);
tempNode->setLine(getLine());
return tempNode;
} }
}
break;
case EOpMatrixTimesVector: case EOpVectorTimesMatrix:
{
if (rightNode->getBasicType() != EbtFloat)
{ {
infoSink.info.message(EPrefixInternalError, getLine(), if (getType().getBasicType() != EbtFloat)
"Constant Folding cannot be done for matrix times vector"); {
return nullptr; infoSink.info.message(
} EPrefixInternalError, getLine(),
"Constant Folding cannot be done for vector times matrix");
return nullptr;
}
const int matrixCols = getCols(); const int matrixCols = rightNode->getType().getCols();
const int matrixRows = getRows(); const int matrixRows = rightNode->getType().getRows();
resultArray = new TConstantUnion[matrixRows]; tempConstArray = new TConstantUnion[matrixCols];
for (int matrixRow = 0; matrixRow < matrixRows; matrixRow++) for (int matrixCol = 0; matrixCol < matrixCols; matrixCol++)
{
resultArray[matrixRow].setFConst(0.0f);
for (int col = 0; col < matrixCols; col++)
{ {
resultArray[matrixRow].setFConst(resultArray[matrixRow].getFConst() + tempConstArray[matrixCol].setFConst(0.0f);
leftArray[col * matrixRows + matrixRow].getFConst() * for (int matrixRow = 0; matrixRow < matrixRows; matrixRow++)
rightArray[col].getFConst()); {
tempConstArray[matrixCol].setFConst(
tempConstArray[matrixCol].getFConst() +
unionArray[matrixRow].getFConst() *
rightUnionArray[matrixCol * matrixRows + matrixRow].getFConst());
}
} }
returnType.setPrimarySize(static_cast<unsigned char>(matrixCols));
} }
} break;
break;
case EOpVectorTimesMatrix: case EOpLogicalAnd:
{ // this code is written for possible future use,
if (getType().getBasicType() != EbtFloat) // will not get executed currently
{ {
infoSink.info.message(EPrefixInternalError, getLine(), tempConstArray = new TConstantUnion[objectSize];
"Constant Folding cannot be done for vector times matrix"); for (size_t i = 0; i < objectSize; i++)
return nullptr; {
tempConstArray[i] = unionArray[i] && rightUnionArray[i];
}
} }
break;
const int matrixCols = rightNode->getType().getCols(); case EOpLogicalOr:
const int matrixRows = rightNode->getType().getRows(); // this code is written for possible future use,
// will not get executed currently
resultArray = new TConstantUnion[matrixCols]; {
tempConstArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
{
tempConstArray[i] = unionArray[i] || rightUnionArray[i];
}
}
break;
for (int matrixCol = 0; matrixCol < matrixCols; matrixCol++) case EOpLogicalXor:
{ {
resultArray[matrixCol].setFConst(0.0f); tempConstArray = new TConstantUnion[objectSize];
for (int matrixRow = 0; matrixRow < matrixRows; matrixRow++) for (size_t i = 0; i < objectSize; i++)
{ {
resultArray[matrixCol].setFConst(resultArray[matrixCol].getFConst() + switch (getType().getBasicType())
leftArray[matrixRow].getFConst() * {
rightArray[matrixCol * matrixRows + matrixRow].getFConst()); case EbtBool:
tempConstArray[i].setBConst(
unionArray[i] == rightUnionArray[i] ? false : true);
break;
default:
UNREACHABLE();
break;
}
} }
} }
} break;
break;
case EOpLogicalAnd: case EOpBitwiseAnd:
{ tempConstArray = new TConstantUnion[objectSize];
resultArray = new TConstantUnion[objectSize]; for (size_t i = 0; i < objectSize; i++)
tempConstArray[i] = unionArray[i] & rightUnionArray[i];
break;
case EOpBitwiseXor:
tempConstArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++) for (size_t i = 0; i < objectSize; i++)
tempConstArray[i] = unionArray[i] ^ rightUnionArray[i];
break;
case EOpBitwiseOr:
tempConstArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
tempConstArray[i] = unionArray[i] | rightUnionArray[i];
break;
case EOpBitShiftLeft:
tempConstArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
tempConstArray[i] = unionArray[i] << rightUnionArray[i];
break;
case EOpBitShiftRight:
tempConstArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
tempConstArray[i] = unionArray[i] >> rightUnionArray[i];
break;
case EOpLessThan:
ASSERT(objectSize == 1);
tempConstArray = new TConstantUnion[1];
tempConstArray->setBConst(*unionArray < *rightUnionArray);
returnType = TType(EbtBool, EbpUndefined, EvqConst);
break;
case EOpGreaterThan:
ASSERT(objectSize == 1);
tempConstArray = new TConstantUnion[1];
tempConstArray->setBConst(*unionArray > *rightUnionArray);
returnType = TType(EbtBool, EbpUndefined, EvqConst);
break;
case EOpLessThanEqual:
{ {
resultArray[i] = leftArray[i] && rightArray[i]; ASSERT(objectSize == 1);
TConstantUnion constant;
constant.setBConst(*unionArray > *rightUnionArray);
tempConstArray = new TConstantUnion[1];
tempConstArray->setBConst(!constant.getBConst());
returnType = TType(EbtBool, EbpUndefined, EvqConst);
break;
} }
}
break;
case EOpLogicalOr: case EOpGreaterThanEqual:
{
resultArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
{ {
resultArray[i] = leftArray[i] || rightArray[i]; ASSERT(objectSize == 1);
TConstantUnion constant;
constant.setBConst(*unionArray < *rightUnionArray);
tempConstArray = new TConstantUnion[1];
tempConstArray->setBConst(!constant.getBConst());
returnType = TType(EbtBool, EbpUndefined, EvqConst);
break;
} }
}
break;
case EOpLogicalXor: case EOpEqual:
{ if (getType().getBasicType() == EbtStruct)
resultArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
{ {
switch (getType().getBasicType()) if (!CompareStructure(rightNode->getType(),
rightNode->getUnionArrayPointer(),
unionArray))
{ {
case EbtBool: boolNodeFlag = true;
resultArray[i].setBConst(leftArray[i] != rightArray[i]); }
break; }
default: else
UNREACHABLE(); {
break; for (size_t i = 0; i < objectSize; i++)
{
if (unionArray[i] != rightUnionArray[i])
{
boolNodeFlag = true;
break; // break out of for loop
}
} }
} }
}
break;
case EOpBitwiseAnd:
resultArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
resultArray[i] = leftArray[i] & rightArray[i];
break;
case EOpBitwiseXor:
resultArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
resultArray[i] = leftArray[i] ^ rightArray[i];
break;
case EOpBitwiseOr:
resultArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
resultArray[i] = leftArray[i] | rightArray[i];
break;
case EOpBitShiftLeft:
resultArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
resultArray[i] = leftArray[i] << rightArray[i];
break;
case EOpBitShiftRight:
resultArray = new TConstantUnion[objectSize];
for (size_t i = 0; i < objectSize; i++)
resultArray[i] = leftArray[i] >> rightArray[i];
break;
case EOpLessThan: tempConstArray = new TConstantUnion[1];
ASSERT(objectSize == 1); if (!boolNodeFlag)
resultArray = new TConstantUnion[1]; {
resultArray->setBConst(*leftArray < *rightArray); tempConstArray->setBConst(true);
break; }
else
{
tempConstArray->setBConst(false);
}
case EOpGreaterThan: tempNode = new TIntermConstantUnion(
ASSERT(objectSize == 1); tempConstArray, TType(EbtBool, EbpUndefined, EvqConst));
resultArray = new TConstantUnion[1]; tempNode->setLine(getLine());
resultArray->setBConst(*leftArray > *rightArray);
break;
case EOpLessThanEqual: return tempNode;
ASSERT(objectSize == 1);
resultArray = new TConstantUnion[1];
resultArray->setBConst(!(*leftArray > *rightArray));
break;
case EOpGreaterThanEqual: case EOpNotEqual:
ASSERT(objectSize == 1);
resultArray = new TConstantUnion[1];
resultArray->setBConst(!(*leftArray < *rightArray));
break;
case EOpEqual:
case EOpNotEqual:
{
resultArray = new TConstantUnion[1];
bool equal = true;
if (getType().getBasicType() == EbtStruct) if (getType().getBasicType() == EbtStruct)
{ {
equal = CompareStructure(getType(), rightArray, leftArray); if (CompareStructure(rightNode->getType(),
rightNode->getUnionArrayPointer(),
unionArray))
{
boolNodeFlag = true;
}
} }
else else
{ {
for (size_t i = 0; i < objectSize; i++) for (size_t i = 0; i < objectSize; i++)
{ {
if (leftArray[i] != rightArray[i]) if (unionArray[i] == rightUnionArray[i])
{ {
equal = false; boolNodeFlag = true;
break; // break out of for loop break; // break out of for loop
} }
} }
} }
if (op == EOpEqual)
tempConstArray = new TConstantUnion[1];
if (!boolNodeFlag)
{ {
resultArray->setBConst(equal); tempConstArray->setBConst(true);
} }
else else
{ {
resultArray->setBConst(!equal); tempConstArray->setBConst(false);
} }
}
break;
default:
infoSink.info.message(
EPrefixInternalError, getLine(),
"Invalid operator for constant folding");
return nullptr;
}
return resultArray;
}
// tempNode = new TIntermConstantUnion(
// The fold functions see if an operation on a constant can be done in place, tempConstArray, TType(EbtBool, EbpUndefined, EvqConst));
// without generating run-time code. tempNode->setLine(getLine());
//
// Returns the node to keep using or nullptr.
//
TIntermTyped *TIntermConstantUnion::foldUnary(TOperator op, TInfoSink &infoSink)
{
TConstantUnion *unionArray = getUnionArrayPointer();
if (!unionArray) return tempNode;
return nullptr;
size_t objectSize = getType().getObjectSize(); default:
infoSink.info.message(
EPrefixInternalError, getLine(),
"Invalid operator for constant folding");
return nullptr;
}
tempNode = new TIntermConstantUnion(tempConstArray, returnType);
tempNode->setLine(getLine());
if (op == EOpAny || op == EOpAll || op == EOpLength) return tempNode;
}
else if (op == EOpAny || op == EOpAll || op == EOpLength)
{ {
// Do operations where the return type is different from the operand type. // Do operations where the return type is different from the operand type.
......
src/compiler/translator/IntermNode.h
...@@ -299,8 +299,7 @@ class TIntermConstantUnion : public TIntermTyped ...@@ -299,8 +299,7 @@ class TIntermConstantUnion : public TIntermTyped
virtual void traverse(TIntermTraverser *); virtual void traverse(TIntermTraverser *);
virtual bool replaceChildNode(TIntermNode *, TIntermNode *) { return false; } virtual bool replaceChildNode(TIntermNode *, TIntermNode *) { return false; }
TConstantUnion *foldBinary(TOperator op, TIntermConstantUnion *rightNode, TInfoSink &infoSink); TIntermTyped *fold(TOperator op, TIntermConstantUnion *rightNode, TInfoSink &infoSink);
TIntermTyped *foldUnary(TOperator op, TInfoSink &infoSink);
static TIntermTyped *FoldAggregateBuiltIn(TOperator op, TIntermAggregate *aggregate, TInfoSink &infoSink); static TIntermTyped *FoldAggregateBuiltIn(TOperator op, TIntermAggregate *aggregate, TInfoSink &infoSink);
...@@ -363,7 +362,6 @@ class TIntermBinary : public TIntermOperator ...@@ -363,7 +362,6 @@ class TIntermBinary : public TIntermOperator
TIntermTyped *getLeft() const { return mLeft; } TIntermTyped *getLeft() const { return mLeft; }
TIntermTyped *getRight() const { return mRight; } TIntermTyped *getRight() const { return mRight; }
bool promote(TInfoSink &); bool promote(TInfoSink &);
TIntermTyped *fold(TInfoSink &infoSink);
void setAddIndexClamp() { mAddIndexClamp = true; } void setAddIndexClamp() { mAddIndexClamp = true; }
bool getAddIndexClamp() { return mAddIndexClamp; } bool getAddIndexClamp() { return mAddIndexClamp; }
......
src/compiler/translator/Intermediate.cpp
...@@ -57,10 +57,19 @@ TIntermTyped *TIntermediate::addBinaryMath( ...@@ -57,10 +57,19 @@ TIntermTyped *TIntermediate::addBinaryMath(
if (!node->promote(mInfoSink)) if (!node->promote(mInfoSink))
return NULL; return NULL;
//
// See if we can fold constants. // See if we can fold constants.
TIntermTyped *foldedNode = node->fold(mInfoSink); //
if (foldedNode) TIntermConstantUnion *leftTempConstant = left->getAsConstantUnion();
return foldedNode; TIntermConstantUnion *rightTempConstant = right->getAsConstantUnion();
if (leftTempConstant && rightTempConstant)
{
TIntermTyped *typedReturnNode =
leftTempConstant->fold(node->getOp(), rightTempConstant, mInfoSink);
if (typedReturnNode)
return typedReturnNode;
}
return node; return node;
} }
...@@ -134,7 +143,7 @@ TIntermTyped *TIntermediate::addUnaryMath( ...@@ -134,7 +143,7 @@ TIntermTyped *TIntermediate::addUnaryMath(
if (childTempConstant) if (childTempConstant)
{ {
TIntermTyped *newChild = childTempConstant->foldUnary(op, mInfoSink); TIntermTyped *newChild = childTempConstant->fold(op, nullptr, mInfoSink);
if (newChild) if (newChild)
return newChild; return newChild;
......
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