BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improvement to the AST traversal infrastructure.

Browse source 
Note:  This affects any downstream consumers of glslang's traverser.  Let me know if there are any issues.  Essentially, you will need to change the functions that were pointed to into overriding base-class members instead.  See the examples in this check in.


git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24740 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2014-01-11 19:29:55 +00:00
parent 4f9aebf659
commit a9819921b3
8 changed files with 361 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

39
glslang/MachineIndependent/reflection.cpp
View file

@ -78,6 +78,11 @@ class TLiveTraverser : public TIntermTraverser {
public:
TLiveTraverser(const TIntermediate& i, TReflection& r) : intermediate(i), reflection(r) { }
virtual bool visitAggregate(TVisit, TIntermAggregate* node);
virtual bool visitBinary(TVisit, TIntermBinary* node);
virtual void visitSymbol(TIntermSymbol* base);
virtual bool visitSelection(TVisit, TIntermSelection* node);
// Track live funtions as well as uniforms, so that we don't visit dead functions
// and only visit each function once.
void addFunctionCall(TIntermAggregate* call)
@ -712,34 +717,28 @@ public:
const int TLiveTraverser::baseAlignmentVec4Std140 = 16;
namespace {
//
// Implement the traversal functions of interest.
//
// To catch which function calls are not dead, and hence which functions must be visited.
bool LiveAggregate(bool /* preVisit */, TIntermAggregate* node, TIntermTraverser* it)
bool TLiveTraverser::visitAggregate(TVisit /* visit */, TIntermAggregate* node)
{
TLiveTraverser* oit = static_cast<TLiveTraverser*>(it);
if (node->getOp() == EOpFunctionCall)
oit->addFunctionCall(node);
addFunctionCall(node);
return true; // traverse this subtree
}
// To catch dereferenced aggregates that must be reflected.
// This catches them at the highest level possible in the tree.
bool LiveBinary(bool /* preVisit */, TIntermBinary* node, TIntermTraverser* it)
bool TLiveTraverser::visitBinary(TVisit /* visit */, TIntermBinary* node)
{
TLiveTraverser* oit = static_cast<TLiveTraverser*>(it);
switch (node->getOp()) {
case EOpIndexDirect:
case EOpIndexIndirect:
case EOpIndexDirectStruct:
oit->addDereferencedUniform(node);
addDereferencedUniform(node);
break;
default:
break;
@ -751,34 +750,28 @@ bool LiveBinary(bool /* preVisit */, TIntermBinary* node, TIntermTraverser* it)
}
// To reflect non-dereferenced objects.
void LiveSymbol(TIntermSymbol* base, TIntermTraverser* it)
void TLiveTraverser::visitSymbol(TIntermSymbol* base)
{
TLiveTraverser* oit = static_cast<TLiveTraverser*>(it);
if (base->getQualifier().storage == EvqUniform)
oit->addUniform(*base);
addUniform(*base);
}
// To prune semantically dead paths.
bool LiveSelection(bool /* preVisit */, TIntermSelection* node, TIntermTraverser* it)
bool TLiveTraverser::visitSelection(TVisit /* visit */, TIntermSelection* node)
{
TLiveTraverser* oit = static_cast<TLiveTraverser*>(it);
TIntermConstantUnion* constant = node->getCondition()->getAsConstantUnion();
if (constant) {
// cull the path that is dead
if (constant->getConstArray()[0].getBConst() == true && node->getTrueBlock())
node->getTrueBlock()->traverse(it);
node->getTrueBlock()->traverse(this);
if (constant->getConstArray()[0].getBConst() == false && node->getFalseBlock())
node->getFalseBlock()->traverse(it);
node->getFalseBlock()->traverse(this);
return false; // don't traverse any more, we did it all above
} else
return true; // traverse the whole subtree
}
} // end anonymous namespace
//
// Implement TReflection methods.
//
@ -792,10 +785,6 @@ bool TReflection::addStage(EShLanguage, const TIntermediate& intermediate)
return false;
TLiveTraverser it(intermediate, *this);
it.visitSymbol = LiveSymbol;
it.visitSelection = LiveSelection;
it.visitBinary = LiveBinary;
it.visitAggregate = LiveAggregate;
// put main() on functions to process
it.pushFunction("main(");