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

Front-end: propagate specialization-constness through conversions and swizzles.

Browse Source
This commit is contained in:
John Kessenich 2016-03-20 18:45:23 -06:00
parent a5845766e0
commit 6d2b07dc39
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glslang/Include/Types.h
View File

@ -740,6 +740,7 @@ public:
} }
void makeSpecConstant() void makeSpecConstant()
{ {
storage = EvqConst;
specConstant = true; specConstant = true;
} }
static const char* getLayoutPackingString(TLayoutPacking packing) static const char* getLayoutPackingString(TLayoutPacking packing)

10
glslang/MachineIndependent/Intermediate.cpp
View File

@ -262,6 +262,7 @@ TIntermTyped* TIntermediate::addUnaryMath(TOperator op, TIntermTyped* child, TSo
// //
// For constructors, we are now done, it was all in the conversion. // For constructors, we are now done, it was all in the conversion.
// TODO: but, did this bypass constant folding?
// //
switch (op) { switch (op) {
case EOpConstructInt: case EOpConstructInt:
@ -291,7 +292,7 @@ TIntermTyped* TIntermediate::addUnaryMath(TOperator op, TIntermTyped* child, TSo
if (child->getAsConstantUnion()) if (child->getAsConstantUnion())
return child->getAsConstantUnion()->fold(op, node->getType()); return child->getAsConstantUnion()->fold(op, node->getType());
// If it's a specialiation constant, the result is too. // If it's a specialization constant, the result is too.
if (child->getType().getQualifier().isSpecConstant()) if (child->getType().getQualifier().isSpecConstant())
node->getWritableType().getQualifier().makeSpecConstant(); node->getWritableType().getQualifier().makeSpecConstant();
@ -616,6 +617,12 @@ TIntermTyped* TIntermediate::addConversion(TOperator op, const TType& type, TInt
newNode->setLoc(node->getLoc()); newNode->setLoc(node->getLoc());
newNode->setOperand(node); newNode->setOperand(node);
// TODO: it seems that some unary folding operations should occur here, but are not
// Propagate specialization-constant-ness.
if (node->getType().getQualifier().isSpecConstant())
newNode->getWritableType().getQualifier().makeSpecConstant();
return newNode; return newNode;
} }
@ -883,7 +890,6 @@ TIntermConstantUnion* TIntermediate::addConstantUnion(double d, TBasicType baseT
TIntermTyped* TIntermediate::addSwizzle(TVectorFields& fields, const TSourceLoc& loc) TIntermTyped* TIntermediate::addSwizzle(TVectorFields& fields, const TSourceLoc& loc)
{ {
TIntermAggregate* node = new TIntermAggregate(EOpSequence); TIntermAggregate* node = new TIntermAggregate(EOpSequence);
node->setLoc(loc); node->setLoc(loc);

6
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -820,6 +820,9 @@ TIntermTyped* TParseContext::handleDotDereference(const TSourceLoc& loc, TInterm
return result; return result;
else { else {
TType type(base->getBasicType(), EvqTemporary, fields.num); TType type(base->getBasicType(), EvqTemporary, fields.num);
// Swizzle operations propagate specialization-constantness
if (base->getQualifier().isSpecConstant())
type.getQualifier().makeSpecConstant();
return addConstructor(loc, base, type, mapTypeToConstructorOp(type)); return addConstructor(loc, base, type, mapTypeToConstructorOp(type));
} }
} }
@ -837,6 +840,9 @@ TIntermTyped* TParseContext::handleDotDereference(const TSourceLoc& loc, TInterm
result = intermediate.addIndex(EOpVectorSwizzle, base, index, loc); result = intermediate.addIndex(EOpVectorSwizzle, base, index, loc);
result->setType(TType(base->getBasicType(), EvqTemporary, base->getType().getQualifier().precision, (int) vectorString.size())); result->setType(TType(base->getBasicType(), EvqTemporary, base->getType().getQualifier().precision, (int) vectorString.size()));
} }
// Swizzle operations propagate specialization-constantness
if (base->getType().getQualifier().isSpecConstant())
result->getWritableType().getQualifier().makeSpecConstant();
} }
} else if (base->getBasicType() == EbtStruct || base->getBasicType() == EbtBlock) { } else if (base->getBasicType() == EbtStruct || base->getBasicType() == EbtBlock) {
const TTypeList* fields = base->getType().getStruct(); const TTypeList* fields = base->getType().getStruct();