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/362550Reviewed-by: Olli Etuaho <oetuaho@nvidia.com> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Fix member variable masking warning in standalone MSVS build
27776e33 · Olli Etuaho · Commit Bot · 72111915 · 27776e33 · 27776e33
Commit 27776e33 authored Jul 22, 2016 by Olli Etuaho Committed by Commit Bot Jul 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Compiler.cpp src/compiler/translator/Compiler.cpp +2 -2

Compiler.h src/compiler/translator/Compiler.h +1 -1

No files found.
--- a/src/compiler/translator/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -364,7 +364,7 @@ TIntermNode *TCompiler::compileTreeImpl(const char *const shaderStrings[],
            }
            if (success && (compileOptions & SH_INIT_OUTPUT_VARIABLES))
            {
-                initializeOutputVariables(root, shaderType);
+                initializeOutputVariables(root);
            }
        }
@@ -818,7 +818,7 @@ void TCompiler::initializeGLPosition(TIntermNode* root)
    InitializeVariables(root, list);
 }
-void TCompiler::initializeOutputVariables(TIntermNode *root, sh::GLenum shaderType)
+void TCompiler::initializeOutputVariables(TIntermNode *root)
 {
    InitVariableList list;
    if (shaderType == GL_VERTEX_SHADER)

--- a/src/compiler/translator/Compiler.h
+++ b/src/compiler/translator/Compiler.h
@@ -132,7 +132,7 @@ class TCompiler : public TShHandleBase
    bool enforcePackingRestrictions();
    // Insert statements to initialize output variables in the beginning of main().
    // This is to avoid undefined behaviors.
-    void initializeOutputVariables(TIntermNode *root, sh::GLenum shaderType);
+    void initializeOutputVariables(TIntermNode *root);
    // Insert gl_Position = vec4(0,0,0,0) to the beginning of main().
    // It is to work around a Linux driver bug where missing this causes compile failure
    // while spec says it is allowed.