Move GLSL ES 1.00-specific symbols to their own symbol level.

src/OpenGL/compiler/Compiler.cpp

@@ -150,13 +150,9 @@ bool TCompiler::compile(const char* const shaderStrings[],
 bool TCompiler::InitBuiltInSymbolTable(const ShBuiltInResources &resources)
 {
     assert(symbolTable.isEmpty());
-    
-    //
-    // Push the symbol table to give it an initial scope.  This
-    // push should not have a corresponding pop, so that built-ins
-    // are preserved, and the test for an empty table fails.
-    //
-    symbolTable.push();
+    symbolTable.push();   // COMMON_BUILTINS
+    symbolTable.push();   // ESSL1_BUILTINS
+    symbolTable.push();   // ESSL3_BUILTINS
 
 	TPublicType integer;
 	integer.type = EbtInt;

src/OpenGL/compiler/SymbolTable.cpp

@@ -188,16 +188,19 @@ TSymbol *TSymbolTable::find(const TString &name, int shaderVersion, bool *builtI
 
     do
     {
-        symbol = table[level]->find(name);
+        while((level == ESSL3_BUILTINS && shaderVersion != 300) ||
+              (level == ESSL1_BUILTINS && shaderVersion != 100))   // Skip version specific levels
+        {
             --level;
         }
-    while(!symbol && level >= 0);
 
-    level++;
+        symbol = table[level]->find(name);
+    }
+    while(!symbol && --level >= 0);   // Doesn't decrement level when a symbol was found
 
     if(builtIn)
     {
-        *builtIn = (level == 0);
+        *builtIn = (level <= LAST_BUILTIN_LEVEL);
     }
 
     if(sameScope)
@@ -210,7 +213,23 @@ TSymbol *TSymbolTable::find(const TString &name, int shaderVersion, bool *builtI
 
 TSymbol *TSymbolTable::findBuiltIn(const TString &name, int shaderVersion) const
 {
-    return table[0]->find(name);
+    for(int level = LAST_BUILTIN_LEVEL; level >= 0; --level)
+    {
+        while((level == ESSL3_BUILTINS && shaderVersion != 300) ||
+              (level == ESSL1_BUILTINS && shaderVersion != 100))   // Skip version specific levels
+        {
+            --level;
+        }
+
+        TSymbol *symbol = table[level]->find(name);
+
+        if(symbol)
+        {
+            return symbol;
+        }
+    }
+
+    return 0;
 }
 
 TSymbol::TSymbol(const TSymbol& copyOf)

src/OpenGL/compiler/SymbolTable.h

@@ -221,10 +221,11 @@ protected:
 
 enum ESymbolLevel
 {
-    COMMON_BUILTINS = 0,
-    ESSL1_BUILTINS = 0,
-    LAST_BUILTIN_LEVEL = ESSL1_BUILTINS,
-    GLOBAL_LEVEL = 1
+    COMMON_BUILTINS,
+    ESSL1_BUILTINS,
+    ESSL3_BUILTINS,
+    LAST_BUILTIN_LEVEL = ESSL3_BUILTINS,
+    GLOBAL_LEVEL
 };
 
 class TSymbolTable