commit 482907eb1a78845ade6deda101e7c559e70c464f
author Nicolas Capens <capn@chromium.org> Mon Feb 23 16:56:33 2015 -0500
committer Nicolas Capens <capn@chromium.org> Fri Feb 27 12:10:19 2015 +0000
tree 26bf59095992e25383560ad30245f056626b1691
parent 586465264b5d466f34fcac45aea95ae48f3bc27d

Set symbol operations at insertion.

BUG=angle:926

Change-Id: Ifc8f62ebe1277214a4d3fbd5c56eb5faeff8e389
Reviewed-on: https://chromium-review.googlesource.com/251650
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Nicolas Capens <capn@chromium.org>
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/SymbolTable.h

diff --git a/src/compiler/translator/SymbolTable.h b/src/compiler/translator/SymbolTable.h
index 6dc423c..b7b6290 100644
--- a/src/compiler/translator/SymbolTable.h
+++ b/src/compiler/translator/SymbolTable.h
@@ -224,10 +224,6 @@
         return returnType;
     }
 
-    void relateToOperator(TOperator o)
-    {
-        op = o;
-    }
     TOperator getBuiltInOp() const
     {
         return op;
@@ -293,7 +289,6 @@
 
     TSymbol *find(const TString &name) const;
 
-    void relateToOperator(const char *name, TOperator op);
     void relateToExtension(const char *name, const TString &ext);
 
   protected:
@@ -371,10 +366,15 @@
         return insert(level, constant);
     }
 
-    void insertBuiltIn(ESymbolLevel level, TType *rvalue, const char *name,
+    void insertBuiltIn(ESymbolLevel level, TOperator op, TType *rvalue, const char *name,
                        TType *ptype1, TType *ptype2 = 0, TType *ptype3 = 0,
                        TType *ptype4 = 0, TType *ptype5 = 0);
 
+    void insertBuiltIn(ESymbolLevel level, TType *rvalue, const char *name, TType *ptype1, TType *ptype2 = 0, TType *ptype3 = 0, TType *ptype4 = 0, TType *ptype5 = 0)
+    {
+        insertBuiltIn(level, EOpNull, rvalue, name, ptype1, ptype2, ptype3, ptype4, ptype5);
+    }
+
     TSymbol *find(const TString &name, int shaderVersion,
                   bool *builtIn = NULL, bool *sameScope = NULL) const;
     TSymbol *findBuiltIn(const TString &name, int shaderVersion) const;
@@ -385,10 +385,6 @@
         return table[currentLevel() - 1];
     }
 
-    void relateToOperator(ESymbolLevel level, const char *name, TOperator op)
-    {
-        table[level]->relateToOperator(name, op);
-    }
     void relateToExtension(ESymbolLevel level, const char *name, const TString &ext)
     {
         table[level]->relateToExtension(name, ext);