Commit 5c9a29ab by Geoff Lang

Fix redefinition of variables.

Change-Id: I04b0577c8af45fca938d8fb7cf0b9fe2eadafcf2 Reviewed-on: https://chromium-review.googlesource.com/185883Reviewed-by: 's avatarNicolas Capens <nicolascapens@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 2adc256a
...@@ -483,9 +483,9 @@ int Renderer11::generateConfigs(ConfigDesc **configDescList) ...@@ -483,9 +483,9 @@ int Renderer11::generateConfigs(ConfigDesc **configDescList)
if (depthStencilFormat != DXGI_FORMAT_UNKNOWN) if (depthStencilFormat != DXGI_FORMAT_UNKNOWN)
{ {
UINT formatSupport = 0; UINT depthStencilSupport = 0;
result = mDevice->CheckFormatSupport(depthStencilFormat, &formatSupport); result = mDevice->CheckFormatSupport(depthStencilFormat, &depthStencilSupport);
depthStencilFormatOK = SUCCEEDED(result) && (formatSupport & D3D11_FORMAT_SUPPORT_DEPTH_STENCIL); depthStencilFormatOK = SUCCEEDED(result) && (depthStencilSupport & D3D11_FORMAT_SUPPORT_DEPTH_STENCIL);
} }
if (depthStencilFormatOK) if (depthStencilFormatOK)
...@@ -3330,8 +3330,8 @@ bool Renderer11::blitRenderbufferRect(const gl::Rectangle &readRect, const gl::R ...@@ -3330,8 +3330,8 @@ bool Renderer11::blitRenderbufferRect(const gl::Rectangle &readRect, const gl::R
SafeRelease(unresolvedTexture); SafeRelease(unresolvedTexture);
HRESULT result = mDevice->CreateShaderResourceView(readTexture, NULL, &readSRV); HRESULT hresult = mDevice->CreateShaderResourceView(readTexture, NULL, &readSRV);
if (FAILED(result)) if (FAILED(hresult))
{ {
SafeRelease(readTexture); SafeRelease(readTexture);
return gl::error(GL_OUT_OF_MEMORY, false); return gl::error(GL_OUT_OF_MEMORY, false);
......
...@@ -893,9 +893,9 @@ void loadG8R24DataToR24G8(int width, int height, int depth, ...@@ -893,9 +893,9 @@ void loadG8R24DataToR24G8(int width, int height, int depth,
for (int x = 0; x < width; x++) for (int x = 0; x < width; x++)
{ {
unsigned int depth = source[x] >> 8; unsigned int d = source[x] >> 8;
unsigned int stencil = source[x] & 0xFF; unsigned int s = source[x] & 0xFF;
dest[x] = depth | (stencil << 24); dest[x] = d | (s << 24);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment