Move promote methods to TIntermediate class

A need arose to use capabilities from TIntermediate during node promotion. These methods have been moved from virtual methods on the TIntermUnary and TIntermBinary nodes to methods on TIntermediate, so it is easy for them construct new nodes and so on. This is done as a separate commit to verify that no test results are changed as a result.

Move promote methods to TIntermediate class
6cb1637f · steve-lunarg · e5921f13 · 6cb1637f · 6cb1637f · 6cb1637f
Commit 6cb1637f authored Oct 19, 2016 by steve-lunarg
Showing with 74 additions and 51 deletions

intermediate.h glslang/Include/intermediate.h +1 -3

Intermediate.cpp glslang/MachineIndependent/Intermediate.cpp +70 -48

localintermediate.h glslang/MachineIndependent/localintermediate.h +3 -0

No files found.
--- a/glslang/Include/intermediate.h
+++ b/glslang/Include/intermediate.h
@@ -847,7 +847,7 @@ public:
    virtual       TIntermOperator* getAsOperator()       { return this; }
    virtual const TIntermOperator* getAsOperator() const { return this; }
    TOperator getOp() const { return op; }
-    virtual bool promote(TIntermediate&) { return true; }
+    void setOp(TOperator newOp) { op = newOp; }
    bool modifiesState() const;
    bool isConstructor() const;
    bool isTexture()  const { return op > EOpTextureGuardBegin  && op < EOpTextureGuardEnd; }
@@ -1026,7 +1026,6 @@ public:
    virtual TIntermTyped* getRight() const { return right; }
    virtual       TIntermBinary* getAsBinaryNode()       { return this; }
    virtual const TIntermBinary* getAsBinaryNode() const { return this; }
-    virtual bool promote(TIntermediate&);
    virtual void updatePrecision();
 protected:
    TIntermTyped* left;
@@ -1046,7 +1045,6 @@ public:
    virtual const TIntermTyped* getOperand() const { return operand; }
    virtual       TIntermUnary* getAsUnaryNode()       { return this; }
    virtual const TIntermUnary* getAsUnaryNode() const { return this; }
-    virtual bool promote(TIntermediate&);
    virtual void updatePrecision();
 protected:
    TIntermTyped* operand;

--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
--- a/glslang/MachineIndependent/localintermediate.h
+++ b/glslang/MachineIndependent/localintermediate.h
@@ -393,6 +393,9 @@ protected:
    bool userOutputUsed() const;
    static int getBaseAlignmentScalar(const TType&, int& size);
    bool isSpecializationOperation(const TIntermOperator&) const;
+    bool promote(TIntermOperator*);
+    bool promoteUnary(TIntermUnary&);
+    bool promoteBinary(TIntermBinary&);
    
    const EShLanguage language;  // stage, known at construction time
    EShSource source;            // source language, known a bit later