Scarfski/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-06-08 03:13:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed bx::uint32_min/max/clamp/cntlz/cnttz/mod to typed equivalents. (#3692)

Browse Source
This commit is contained in:
Branimir Karadžić
2026-04-26 21:19:08 -07:00
committed by GitHub
parent 43fbfaba41
commit 331783cf9a
23 changed files with 117 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/07-callback/callback.cpp
View File

@@ -305,7 +305,7 @@ public:
void* ptr = ::malloc(_size);
bx::debugPrintf("%s(%d): ALLOC %p of %d byte(s)\n", _file, _line, ptr, _size);
++m_numBlocks;
m_maxBlocks = bx::uint32_max(m_maxBlocks, m_numBlocks);
m_maxBlocks = bx::max(m_maxBlocks, m_numBlocks);
return ptr;
}
@@ -321,7 +321,7 @@ public:
if (NULL == _ptr)
{
++m_numBlocks;
m_maxBlocks = bx::uint32_max(m_maxBlocks, m_numBlocks);
m_maxBlocks = bx::max(m_maxBlocks, m_numBlocks);
}
return ptr;

2
examples/08-update/update.cpp
View File

@@ -659,7 +659,7 @@ public:
{
++m_miss;
for (uint32_t ii = 0, num = bx::uint32_min(10, (uint32_t)m_quads.size() ); ii < num; ++ii)
for (uint32_t ii = 0, num = bx::min(10, (uint32_t)m_quads.size() ); ii < num; ++ii)
{
face = m_quads.front();
const Pack2D& rect = face.m_rect;

6
examples/13-stencil/stencil.cpp
View File

@@ -133,7 +133,7 @@ void setViewClearMask(uint32_t _viewMask, uint8_t _flags, uint32_t _rgba, float
{
for (uint32_t view = 0, viewMask = _viewMask; 0 != viewMask; viewMask >>= 1, view += 1 )
{
const uint32_t ntz = bx::uint32_cnttz(viewMask);
const uint32_t ntz = bx::countTrailingZeros<uint32_t>(viewMask);
viewMask >>= ntz;
view += ntz;
@@ -145,7 +145,7 @@ void setViewTransformMask(uint32_t _viewMask, const void* _view, const void* _pr
{
for (uint32_t view = 0, viewMask = _viewMask; 0 != viewMask; viewMask >>= 1, view += 1 )
{
const uint32_t ntz = bx::uint32_cnttz(viewMask);
const uint32_t ntz = bx::countTrailingZeros<uint32_t>(viewMask);
viewMask >>= ntz;
view += ntz;
@@ -157,7 +157,7 @@ void setViewRectMask(uint32_t _viewMask, uint16_t _x, uint16_t _y, uint16_t _wid
{
for (uint32_t view = 0, viewMask = _viewMask; 0 != viewMask; viewMask >>= 1, view += 1 )
{
const uint32_t ntz = bx::uint32_cnttz(viewMask);
const uint32_t ntz = bx::countTrailingZeros<uint32_t>(viewMask);
viewMask >>= ntz;
view += ntz;

6
examples/14-shadowvolumes/shadowvolumes.cpp
View File

@@ -93,7 +93,7 @@ void setViewClearMask(uint32_t _viewMask, uint8_t _flags, uint32_t _rgba, float
{
for (uint32_t view = 0, viewMask = _viewMask; 0 != viewMask; viewMask >>= 1, view += 1 )
{
const uint32_t ntz = bx::uint32_cnttz(viewMask);
const uint32_t ntz = bx::countTrailingZeros<uint32_t>(viewMask);
viewMask >>= ntz;
view += ntz;
@@ -105,7 +105,7 @@ void setViewTransformMask(uint32_t _viewMask, const void* _view, const void* _pr
{
for (uint32_t view = 0, viewMask = _viewMask; 0 != viewMask; viewMask >>= 1, view += 1 )
{
const uint32_t ntz = bx::uint32_cnttz(viewMask);
const uint32_t ntz = bx::countTrailingZeros<uint32_t>(viewMask);
viewMask >>= ntz;
view += ntz;
@@ -117,7 +117,7 @@ void setViewRectMask(uint32_t _viewMask, uint16_t _x, uint16_t _y, uint16_t _wid
{
for (uint32_t view = 0, viewMask = _viewMask; 0 != viewMask; viewMask >>= 1, view += 1 )
{
const uint32_t ntz = bx::uint32_cnttz(viewMask);
const uint32_t ntz = bx::countTrailingZeros<uint32_t>(viewMask);
viewMask >>= ntz;
view += ntz;

4
examples/17-drawstress/drawstress.cpp
View File

@@ -312,11 +312,11 @@ public:
{
if (m_deltaTimeAvgNs < highwm)
{
m_dim = bx::uint32_min(m_dim + 2, m_maxDim);
m_dim = bx::min(m_dim + 2, m_maxDim);
}
else if (m_deltaTimeAvgNs > lowwm)
{
m_dim = bx::uint32_max(m_dim - 1, 2);
m_dim = bx::max(m_dim - 1, 2);
}
}

2
examples/common/debugdraw/debugdraw.cpp
View File

@@ -290,7 +290,7 @@ uint32_t genSphere(uint8_t _subdiv0, void* _pos0 = NULL, uint16_t _posStride0 =
} gen(_pos0, _posStride0, _normals0, _normalStride0, _subdiv0);
}
uint32_t numVertices = 20*3*bx::uint32_max(1, (uint32_t)bx::pow(4.0f, _subdiv0) );
uint32_t numVertices = 20*3*bx::max(1, (uint32_t)bx::pow(4.0f, _subdiv0) );
return numVertices;
}

6
examples/common/entry/entry_windows.cpp
View File

@@ -678,7 +678,7 @@ namespace entry
case WMSZ_RIGHT:
{
float aspectRatio = 1.0f/m_aspectRatio;
width = bx::uint32_max(ENTRY_DEFAULT_WIDTH/4, width);
width = bx::max(ENTRY_DEFAULT_WIDTH/4, width);
height = uint32_t(float(width)*aspectRatio);
}
break;
@@ -686,7 +686,7 @@ namespace entry
default:
{
float aspectRatio = m_aspectRatio;
height = bx::uint32_max(ENTRY_DEFAULT_HEIGHT/4, height);
height = bx::max(ENTRY_DEFAULT_HEIGHT/4, height);
width = uint32_t(float(height)*aspectRatio);
}
break;
@@ -990,7 +990,7 @@ namespace entry
if (!_windowFrame)
{
float aspectRatio = 1.0f/m_aspectRatio;
width = bx::uint32_max(ENTRY_DEFAULT_WIDTH/4, width);
width = bx::max(ENTRY_DEFAULT_WIDTH/4, width);
height = uint32_t(float(width)*aspectRatio);
left = newrect.left+(newrect.right -newrect.left-width)/2;

2
examples/common/nanovg/nanovg_bgfx.cpp
View File

@@ -726,7 +726,7 @@ namespace
static uint64_t glnvg_convertBlendFuncFactor(int factor)
{
const uint32_t numtz = bx::uint32_cnttz(factor);
const uint32_t idx = bx::uint32_min(numtz, BX_COUNTOF(s_blend)-1);
const uint32_t idx = bx::min(numtz, BX_COUNTOF(s_blend)-1);
return s_blend[idx];
}

2
examples/common/ps/particle_system.cpp
View File

@@ -537,7 +537,7 @@ namespace ps
const uint32_t numVertices = bgfx::getAvailTransientVertexBuffer(m_num*4, PosColorTexCoord0Vertex::ms_layout);
const uint32_t numIndices = bgfx::getAvailTransientIndexBuffer(m_num*6);
const uint32_t max = bx::uint32_min(numVertices/4, numIndices/6);
const uint32_t max = bx::min(numVertices/4, numIndices/6);
BX_WARN(m_num == max
, "Truncating transient buffer for particles to maximum available (requested %d, available %d)."
, m_num