Commit 5d64cafa by Geoff Lang

Fix multiple variables named i in the same scope.

Change-Id: I575e1d80d103f554892feb6369e9b76c199bf20a Reviewed-on: https://chromium-review.googlesource.com/185881Reviewed-by: 's avatarNicolas Capens <nicolascapens@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent fc01454b
...@@ -142,11 +142,11 @@ GLenum InputLayoutCache::applyVertexBuffers(TranslatedAttribute attributes[gl::M ...@@ -142,11 +142,11 @@ GLenum InputLayoutCache::applyVertexBuffers(TranslatedAttribute attributes[gl::M
ID3D11InputLayout *inputLayout = NULL; ID3D11InputLayout *inputLayout = NULL;
InputLayoutMap::iterator i = mInputLayoutMap.find(ilKey); InputLayoutMap::iterator keyIter = mInputLayoutMap.find(ilKey);
if (i != mInputLayoutMap.end()) if (keyIter != mInputLayoutMap.end())
{ {
inputLayout = i->second.inputLayout; inputLayout = keyIter->second.inputLayout;
i->second.lastUsedTime = mCounter++; keyIter->second.lastUsedTime = mCounter++;
} }
else else
{ {
......
...@@ -115,10 +115,10 @@ ID3D11BlendState *RenderStateCache::getBlendState(const gl::Framebuffer *framebu ...@@ -115,10 +115,10 @@ ID3D11BlendState *RenderStateCache::getBlendState(const gl::Framebuffer *framebu
} }
} }
BlendStateMap::iterator i = mBlendStateCache.find(key); BlendStateMap::iterator keyIter = mBlendStateCache.find(key);
if (i != mBlendStateCache.end()) if (keyIter != mBlendStateCache.end())
{ {
BlendStateCounterPair &state = i->second; BlendStateCounterPair &state = keyIter->second;
state.second = mCounter++; state.second = mCounter++;
return state.first; return state.first;
} }
...@@ -210,10 +210,10 @@ ID3D11RasterizerState *RenderStateCache::getRasterizerState(const gl::Rasterizer ...@@ -210,10 +210,10 @@ ID3D11RasterizerState *RenderStateCache::getRasterizerState(const gl::Rasterizer
key.scissorEnabled = scissorEnabled; key.scissorEnabled = scissorEnabled;
key.depthSize = depthSize; key.depthSize = depthSize;
RasterizerStateMap::iterator i = mRasterizerStateCache.find(key); RasterizerStateMap::iterator keyIter = mRasterizerStateCache.find(key);
if (i != mRasterizerStateCache.end()) if (keyIter != mRasterizerStateCache.end())
{ {
RasterizerStateCounterPair &state = i->second; RasterizerStateCounterPair &state = keyIter->second;
state.second = mCounter++; state.second = mCounter++;
return state.first; return state.first;
} }
...@@ -292,10 +292,10 @@ ID3D11DepthStencilState *RenderStateCache::getDepthStencilState(const gl::DepthS ...@@ -292,10 +292,10 @@ ID3D11DepthStencilState *RenderStateCache::getDepthStencilState(const gl::DepthS
return NULL; return NULL;
} }
DepthStencilStateMap::iterator i = mDepthStencilStateCache.find(dsState); DepthStencilStateMap::iterator keyIter = mDepthStencilStateCache.find(dsState);
if (i != mDepthStencilStateCache.end()) if (keyIter != mDepthStencilStateCache.end())
{ {
DepthStencilStateCounterPair &state = i->second; DepthStencilStateCounterPair &state = keyIter->second;
state.second = mCounter++; state.second = mCounter++;
return state.first; return state.first;
} }
...@@ -370,10 +370,10 @@ ID3D11SamplerState *RenderStateCache::getSamplerState(const gl::SamplerState &sa ...@@ -370,10 +370,10 @@ ID3D11SamplerState *RenderStateCache::getSamplerState(const gl::SamplerState &sa
return NULL; return NULL;
} }
SamplerStateMap::iterator i = mSamplerStateCache.find(samplerState); SamplerStateMap::iterator keyIter = mSamplerStateCache.find(samplerState);
if (i != mSamplerStateCache.end()) if (keyIter != mSamplerStateCache.end())
{ {
SamplerStateCounterPair &state = i->second; SamplerStateCounterPair &state = keyIter->second;
state.second = mCounter++; state.second = mCounter++;
return state.first; return state.first;
} }
......
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