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/libANGLE/renderer/d3d/VertexDataManager.cpp

diff --git a/src/libANGLE/renderer/d3d/VertexDataManager.cpp b/src/libANGLE/renderer/d3d/VertexDataManager.cpp
index eade346..d0848ce 100644
--- a/src/libANGLE/renderer/d3d/VertexDataManager.cpp
+++ b/src/libANGLE/renderer/d3d/VertexDataManager.cpp
@@ -305,8 +305,8 @@
             int totalCount = ElementsInBuffer(attrib, storage->getSize());
             int startIndex = attrib.offset / ComputeVertexAttributeStride(attrib);
 
-            error = staticBuffer->storeVertexAttributes(attrib, currentValue, -startIndex, totalCount,
-                                                        0, &streamOffset);
+            gl::Error error = staticBuffer->storeVertexAttributes(attrib, currentValue, -startIndex, totalCount,
+                                                                  0, &streamOffset);
             if (error.isError())
             {
                 return error;