commit 1c8480963a2373ee44f01417fc0820a31204df3e
author shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:02:34 2013 +0000
committer shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:02:34 2013 +0000
tree 924d9094a54edac2cfd7fa152d95050573e4bc94
parent 2ac0be9df9be957eb8fe504a88fa2e10c8ae9dc9

Insert GLSL ES 1.0 built-in variables at the right level.

TRAC #22954
Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2271 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/compiler/SymbolTable.h

diff --git a/src/compiler/SymbolTable.h b/src/compiler/SymbolTable.h
index 41f43f5..c429ab2 100644
--- a/src/compiler/SymbolTable.h
+++ b/src/compiler/SymbolTable.h
@@ -284,10 +284,15 @@
         precisionStack.pop_back();
     }
 
-    bool insert(TSymbol& symbol)
+    bool declare(TSymbol& symbol)
+    {
+        return insert(currentLevel(), symbol);
+    }
+
+    bool insert(ESymbolLevel level, TSymbol& symbol)
     {
         symbol.setUniqueId(++uniqueId);
-        return table[currentLevel()]->insert(symbol);
+        return table[level]->insert(symbol);
     }
 
     TSymbol *find(const TString &name, bool *builtIn = false, bool *sameScope = false) 
@@ -364,7 +369,7 @@
     }
 
 protected:
-    int currentLevel() const { return static_cast<int>(table.size()) - 1; }
+    ESymbolLevel currentLevel() const { return static_cast<ESymbolLevel>(table.size() - 1); }
 
     std::vector<TSymbolTableLevel*> table;
     typedef std::map< TBasicType, TPrecision > PrecisionStackLevel;