commit 74cafab17d9e1c987855faa65c6198099d4a5c2c
author Geoff Lang <geofflang@chromium.org> Fri Jan 23 23:17:32 2015 +0000
committer Geoff Lang <geofflang@chromium.org> Fri Jan 23 23:18:08 2015 +0000
tree 343a5707896e421f3a071c8cb92e9ea6d95b2848
parent c67e6e9fade44ef8938724e82db11db725e9c8e5

Revert "Fix lots of variable shadowing in ANGLE"

Caused WebGL CTS failures on the texture-npot test:
https://www.khronos.org/registry/webgl/sdk/tests/conformance/textures/texture-npot.html

This reverts commit c67e6e9fade44ef8938724e82db11db725e9c8e5.

Change-Id: I089e99859231e0d657084ac3647257c650a9da92
Reviewed-on: https://chromium-review.googlesource.com/243041
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/compiler/translator/Compiler.cpp

diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
index 5eac0c5..d7d98b5 100644
--- a/src/compiler/translator/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -423,25 +423,25 @@
     nameMap.clear();
 }
 
-bool TCompiler::detectCallDepth(TIntermNode* inputRoot, TInfoSink& inputInfoSink, bool limitCallStackDepth)
+bool TCompiler::detectCallDepth(TIntermNode* root, TInfoSink& infoSink, bool limitCallStackDepth)
 {
-    DetectCallDepth detect(inputInfoSink, limitCallStackDepth, maxCallStackDepth);
-    inputRoot->traverse(&detect);
+    DetectCallDepth detect(infoSink, limitCallStackDepth, maxCallStackDepth);
+    root->traverse(&detect);
     switch (detect.detectCallDepth())
     {
       case DetectCallDepth::kErrorNone:
         return true;
       case DetectCallDepth::kErrorMissingMain:
-        inputInfoSink.info.prefix(EPrefixError);
-        inputInfoSink.info << "Missing main()";
+        infoSink.info.prefix(EPrefixError);
+        infoSink.info << "Missing main()";
         return false;
       case DetectCallDepth::kErrorRecursion:
-        inputInfoSink.info.prefix(EPrefixError);
-        inputInfoSink.info << "Function recursion detected";
+        infoSink.info.prefix(EPrefixError);
+        infoSink.info << "Function recursion detected";
         return false;
       case DetectCallDepth::kErrorMaxDepthExceeded:
-        inputInfoSink.info.prefix(EPrefixError);
-        inputInfoSink.info << "Function call stack too deep";
+        infoSink.info.prefix(EPrefixError);
+        infoSink.info << "Function call stack too deep";
         return false;
       default:
         UNREACHABLE();