commit 3ae6465f03660f5d93a7ee01715b54948caa8858
author Austin Kinross <aukinros@microsoft.com> Mon Jan 26 15:51:39 2015 -0800
committer Geoff Lang <geofflang@chromium.org> Tue Jan 27 10:43:24 2015 +0000
tree 6e2d537960202bc081fac4ac5eed79c8ae3e285b
parent 1be8870bd29ba8d848f65031104cef3b8c8b3374

Fix lots of variable shadowing in ANGLE

BUG=angle:877

Change-Id: I3df0fffb19f5ecbe439fbc2a8d6d239a5dc6b638
Reviewed-on: https://chromium-review.googlesource.com/243334
Tested-by: Austin Kinross <aukinros@microsoft.com>
Reviewed-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 d0848ce..eade346 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);
 
-            gl::Error error = staticBuffer->storeVertexAttributes(attrib, currentValue, -startIndex, totalCount,
-                                                                  0, &streamOffset);
+            error = staticBuffer->storeVertexAttributes(attrib, currentValue, -startIndex, totalCount,
+                                                        0, &streamOffset);
             if (error.isError())
             {
                 return error;