Replace EvqInternal with a separate flag to make it more flexible

src/compiler/translator/BaseTypes.h

@@ -286,7 +286,6 @@ enum TQualifier
 {
     EvqTemporary,     // For temporaries (within a function), read/write
     EvqGlobal,        // For globals read/write
-    EvqInternal,      // For internal use, not visible to the user
     EvqConst,         // User defined constants and non-output parameters in functions
     EvqAttribute,     // Readonly
     EvqVaryingIn,     // readonly, fragment shaders only

src/compiler/translator/IntermNode.h

@@ -212,7 +212,8 @@ class TIntermSymbol : public TIntermTyped
     // per compile it is essential to use "symbol = sym" to assign to symbol
     TIntermSymbol(int id, const TString &symbol, const TType &type)
         : TIntermTyped(type),
-          mId(id)
+          mId(id),
+          mInternal(false)
     {
         mSymbol = symbol;
     }
@@ -224,12 +225,16 @@ class TIntermSymbol : public TIntermTyped
 
     void setId(int newId) { mId = newId; }
 
+    bool isInternal() const { return mInternal; }
+    void setInternal(bool isInternal) { mInternal = isInternal; }
+
     virtual void traverse(TIntermTraverser *);
     virtual TIntermSymbol *getAsSymbolNode() { return this; }
     virtual bool replaceChildNode(TIntermNode *, TIntermNode *) { return false; }
 
   protected:
     int mId;
+    bool mInternal;
     TString mSymbol;
 };
 

src/compiler/translator/OutputHLSL.cpp

@@ -1389,7 +1389,7 @@ void OutputHLSL::visitSymbol(TIntermSymbol *node)
             mUsesFragDepth = true;
             out << "gl_Depth";
         }
-        else if (qualifier == EvqInternal)
+        else if (node->isInternal())
         {
             out << name;
         }

src/compiler/translator/RewriteElseBlocks.cpp

@@ -34,8 +34,10 @@ class ElseBlockRewriter : public TIntermTraverser
 
 TIntermSymbol *MakeNewTemporary(const TString &name, TBasicType type)
 {
-    TType variableType(type, EbpHigh, EvqInternal);
-    return new TIntermSymbol(-1, name, variableType);
+    TType variableType(type, EbpHigh, EvqTemporary);
+    TIntermSymbol *node = new TIntermSymbol(-1, name, variableType);
+    node->setInternal(true);
+    return node;
 }
 
 TIntermBinary *MakeNewBinary(TOperator op, TIntermTyped *left, TIntermTyped *right, const TType &resultType)