mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Front-end: Propagate spec-constness up through aggregate constructors.

Browse Source
This commit is contained in:
John Kessenich 2016-03-21 12:55:00 -06:00
parent 6d2b07dc39
commit ddb65a46f7
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -2210,7 +2210,7 @@ bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, T
int size = 0; int size = 0;
bool constType = true; bool constType = true;
bool specConstType = true; bool specConstType = false; // value is only valid if constType is true
bool full = false; bool full = false;
bool overFull = false; bool overFull = false;
bool matrixInMatrix = false; bool matrixInMatrix = false;
@ -2241,14 +2241,15 @@ bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, T
if (! function[arg].type->getQualifier().isConstant()) if (! function[arg].type->getQualifier().isConstant())
constType = false; constType = false;
if (! function[arg].type->getQualifier().isSpecConstant()) if (function[arg].type->getQualifier().isSpecConstant())
specConstType = false; specConstType = true;
} }
if (constType) { if (constType) {
type.getQualifier().storage = EvqConst;
if (specConstType) if (specConstType)
type.getQualifier().specConstant = true; type.getQualifier().makeSpecConstant();
else
type.getQualifier().storage = EvqConst;
} }
if (type.isArray()) { if (type.isArray()) {
@ -5101,12 +5102,16 @@ TIntermTyped* TParseContext::addConstructor(const TSourceLoc& loc, TIntermNode*
// if the structure constructor contains more than one parameter, then construct // if the structure constructor contains more than one parameter, then construct
// each parameter // each parameter
int paramCount = 0; // keeps a track of the constructor parameter number being checked int paramCount = 0; // keeps track of the constructor parameter number being checked
// 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 specConst = false;
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())
@ -5116,13 +5121,17 @@ 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;
else if (newNode->getType().getQualifier().isSpecConstant())
specConst = true;
} else
return nullptr; return nullptr;
} }
TIntermTyped* constructor = intermediate.setAggregateOperator(aggrNode, op, type, loc); TIntermTyped* constructor = intermediate.setAggregateOperator(aggrNode, op, type, loc);
if (constructor->getType().getQualifier().isConstant() && specConst)
constructor->getWritableType().getQualifier().makeSpecConstant();
return constructor; return constructor;
} }