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/StructureHLSL.cpp

diff --git a/src/compiler/translator/StructureHLSL.cpp b/src/compiler/translator/StructureHLSL.cpp
index 304949b..48929af 100644
--- a/src/compiler/translator/StructureHLSL.cpp
+++ b/src/compiler/translator/StructureHLSL.cpp
@@ -274,9 +274,9 @@
 
     for (unsigned int parameter = 0; parameter < ctorParameters.size(); parameter++)
     {
-        const TType &paramType = ctorParameters[parameter];
+        const TType &type = ctorParameters[parameter];
 
-        constructor += TypeString(paramType) + " x" + str(parameter) + ArrayString(paramType);
+        constructor += TypeString(type) + " x" + str(parameter) + ArrayString(type);
 
         if (parameter < ctorParameters.size() - 1)
         {