commit 27776e33082741b63200dbf18d84f0dc78d99b4b
author Olli Etuaho <oetuaho@nvidia.com> Fri Jul 22 14:00:56 2016 +0300
committer Commit Bot <commit-bot@chromium.org> Fri Jul 22 12:57:54 2016 +0000
tree c0ec642ccaea9ae8c50a07d8ce1eb82a21853d11
parent 72111915635c5e5a4f0954e4ecca457b8f3b068a

Fix member variable masking warning in standalone MSVS build

The patch for initializing output variables introduced a warning that
broke MSVS 2015 standalone build. The "shaderType" variable passed to
TCompiler::initializeOutputVariables was unnecessary and had the same
name as a member variable of TCompiler that stores the shader type.

TEST=MSVS 2015 build

Change-Id: I9e01f5eae77a88babde21d4864a02c8731a220de
Reviewed-on: https://chromium-review.googlesource.com/362550
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/Compiler.cpp

diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
index c790ac1..88e8888 100644
--- a/src/compiler/translator/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -364,7 +364,7 @@
             }
             if (success && (compileOptions & SH_INIT_OUTPUT_VARIABLES))
             {
-                initializeOutputVariables(root, shaderType);
+                initializeOutputVariables(root);
             }
         }
 
@@ -818,7 +818,7 @@
     InitializeVariables(root, list);
 }
 
-void TCompiler::initializeOutputVariables(TIntermNode *root, sh::GLenum shaderType)
+void TCompiler::initializeOutputVariables(TIntermNode *root)
 {
     InitVariableList list;
     if (shaderType == GL_VERTEX_SHADER)