commit 5c9a29abb49d834262712aa461b8ecbfccf0c842
author Geoff Lang <geofflang@chromium.org> Tue Feb 11 10:26:24 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Mon Feb 24 17:59:20 2014 +0000
tree 2aa7bb9e11f0064eab965a6b5dab8c3a7b65e815
parent 2adc256aa8f150a7a4fb82414fa04148611a7433

Fix redefinition of variables.

Change-Id: I04b0577c8af45fca938d8fb7cf0b9fe2eadafcf2
Reviewed-on: https://chromium-review.googlesource.com/185883
Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/renderer/d3d11/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/d3d11/Renderer11.cpp b/src/libGLESv2/renderer/d3d11/Renderer11.cpp
index be3af98..0c5104c 100644
--- a/src/libGLESv2/renderer/d3d11/Renderer11.cpp
+++ b/src/libGLESv2/renderer/d3d11/Renderer11.cpp
@@ -483,9 +483,9 @@
 
                 if (depthStencilFormat != DXGI_FORMAT_UNKNOWN)
                 {
-                    UINT formatSupport = 0;
-                    result = mDevice->CheckFormatSupport(depthStencilFormat, &formatSupport);
-                    depthStencilFormatOK = SUCCEEDED(result) && (formatSupport & D3D11_FORMAT_SUPPORT_DEPTH_STENCIL);
+                    UINT depthStencilSupport = 0;
+                    result = mDevice->CheckFormatSupport(depthStencilFormat, &depthStencilSupport);
+                    depthStencilFormatOK = SUCCEEDED(result) && (depthStencilSupport & D3D11_FORMAT_SUPPORT_DEPTH_STENCIL);
                 }
 
                 if (depthStencilFormatOK)
@@ -3330,8 +3330,8 @@
 
             SafeRelease(unresolvedTexture);
 
-            HRESULT result = mDevice->CreateShaderResourceView(readTexture, NULL, &readSRV);
-            if (FAILED(result))
+            HRESULT hresult = mDevice->CreateShaderResourceView(readTexture, NULL, &readSRV);
+            if (FAILED(hresult))
             {
                 SafeRelease(readTexture);
                 return gl::error(GL_OUT_OF_MEMORY, false);

src/libGLESv2/renderer/loadimage.cpp

diff --git a/src/libGLESv2/renderer/loadimage.cpp b/src/libGLESv2/renderer/loadimage.cpp
index 2ad8d78..a36ce58 100644
--- a/src/libGLESv2/renderer/loadimage.cpp
+++ b/src/libGLESv2/renderer/loadimage.cpp
@@ -893,9 +893,9 @@
 
             for (int x = 0; x < width; x++)
             {
-                unsigned int depth = source[x] >> 8;
-                unsigned int stencil = source[x] & 0xFF;
-                dest[x] = depth | (stencil << 24);
+                unsigned int d = source[x] >> 8;
+                unsigned int s = source[x] & 0xFF;
+                dest[x] = d | (s << 24);
             }
         }
     }