| commit | b459fb0491cf0e51023138e8f691eb85a5c36140 | [log] [tgz] |
|---|---|---|
| author | Cooper Partin <coopp@microsoft.com> | Fri Aug 07 16:12:39 2015 -0700 |
| committer | Jamie Madill <jmadill@chromium.org> | Tue Aug 11 17:27:00 2015 +0000 |
| tree | c2c28081c0e269b3756a21bd66541fddc3366d9f | |
| parent | 8168b4bd53a6ccd2d4d87dfe9e4b321b97b1d65c [diff] [blame] |
Fixed compiler warning C4456 'declaration of variable hides previous local declaration'. BUG=angleproject:1119 Change-Id: I99572711ceeae94fb920d197c86e741945d3b60b Reviewed-on: https://chromium-review.googlesource.com/292279 Tested-by: Cooper Partin <coopp@microsoft.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/renderer/gl/VertexArrayGL.cpp b/src/libANGLE/renderer/gl/VertexArrayGL.cpp index f345ab1..a2ca881 100644 --- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp +++ b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
@@ -132,8 +132,8 @@ { ASSERT(attributesNeedStreaming); - gl::Error error = streamAttributes(activeAttribLocations, streamingDataSize, maxAttributeDataSize, - indexRange); + error = streamAttributes(activeAttribLocations, streamingDataSize, maxAttributeDataSize, + indexRange); if (error.isError()) { return error;