From 12a5bc959b1e2b4e65a95ed0b873e84c8d0138c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sun, 28 Oct 2018 15:16:47 -0700 Subject: [PATCH] Fixed static analysis issues from #1535. --- src/bgfx.cpp | 2 +- src/renderer_d3d12.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bgfx.cpp b/src/bgfx.cpp index 245c35ba4..90b272cff 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -3112,7 +3112,7 @@ namespace bgfx return false; } - if (1 <= _init.limits.maxEncoders + if (1 >= _init.limits.maxEncoders && 128 <= _init.limits.maxEncoders) { BX_TRACE("init.limits.maxEncoders must be between 1 and 128."); diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index 8b3f7ab7a..235e44370 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -1921,8 +1921,8 @@ namespace bgfx { namespace d3d12 m_commandList->SetGraphicsRootConstantBufferView(Rdt::CBV, gpuAddress); TextureD3D12& texture = m_textures[_blitter.m_texture.idx]; - uint32_t samplerFlags[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS] = { uint32_t(texture.m_flags & BGFX_SAMPLER_BITS_MASK) }; - uint16_t samplerStateIdx = getSamplerState(samplerFlags, BGFX_CONFIG_MAX_TEXTURE_SAMPLERS, NULL); + uint32_t samplerFlags[] = { uint32_t(texture.m_flags & BGFX_SAMPLER_BITS_MASK) }; + uint16_t samplerStateIdx = getSamplerState(samplerFlags, BX_COUNTOF(samplerFlags), NULL); m_commandList->SetGraphicsRootDescriptorTable(Rdt::Sampler, m_samplerAllocator.get(samplerStateIdx) ); D3D12_GPU_DESCRIPTOR_HANDLE srvHandle; scratchBuffer.allocSrv(srvHandle, texture);