scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-25 00:58:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed variable shadowing warning.

Browse source
This commit is contained in:
Branimir Karadžić 2015-09-12 15:31:42 -07:00
parent f1a9081d2f
commit 2c3e6867d7
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/renderer_d3d12.cpp
View file

@ -4386,8 +4386,8 @@ data.NumQualityLevels = 0;
{ {
currentBindHash = bindHash; currentBindHash = bindHash;
Bind* bind = bindLru.find(bindHash); Bind* bindCached = bindLru.find(bindHash);
if (NULL == bind) if (NULL == bindCached)
{ {
D3D12_GPU_DESCRIPTOR_HANDLE srvHandle[BGFX_MAX_COMPUTE_BINDINGS] = {}; D3D12_GPU_DESCRIPTOR_HANDLE srvHandle[BGFX_MAX_COMPUTE_BINDINGS] = {};
uint32_t samplerFlags[BGFX_MAX_COMPUTE_BINDINGS] = {}; uint32_t samplerFlags[BGFX_MAX_COMPUTE_BINDINGS] = {};
@ -4458,14 +4458,14 @@ data.NumQualityLevels = 0;
} }
else else
{ {
uint16_t samplerStateIdx = bind->m_samplerStateIdx; uint16_t samplerStateIdx = bindCached->m_samplerStateIdx;
if (samplerStateIdx != currentSamplerStateIdx) if (samplerStateIdx != currentSamplerStateIdx)
{ {
currentSamplerStateIdx = samplerStateIdx; currentSamplerStateIdx = samplerStateIdx;
m_commandList->SetComputeRootDescriptorTable(Rdt::Sampler, m_samplerAllocator.get(samplerStateIdx) ); m_commandList->SetComputeRootDescriptorTable(Rdt::Sampler, m_samplerAllocator.get(samplerStateIdx) );
} }
m_commandList->SetComputeRootDescriptorTable(Rdt::SRV, bind->m_srvHandle); m_commandList->SetComputeRootDescriptorTable(Rdt::SRV, bindCached->m_srvHandle);
m_commandList->SetComputeRootDescriptorTable(Rdt::UAV, bind->m_srvHandle); m_commandList->SetComputeRootDescriptorTable(Rdt::UAV, bindCached->m_srvHandle);
} }
} }
@ -4607,8 +4607,8 @@ data.NumQualityLevels = 0;
{ {
currentBindHash = bindHash; currentBindHash = bindHash;
Bind* bind = bindLru.find(bindHash); Bind* bindCached = bindLru.find(bindHash);
if (NULL == bind) if (NULL == bindCached)
{ {
D3D12_GPU_DESCRIPTOR_HANDLE srvHandle[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS]; D3D12_GPU_DESCRIPTOR_HANDLE srvHandle[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS];
uint32_t samplerFlags[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS]; uint32_t samplerFlags[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS];
@ -4655,13 +4655,13 @@ data.NumQualityLevels = 0;
} }
else else
{ {
uint16_t samplerStateIdx = bind->m_samplerStateIdx; uint16_t samplerStateIdx = bindCached->m_samplerStateIdx;
if (samplerStateIdx != currentSamplerStateIdx) if (samplerStateIdx != currentSamplerStateIdx)
{ {
currentSamplerStateIdx = samplerStateIdx; currentSamplerStateIdx = samplerStateIdx;
m_commandList->SetGraphicsRootDescriptorTable(Rdt::Sampler, m_samplerAllocator.get(samplerStateIdx) ); m_commandList->SetGraphicsRootDescriptorTable(Rdt::Sampler, m_samplerAllocator.get(samplerStateIdx) );
} }
m_commandList->SetGraphicsRootDescriptorTable(Rdt::SRV, bind->m_srvHandle); m_commandList->SetGraphicsRootDescriptorTable(Rdt::SRV, bindCached->m_srvHandle);
} }
} }