Fixed variable shadowing warnings

Change-Id: I7cf9e09f4003991e44195bedfe58891288541f81 Reviewed-on: https://chromium-review.googlesource.com/249432Reviewed-by: Austin Kinross <aukinros@microsoft.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Fixed variable shadowing warnings
f7b10164 · Cooper Partin · Geoff Lang · d8d58301 · f7b10164
Commit f7b10164 authored Feb 12, 2015 by Cooper Partin Committed by Geoff Lang Feb 17, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

Renderer11.cpp src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +6 -6

No files found.
--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
@@ -604,10 +604,10 @@ gl::Error Renderer11::generateSwizzle(gl::Texture *texture)
        if (texStorage)
        {
            TextureStorage11 *storage11 = TextureStorage11::makeTextureStorage11(texStorage);
-            gl::Error error = storage11->generateSwizzles(texture->getSamplerState().swizzleRed,
+            error = storage11->generateSwizzles(texture->getSamplerState().swizzleRed,
-                                                          texture->getSamplerState().swizzleGreen,
+                                                texture->getSamplerState().swizzleGreen,
-                                                          texture->getSamplerState().swizzleBlue,
+                                                texture->getSamplerState().swizzleBlue,
-                                                          texture->getSamplerState().swizzleAlpha);
+                                                texture->getSamplerState().swizzleAlpha);
            if (error.isError())
            {
                return error;
@@ -643,7 +643,7 @@ gl::Error Renderer11::setSamplerState(gl::SamplerType type, int index, gl::Textu
        if (mForceSetPixelSamplerStates[index] || memcmp(&samplerStateInternal, &mCurPixelSamplerStates[index], sizeof(gl::SamplerState)) != 0)
        {
            ID3D11SamplerState *dxSamplerState = NULL;
-            gl::Error error = mStateCache.getSamplerState(samplerStateInternal, &dxSamplerState);
+            error = mStateCache.getSamplerState(samplerStateInternal, &dxSamplerState);
            if (error.isError())
            {
                return error;
@@ -664,7 +664,7 @@ gl::Error Renderer11::setSamplerState(gl::SamplerType type, int index, gl::Textu
        if (mForceSetVertexSamplerStates[index] || memcmp(&samplerStateInternal, &mCurVertexSamplerStates[index], sizeof(gl::SamplerState)) != 0)
        {
            ID3D11SamplerState *dxSamplerState = NULL;
-            gl::Error error = mStateCache.getSamplerState(samplerStateInternal, &dxSamplerState);
+            error = mStateCache.getSamplerState(samplerStateInternal, &dxSamplerState);
            if (error.isError())
            {
                return error;