Skip to content

Commit 2efff37

Browse files
bkaradzicbkaradzic
committed
Cleanup.
1 parent efe84f3 commit 2efff37

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎examples/common/entry/input.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ struct InputKeyboard
136136

137137
const uint8_t* popChar()
138138
{
139-
if (0 < m_ring.available() )
139+
if (0 < m_ring.getNumUsed() )
140140
{
141141
uint8_t* utf8 = &m_char[m_ring.m_read];
142142
m_ring.consume(4);

‎src/renderer_d3d11.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5406,7 +5406,7 @@ namespace bgfx { namespace d3d11
54065406

54075407
bool TimerQueryD3D11::update()
54085408
{
5409-
if (0 != m_control.available() )
5409+
if (0 != m_control.getNumUsed() )
54105410
{
54115411
Query& query = m_query[m_control.m_read];
54125412

@@ -5498,7 +5498,7 @@ namespace bgfx { namespace d3d11
54985498
{
54995499
ID3D11DeviceContext* deviceCtx = s_renderD3D11->m_deviceCtx;
55005500

5501-
while (0 != m_control.available() )
5501+
while (0 != m_control.getNumUsed() )
55025502
{
55035503
Query& query = m_query[m_control.m_read];
55045504

@@ -5522,7 +5522,7 @@ namespace bgfx { namespace d3d11
55225522
{
55235523
const uint32_t size = m_control.m_size;
55245524

5525-
for (uint32_t ii = 0, num = m_control.available(); ii < num; ++ii)
5525+
for (uint32_t ii = 0, num = m_control.getNumUsed(); ii < num; ++ii)
55265526
{
55275527
Query& query = m_query[(m_control.m_read + ii) % size];
55285528
if (query.m_handle.idx == _handle.idx)
@@ -6667,7 +6667,7 @@ namespace bgfx { namespace d3d11
66676667
tvm.printf(10, pos++, 0x8b, " DIB size: %7d ", _render->m_iboffset);
66686668

66696669
pos++;
6670-
tvm.printf(10, pos++, 0x8b, " Occlusion queries: %3d ", m_occlusionQuery.m_control.available() );
6670+
tvm.printf(10, pos++, 0x8b, " Occlusion queries: %3d ", m_occlusionQuery.m_control.getNumUsed() );
66716671

66726672
pos++;
66736673
tvm.printf(10, pos++, 0x8b, " State cache: ");

‎src/renderer_d3d12.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4201,7 +4201,7 @@ namespace bgfx { namespace d3d12
42014201

42024202
void CommandQueueD3D12::finish(uint64_t _waitFence, bool _finishAll)
42034203
{
4204-
while (0 < m_control.available() )
4204+
while (0 < m_control.getNumUsed() )
42054205
{
42064206
consume();
42074207

@@ -4212,12 +4212,12 @@ namespace bgfx { namespace d3d12
42124212
}
42134213
}
42144214

4215-
BX_ASSERT(0 == m_control.available(), "");
4215+
BX_ASSERT(0 == m_control.getNumUsed(), "");
42164216
}
42174217

42184218
bool CommandQueueD3D12::tryFinish(uint64_t _waitFence)
42194219
{
4220-
if (0 < m_control.available() )
4220+
if (0 < m_control.getNumUsed() )
42214221
{
42224222
if (consume(0)
42234223
&& _waitFence <= m_completedFence)
@@ -6245,7 +6245,7 @@ namespace bgfx { namespace d3d12
62456245

62466246
bool TimerQueryD3D12::update()
62476247
{
6248-
if (0 != m_control.available() )
6248+
if (0 != m_control.getNumUsed() )
62496249
{
62506250
uint32_t idx = m_control.m_read;
62516251
Query& query = m_query[idx];
@@ -6346,7 +6346,7 @@ namespace bgfx { namespace d3d12
63466346
{
63476347
const uint32_t size = m_control.m_size;
63486348

6349-
for (uint32_t ii = 0, num = m_control.available(); ii < num; ++ii)
6349+
for (uint32_t ii = 0, num = m_control.getNumUsed(); ii < num; ++ii)
63506350
{
63516351
OcclusionQueryHandle& handle = m_handle[(m_control.m_read + ii) % size];
63526352
if (handle.idx == _handle.idx)
@@ -7369,7 +7369,7 @@ namespace bgfx { namespace d3d12
73697369
maxGpuLatency = bx::uint32_imax(maxGpuLatency, result.m_pending-1);
73707370
}
73717371

7372-
maxGpuLatency = bx::uint32_imax(maxGpuLatency, m_gpuTimer.m_control.available()-1);
7372+
maxGpuLatency = bx::uint32_imax(maxGpuLatency, m_gpuTimer.m_control.getNumUsed()-1);
73737373

73747374
const int64_t timerFreq = bx::getHPFrequency();
73757375

@@ -7558,7 +7558,7 @@ namespace bgfx { namespace d3d12
75587558
, m_pipelineStateCache.getCount()
75597559
, m_samplerStateCache.getCount()
75607560
, bindLru.getCount()
7561-
, m_cmd.m_control.available()
7561+
, m_cmd.m_control.getNumUsed()
75627562
);
75637563
pos++;
75647564

‎src/renderer_gl.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3761,7 +3761,7 @@ namespace bgfx { namespace gl
37613761
? m_maxAnisotropyDefault
37623762
: 0.0f
37633763
;
3764-
3764+
37653765
if (m_maxAnisotropy != maxAnisotropy)
37663766
{
37673767
m_maxAnisotropy = maxAnisotropy;
@@ -7366,7 +7366,7 @@ namespace bgfx { namespace gl
73667366

73677367
void OcclusionQueryGL::resolve(Frame* _render, bool _wait)
73687368
{
7369-
while (0 != m_control.available() )
7369+
while (0 != m_control.getNumUsed() )
73707370
{
73717371
Query& query = m_query[m_control.m_read];
73727372

@@ -7396,7 +7396,7 @@ namespace bgfx { namespace gl
73967396
{
73977397
const uint32_t size = m_control.m_size;
73987398

7399-
for (uint32_t ii = 0, num = m_control.available(); ii < num; ++ii)
7399+
for (uint32_t ii = 0, num = m_control.getNumUsed(); ii < num; ++ii)
74007400
{
74017401
Query& query = m_query[(m_control.m_read + ii) % size];
74027402
if (query.m_handle.idx == _handle.idx)

‎src/renderer_gl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1645,7 +1645,7 @@ namespace bgfx { namespace gl
16451645

16461646
bool update()
16471647
{
1648-
if (0 != m_control.available() )
1648+
if (0 != m_control.getNumUsed() )
16491649
{
16501650
Query& query = m_query[m_control.m_read];
16511651

‎src/renderer_mtl.mm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3994,7 +3994,7 @@ static void setTimestamp(void* _data)
39943994

39953995
bool TimerQueryMtl::get()
39963996
{
3997-
if (0 != m_control.available() )
3997+
if (0 != m_control.getNumUsed() )
39983998
{
39993999
uint32_t offset = m_control.m_read;
40004000
m_begin = m_result[offset].m_begin;
@@ -4044,7 +4044,7 @@ static void setTimestamp(void* _data)
40444044
{
40454045
BX_UNUSED(_wait);
40464046

4047-
while (0 != m_control.available() )
4047+
while (0 != m_control.getNumUsed() )
40484048
{
40494049
Query& query = m_query[m_control.m_read];
40504050

@@ -4062,7 +4062,7 @@ static void setTimestamp(void* _data)
40624062
{
40634063
const uint32_t size = m_control.m_size;
40644064

4065-
for (uint32_t ii = 0, num = m_control.available(); ii < num; ++ii)
4065+
for (uint32_t ii = 0, num = m_control.getNumUsed(); ii < num; ++ii)
40664066
{
40674067
Query& query = m_query[(m_control.m_read + ii) % size];
40684068
if (query.m_handle.idx == _handle.idx)
@@ -5280,7 +5280,7 @@ static void setTimestamp(void* _data)
52805280
}
52815281
while (m_gpuTimer.get() );
52825282

5283-
maxGpuLatency = bx::uint32_imax(maxGpuLatency, m_gpuTimer.m_control.available()-1);
5283+
maxGpuLatency = bx::uint32_imax(maxGpuLatency, m_gpuTimer.m_control.getNumUsed()-1);
52845284

52855285
const int64_t timerFreq = bx::getHPFrequency();
52865286

0 commit comments

Comments
 (0)