From d8d6acd94b64e01da3c4d1bc869df2dc2a8eb1ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Mon, 19 Oct 2026 22:40:40 -0700 Subject: [PATCH] Cleanup. (#4069) --- src/bgfx.cpp | 24 ++++++++++++---------- src/bgfx_p.h | 45 ++++++++--------------------------------- src/renderer.h | 4 ++-- src/renderer_d3d11.cpp | 4 ++-- src/renderer_d3d12.cpp | 8 ++++---- src/renderer_gl.cpp | 12 +++++------ src/renderer_mtl.cpp | 8 ++++---- src/renderer_vk.cpp | 8 ++++---- src/renderer_webgpu.cpp | 20 +++++++++--------- 9 files changed, 53 insertions(+), 80 deletions(-) diff --git a/src/bgfx.cpp b/src/bgfx.cpp index 100db3929..b87f31b36 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -1637,9 +1637,9 @@ namespace bgfx if (UINT32_MAX != m_draw.m_streamMask) { uint32_t numVertices = UINT32_MAX; - for (BitMaskToIndexIteratorT it(m_draw.m_streamMask); !it.isDone(); it.next() ) + for (bx::BitMaskToIndexIteratorT it(m_draw.m_streamMask); !it.isDone(); it.next() ) { - numVertices = bx::min(numVertices, m_numVertices[it.idx]); + numVertices = bx::min(numVertices, m_numVertices[it.getIndex()]); } m_draw.m_numVertices = numVertices; @@ -1664,11 +1664,12 @@ namespace bgfx if (0 != (m_dynamicMask & kDynamicStreamMask) ) { numVertices = UINT32_MAX; - for (BitMaskToIndexIteratorT it(m_draw.m_streamMask); !it.isDone(); it.next() ) + for (bx::BitMaskToIndexIteratorT it(m_draw.m_streamMask); !it.isDone(); it.next() ) { - const uint32_t tmp0 = 0 != (m_dynamicMask & (UINT32_C(1)< - struct BitMaskToIndexIteratorT - { - BitMaskToIndexIteratorT(MaskT _mask) - : mask(0) - , idx(0) - { - const uint8_t ntz = bx::countTrailingZeros(_mask); - mask = 0 == _mask ? MaskT(0) : MaskT(_mask >> ntz); - idx = ntz; - } - - void next() - { - mask = MaskT(mask >> 1); - idx += 1; - - const uint8_t ntz = bx::countTrailingZeros(mask); - mask = 0 == mask ? MaskT(0) : MaskT(mask >> ntz); - idx += ntz; - } - - bool isDone() const - { - return 0 == mask; - } - - MaskT mask; - uint8_t idx; - }; - struct ClearQuad { ClearQuad() @@ -2632,9 +2601,9 @@ namespace bgfx murmur.add(_mask); - for (BitMaskToIndexIteratorT it(_mask); !it.isDone(); it.next() ) + for (bx::BitMaskToIndexIteratorT it(_mask); !it.isDone(); it.next() ) { - murmur.add(_bind[it.idx]); + murmur.add(_bind[it.getIndex()]); } return murmur.end(); @@ -2657,9 +2626,11 @@ namespace bgfx return false; } - for (BitMaskToIndexIteratorT it(mask); !it.isDone(); it.next() ) + for (bx::BitMaskToIndexIteratorT it(mask); !it.isDone(); it.next() ) { - if (0 != bx::memCmp(&_lhs[it.idx], &_rhs[it.idx], sizeof(Binding) ) ) + const uint8_t idx = it.getIndex(); + + if (0 != bx::memCmp(&_lhs[idx], &_rhs[idx], sizeof(Binding) ) ) { return false; } @@ -2700,9 +2671,9 @@ namespace bgfx { if (0 != (_flags & BGFX_DISCARD_BINDINGS) ) { - for (BitMaskToIndexIteratorT it(_mask); !it.isDone(); it.next() ) + for (bx::BitMaskToIndexIteratorT it(_mask); !it.isDone(); it.next() ) { - Binding& bind = m_bind[it.idx]; + Binding& bind = m_bind[it.getIndex()]; bind.reset(); } } diff --git a/src/renderer.h b/src/renderer.h index 23a8b27ec..35fca2ffd 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -1005,9 +1005,9 @@ namespace bgfx if (UINT32_MAX != _new.m_streamMask) { - for (BitMaskToIndexIteratorT it(_new.m_streamMask); !it.isDone(); it.next() ) + for (bx::BitMaskToIndexIteratorT it(_new.m_streamMask); !it.isDone(); it.next() ) { - const uint8_t idx = it.idx; + const uint8_t idx = it.getIndex(); if (_current.m_stream[idx].m_handle.idx != _new.m_stream[idx].m_handle.idx || _current.m_stream[idx].m_startVertex != _new.m_stream[idx].m_startVertex diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index 822c66c4e..47f83b272 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -7832,12 +7832,12 @@ namespace bgfx { namespace d3d11 if (UINT32_MAX != draw.m_streamMask) { - for (BitMaskToIndexIteratorT it(draw.m_streamMask) + for (bx::BitMaskToIndexIteratorT it(draw.m_streamMask) ; !it.isDone() ; it.next(), numStreams++ ) { - const uint8_t idx = it.idx; + const uint8_t idx = it.getIndex(); currentState.m_stream[idx].m_layoutHandle = draw.m_stream[idx].m_layoutHandle; currentState.m_stream[idx].m_handle = draw.m_stream[idx].m_handle; diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index 24c46444e..468c480ea 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -5979,12 +5979,12 @@ namespace bgfx { namespace d3d12 if (UINT32_MAX != _draw.m_streamMask) { - for (BitMaskToIndexIteratorT it(_draw.m_streamMask) + for (bx::BitMaskToIndexIteratorT it(_draw.m_streamMask) ; !it.isDone() ; it.next(), numStreams++ ) { - const uint8_t idx = it.idx; + const uint8_t idx = it.getIndex(); const Stream& stream = _draw.m_stream[idx]; uint16_t handle = stream.m_handle.idx; @@ -10441,12 +10441,12 @@ namespace bgfx { namespace d3d12 uint8_t numStreams = 0; if (UINT32_MAX != draw.m_streamMask) { - for (BitMaskToIndexIteratorT it(draw.m_streamMask) + for (bx::BitMaskToIndexIteratorT it(draw.m_streamMask) ; !it.isDone() ; it.next(), numStreams++ ) { - const uint8_t idx = it.idx; + const uint8_t idx = it.getIndex(); currentState.m_stream[idx].m_layoutHandle = draw.m_stream[idx].m_layoutHandle; currentState.m_stream[idx].m_handle = draw.m_stream[idx].m_handle; diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index ee067579c..4068789a3 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -9976,9 +9976,9 @@ namespace bgfx { namespace gl { if (UINT32_MAX != draw.m_streamMask) { - for (BitMaskToIndexIteratorT it(draw.m_streamMask); !it.isDone(); it.next() ) + for (bx::BitMaskToIndexIteratorT it(draw.m_streamMask); !it.isDone(); it.next() ) { - const uint8_t idx = it.idx; + const uint8_t idx = it.getIndex(); if (currentState.m_stream[idx].m_handle.idx != draw.m_stream[idx].m_handle.idx) { @@ -10052,9 +10052,9 @@ namespace bgfx { namespace gl { const uint8_t lastStream = uint8_t(31 - bx::countLeadingZeros(draw.m_streamMask) ); - for (BitMaskToIndexIteratorT it(draw.m_streamMask); !it.isDone(); it.next() ) + for (bx::BitMaskToIndexIteratorT it(draw.m_streamMask); !it.isDone(); it.next() ) { - const uint8_t idx = it.idx; + const uint8_t idx = it.getIndex(); const VertexBufferGL& vb = m_vertexBuffers[draw.m_stream[idx].m_handle.idx]; const uint16_t decl = isValid(draw.m_stream[idx].m_layoutHandle) @@ -10082,9 +10082,9 @@ namespace bgfx { namespace gl if (UINT32_MAX == numVertices) { - for (BitMaskToIndexIteratorT it(draw.m_streamMask); !it.isDone(); it.next() ) + for (bx::BitMaskToIndexIteratorT it(draw.m_streamMask); !it.isDone(); it.next() ) { - const uint8_t idx = it.idx; + const uint8_t idx = it.getIndex(); const VertexBufferGL& vb = m_vertexBuffers[draw.m_stream[idx].m_handle.idx]; uint16_t decl = isValid(draw.m_stream[idx].m_layoutHandle) ? draw.m_stream[idx].m_layoutHandle.idx : vb.m_layoutHandle.idx; diff --git a/src/renderer_mtl.cpp b/src/renderer_mtl.cpp index c4be6ac9b..0c5bf9213 100644 --- a/src/renderer_mtl.cpp +++ b/src/renderer_mtl.cpp @@ -7078,12 +7078,12 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames if (UINT32_MAX != draw.m_streamMask) { - for (BitMaskToIndexIteratorT it(draw.m_streamMask) + for (bx::BitMaskToIndexIteratorT it(draw.m_streamMask) ; !it.isDone() ; it.next(), numStreams++ ) { - const uint8_t idx = it.idx; + const uint8_t idx = it.getIndex(); currentState.m_stream[idx].m_layoutHandle = draw.m_stream[idx].m_layoutHandle; currentState.m_stream[idx].m_handle = draw.m_stream[idx].m_handle; @@ -7295,9 +7295,9 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames if (UINT32_MAX == numVertices) { - for (BitMaskToIndexIteratorT it(currentState.m_streamMask); !it.isDone(); it.next() ) + for (bx::BitMaskToIndexIteratorT it(currentState.m_streamMask); !it.isDone(); it.next() ) { - const uint8_t idx = it.idx; + const uint8_t idx = it.getIndex(); const VertexBufferMtl& vb = m_vertexBuffers[currentState.m_stream[idx].m_handle.idx]; const uint16_t decl = isValid(draw.m_stream[idx].m_layoutHandle) ? draw.m_stream[idx].m_layoutHandle.idx : vb.m_layoutHandle.idx; const VertexLayout& layout = m_vertexLayouts[decl]; diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp index 766da228b..8c3408784 100644 --- a/src/renderer_vk.cpp +++ b/src/renderer_vk.cpp @@ -5599,9 +5599,9 @@ VK_IMPORT_DEVICE { const uint8_t colorMask = uint8_t(~_clear.getColorSkipMask(numMrt) & ( (1<