Eliminate isVariableBuiltIn.

src/compiler/ParseHelper.cpp

@@ -1027,22 +1027,6 @@ const TFunction* TParseContext::findFunction(const TSourceLoc& line, TFunction*
     return static_cast<const TFunction*>(symbol);
 }
 
-bool TParseContext::isVariableBuiltIn(const TVariable* var)
-{
-    // First find by unmangled name to check whether the function name has been
-    // hidden by a variable name or struct typename.
-    const TSymbol* symbol = symbolTable.findBuiltIn(var->getName(), shaderVersion);
-    if (symbol == 0) {
-        symbol = symbolTable.findBuiltIn(var->getMangledName(), shaderVersion);
-    }
-
-    if (symbol == 0) {
-        return false;
-    }
-
-    return symbol->isVariable();
-}
-
 //
 // Initializers show up in several places in the grammar.  Have one set of
 // code to handle them here.

src/compiler/ParseHelper.h

@@ -118,7 +118,6 @@ struct TParseContext {
     bool containsSampler(TType& type);
     bool areAllChildConst(TIntermAggregate* aggrNode);
     const TFunction* findFunction(const TSourceLoc& line, TFunction* pfnCall, int shaderVersion, bool *builtIn = 0);
-    bool isVariableBuiltIn(const TVariable* var);
     bool executeInitializer(const TSourceLoc& line, const TString& identifier, TPublicType& pType,
                             TIntermTyped* initializer, TIntermNode*& intermNode, TVariable* variable = 0);
 

src/compiler/glslang.y

@@ -225,7 +225,7 @@ variable_identifier
             }
             variable = static_cast<const TVariable*>(symbol);
 
-            if (context->isVariableBuiltIn(variable) &&
+            if (context->symbolTable.findBuiltIn(variable->getName(), context->shaderVersion) &&
                 !variable->getExtension().empty() &&
                 context->extensionErrorCheck(@1, variable->getExtension())) {
                 context->recover();

src/compiler/glslang_tab.cpp

@@ -2542,7 +2542,7 @@ yyreduce:
             }
             variable = static_cast<const TVariable*>(symbol);
 
-            if (context->isVariableBuiltIn(variable) &&
+            if (context->symbolTable.findBuiltIn(variable->getName(), context->shaderVersion) &&
                 !variable->getExtension().empty() &&
                 context->extensionErrorCheck((yylsp[(1) - (1)]), variable->getExtension())) {
                 context->recover();