Skip to content

Commit 8a6a401

Browse files
bkaradzicbkaradzic
committed
Improved profiler colors.
1 parent c78b573 commit 8a6a401

File tree

4 files changed

+64
-61
lines changed

4 files changed

+64
-61
lines changed

‎src/bgfx.cpp‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,7 +1380,7 @@ namespace bgfx
13801380

13811381
void Frame::sort()
13821382
{
1383-
BGFX_PROFILER_SCOPE("bgfx/Sort", 0xff2040ff);
1383+
BGFX_PROFILER_SCOPE("bgfx/Sort", kColorSubmit);
13841384

13851385
ViewId viewRemap[BGFX_CONFIG_MAX_VIEWS];
13861386
for (uint32_t ii = 0; ii < BGFX_CONFIG_MAX_VIEWS; ++ii)
@@ -2322,7 +2322,7 @@ namespace bgfx
23222322

23232323
uint32_t frameNum = m_submit->m_frameNum;
23242324

2325-
BGFX_PROFILER_SCOPE("bgfx/API thread frame", 0xff2040ff);
2325+
BGFX_PROFILER_SCOPE("bgfx/API thread frame", kColorSubmit);
23262326
// wait for render thread to finish
23272327
renderSemWait();
23282328
frameNoRenderWait();
@@ -2441,35 +2441,35 @@ namespace bgfx
24412441

24422442
RenderFrame::Enum Context::renderFrame(int32_t _msecs)
24432443
{
2444-
BGFX_PROFILER_SCOPE("bgfx::renderFrame", 0xff2040ff);
2444+
BGFX_PROFILER_SCOPE("bgfx::renderFrame", kColorSubmit);
24452445

24462446
#if BX_PLATFORM_OSX || BX_PLATFORM_IOS || BX_PLATFORM_VISIONOS
24472447
NSAutoreleasePoolScope pool;
24482448
#endif // BX_PLATFORM_OSX || BX_PLATFORM_IOS || BX_PLATFORM_VISIONOS
24492449

24502450
if (!m_flipAfterRender)
24512451
{
2452-
BGFX_PROFILER_SCOPE("bgfx/flip", 0xff2040ff);
2452+
BGFX_PROFILER_SCOPE("bgfx/flip", kColorSubmit);
24532453
flip();
24542454
}
24552455

24562456
if (apiSemWait(_msecs) )
24572457
{
24582458
{
2459-
BGFX_PROFILER_SCOPE("bgfx/Exec commands pre", 0xff2040ff);
2459+
BGFX_PROFILER_SCOPE("bgfx/Exec commands pre", kColorResource);
24602460
rendererExecCommands(m_render->m_cmdPre);
24612461
}
24622462

24632463
if (m_rendererInitialized)
24642464
{
24652465
{
2466-
BGFX_PROFILER_SCOPE("bgfx/Render submit", 0xff2040ff);
2466+
BGFX_PROFILER_SCOPE("bgfx/Render submit", kColorSubmit);
24672467
m_renderCtx->submit(m_render, m_clearQuad, m_textVideoMemBlitter);
24682468
m_flipped = false;
24692469
}
24702470

24712471
{
2472-
BGFX_PROFILER_SCOPE("bgfx/Screenshot", 0xff2040ff);
2472+
BGFX_PROFILER_SCOPE("bgfx/Screenshot", kColorResource);
24732473
for (uint8_t ii = 0, num = m_render->m_numScreenShots; ii < num; ++ii)
24742474
{
24752475
const ScreenShot& screenShot = m_render->m_screenShot[ii];
@@ -2479,15 +2479,15 @@ namespace bgfx
24792479
}
24802480

24812481
{
2482-
BGFX_PROFILER_SCOPE("bgfx/Exec commands post", 0xff2040ff);
2482+
BGFX_PROFILER_SCOPE("bgfx/Exec commands post", kColorResource);
24832483
rendererExecCommands(m_render->m_cmdPost);
24842484
}
24852485

24862486
renderSemPost();
24872487

24882488
if (m_flipAfterRender)
24892489
{
2490-
BGFX_PROFILER_SCOPE("bgfx/flip", 0xff2040ff);
2490+
BGFX_PROFILER_SCOPE("bgfx/flip", kColorSubmit);
24912491
flip();
24922492
}
24932493
}
@@ -2543,7 +2543,7 @@ namespace bgfx
25432543

25442544
void Context::flushTextureUpdateBatch(CommandBuffer& _cmdbuf)
25452545
{
2546-
BGFX_PROFILER_SCOPE("flushTextureUpdateBatch", 0xff2040ff);
2546+
BGFX_PROFILER_SCOPE("flushTextureUpdateBatch", kColorResource);
25472547
if (m_textureUpdateBatch.sort() )
25482548
{
25492549
const uint32_t pos = _cmdbuf.m_pos;
@@ -2954,7 +2954,7 @@ namespace bgfx
29542954

29552955
case CommandBuffer::CreateIndexBuffer:
29562956
{
2957-
BGFX_PROFILER_SCOPE("CreateIndexBuffer", 0xff2040ff);
2957+
BGFX_PROFILER_SCOPE("CreateIndexBuffer", kColorResource);
29582958

29592959
IndexBufferHandle handle;
29602960
_cmdbuf.read(handle);
@@ -2973,7 +2973,7 @@ namespace bgfx
29732973

29742974
case CommandBuffer::DestroyIndexBuffer:
29752975
{
2976-
BGFX_PROFILER_SCOPE("DestroyIndexBuffer", 0xff2040ff);
2976+
BGFX_PROFILER_SCOPE("DestroyIndexBuffer", kColorResource);
29772977

29782978
IndexBufferHandle handle;
29792979
_cmdbuf.read(handle);
@@ -2984,7 +2984,7 @@ namespace bgfx
29842984

29852985
case CommandBuffer::CreateVertexLayout:
29862986
{
2987-
BGFX_PROFILER_SCOPE("CreateVertexLayout", 0xff2040ff);
2987+
BGFX_PROFILER_SCOPE("CreateVertexLayout", kColorResource);
29882988

29892989
VertexLayoutHandle handle;
29902990
_cmdbuf.read(handle);
@@ -2998,7 +2998,7 @@ namespace bgfx
29982998

29992999
case CommandBuffer::DestroyVertexLayout:
30003000
{
3001-
BGFX_PROFILER_SCOPE("DestroyVertexLayout", 0xff2040ff);
3001+
BGFX_PROFILER_SCOPE("DestroyVertexLayout", kColorResource);
30023002

30033003
VertexLayoutHandle handle;
30043004
_cmdbuf.read(handle);
@@ -3009,7 +3009,7 @@ namespace bgfx
30093009

30103010
case CommandBuffer::CreateVertexBuffer:
30113011
{
3012-
BGFX_PROFILER_SCOPE("CreateVertexBuffer", 0xff2040ff);
3012+
BGFX_PROFILER_SCOPE("CreateVertexBuffer", kColorResource);
30133013

30143014
VertexBufferHandle handle;
30153015
_cmdbuf.read(handle);
@@ -3031,7 +3031,7 @@ namespace bgfx
30313031

30323032
case CommandBuffer::DestroyVertexBuffer:
30333033
{
3034-
BGFX_PROFILER_SCOPE("DestroyVertexBuffer", 0xff2040ff);
3034+
BGFX_PROFILER_SCOPE("DestroyVertexBuffer", kColorResource);
30353035

30363036
VertexBufferHandle handle;
30373037
_cmdbuf.read(handle);
@@ -3042,7 +3042,7 @@ namespace bgfx
30423042

30433043
case CommandBuffer::CreateDynamicIndexBuffer:
30443044
{
3045-
BGFX_PROFILER_SCOPE("CreateDynamicIndexBuffer", 0xff2040ff);
3045+
BGFX_PROFILER_SCOPE("CreateDynamicIndexBuffer", kColorResource);
30463046

30473047
IndexBufferHandle handle;
30483048
_cmdbuf.read(handle);
@@ -3059,7 +3059,7 @@ namespace bgfx
30593059

30603060
case CommandBuffer::UpdateDynamicIndexBuffer:
30613061
{
3062-
BGFX_PROFILER_SCOPE("UpdateDynamicIndexBuffer", 0xff2040ff);
3062+
BGFX_PROFILER_SCOPE("UpdateDynamicIndexBuffer", kColorResource);
30633063

30643064
IndexBufferHandle handle;
30653065
_cmdbuf.read(handle);
@@ -3081,7 +3081,7 @@ namespace bgfx
30813081

30823082
case CommandBuffer::DestroyDynamicIndexBuffer:
30833083
{
3084-
BGFX_PROFILER_SCOPE("DestroyDynamicIndexBuffer", 0xff2040ff);
3084+
BGFX_PROFILER_SCOPE("DestroyDynamicIndexBuffer", kColorResource);
30853085

30863086
IndexBufferHandle handle;
30873087
_cmdbuf.read(handle);
@@ -3092,7 +3092,7 @@ namespace bgfx
30923092

30933093
case CommandBuffer::CreateDynamicVertexBuffer:
30943094
{
3095-
BGFX_PROFILER_SCOPE("CreateDynamicVertexBuffer", 0xff2040ff);
3095+
BGFX_PROFILER_SCOPE("CreateDynamicVertexBuffer", kColorResource);
30963096

30973097
VertexBufferHandle handle;
30983098
_cmdbuf.read(handle);
@@ -3109,7 +3109,7 @@ namespace bgfx
31093109

31103110
case CommandBuffer::UpdateDynamicVertexBuffer:
31113111
{
3112-
BGFX_PROFILER_SCOPE("UpdateDynamicVertexBuffer", 0xff2040ff);
3112+
BGFX_PROFILER_SCOPE("UpdateDynamicVertexBuffer", kColorResource);
31133113

31143114
VertexBufferHandle handle;
31153115
_cmdbuf.read(handle);
@@ -3131,7 +3131,7 @@ namespace bgfx
31313131

31323132
case CommandBuffer::DestroyDynamicVertexBuffer:
31333133
{
3134-
BGFX_PROFILER_SCOPE("DestroyDynamicVertexBuffer", 0xff2040ff);
3134+
BGFX_PROFILER_SCOPE("DestroyDynamicVertexBuffer", kColorResource);
31353135

31363136
VertexBufferHandle handle;
31373137
_cmdbuf.read(handle);
@@ -3142,7 +3142,7 @@ namespace bgfx
31423142

31433143
case CommandBuffer::CreateShader:
31443144
{
3145-
BGFX_PROFILER_SCOPE("CreateShader", 0xff2040ff);
3145+
BGFX_PROFILER_SCOPE("CreateShader", kColorResource);
31463146

31473147
ShaderHandle handle;
31483148
_cmdbuf.read(handle);
@@ -3158,7 +3158,7 @@ namespace bgfx
31583158

31593159
case CommandBuffer::DestroyShader:
31603160
{
3161-
BGFX_PROFILER_SCOPE("DestroyShader", 0xff2040ff);
3161+
BGFX_PROFILER_SCOPE("DestroyShader", kColorResource);
31623162

31633163
ShaderHandle handle;
31643164
_cmdbuf.read(handle);
@@ -3169,7 +3169,7 @@ namespace bgfx
31693169

31703170
case CommandBuffer::CreateProgram:
31713171
{
3172-
BGFX_PROFILER_SCOPE("CreateProgram", 0xff2040ff);
3172+
BGFX_PROFILER_SCOPE("CreateProgram", kColorResource);
31733173

31743174
ProgramHandle handle;
31753175
_cmdbuf.read(handle);
@@ -3186,7 +3186,7 @@ namespace bgfx
31863186

31873187
case CommandBuffer::DestroyProgram:
31883188
{
3189-
BGFX_PROFILER_SCOPE("DestroyProgram", 0xff2040ff);
3189+
BGFX_PROFILER_SCOPE("DestroyProgram", kColorResource);
31903190

31913191
ProgramHandle handle;
31923192
_cmdbuf.read(handle);
@@ -3197,7 +3197,7 @@ namespace bgfx
31973197

31983198
case CommandBuffer::CreateTexture:
31993199
{
3200-
BGFX_PROFILER_SCOPE("CreateTexture", 0xff2040ff);
3200+
BGFX_PROFILER_SCOPE("CreateTexture", kColorResource);
32013201

32023202
TextureHandle handle;
32033203
_cmdbuf.read(handle);
@@ -3240,7 +3240,7 @@ namespace bgfx
32403240

32413241
case CommandBuffer::UpdateTexture:
32423242
{
3243-
BGFX_PROFILER_SCOPE("UpdateTexture", 0xff2040ff);
3243+
BGFX_PROFILER_SCOPE("UpdateTexture", kColorResource);
32443244

32453245
if (m_textureUpdateBatch.isFull() )
32463246
{
@@ -3275,7 +3275,7 @@ namespace bgfx
32753275

32763276
case CommandBuffer::ReadTexture:
32773277
{
3278-
BGFX_PROFILER_SCOPE("ReadTexture", 0xff2040ff);
3278+
BGFX_PROFILER_SCOPE("ReadTexture", kColorResource);
32793279

32803280
TextureHandle handle;
32813281
_cmdbuf.read(handle);
@@ -3292,7 +3292,7 @@ namespace bgfx
32923292

32933293
case CommandBuffer::ResizeTexture:
32943294
{
3295-
BGFX_PROFILER_SCOPE("ResizeTexture", 0xff2040ff);
3295+
BGFX_PROFILER_SCOPE("ResizeTexture", kColorResource);
32963296

32973297
TextureHandle handle;
32983298
_cmdbuf.read(handle);
@@ -3315,7 +3315,7 @@ namespace bgfx
33153315

33163316
case CommandBuffer::DestroyTexture:
33173317
{
3318-
BGFX_PROFILER_SCOPE("DestroyTexture", 0xff2040ff);
3318+
BGFX_PROFILER_SCOPE("DestroyTexture", kColorResource);
33193319

33203320
TextureHandle handle;
33213321
_cmdbuf.read(handle);
@@ -3326,7 +3326,7 @@ namespace bgfx
33263326

33273327
case CommandBuffer::CreateFrameBuffer:
33283328
{
3329-
BGFX_PROFILER_SCOPE("CreateFrameBuffer", 0xff2040ff);
3329+
BGFX_PROFILER_SCOPE("CreateFrameBuffer", kColorResource);
33303330

33313331
FrameBufferHandle handle;
33323332
_cmdbuf.read(handle);
@@ -3368,7 +3368,7 @@ namespace bgfx
33683368

33693369
case CommandBuffer::DestroyFrameBuffer:
33703370
{
3371-
BGFX_PROFILER_SCOPE("DestroyFrameBuffer", 0xff2040ff);
3371+
BGFX_PROFILER_SCOPE("DestroyFrameBuffer", kColorResource);
33723372

33733373
FrameBufferHandle handle;
33743374
_cmdbuf.read(handle);
@@ -3379,7 +3379,7 @@ namespace bgfx
33793379

33803380
case CommandBuffer::CreateUniform:
33813381
{
3382-
BGFX_PROFILER_SCOPE("CreateUniform", 0xff2040ff);
3382+
BGFX_PROFILER_SCOPE("CreateUniform", kColorResource);
33833383

33843384
UniformHandle handle;
33853385
_cmdbuf.read(handle);
@@ -3401,7 +3401,7 @@ namespace bgfx
34013401

34023402
case CommandBuffer::DestroyUniform:
34033403
{
3404-
BGFX_PROFILER_SCOPE("DestroyUniform", 0xff2040ff);
3404+
BGFX_PROFILER_SCOPE("DestroyUniform", kColorResource);
34053405

34063406
UniformHandle handle;
34073407
_cmdbuf.read(handle);
@@ -3412,7 +3412,7 @@ namespace bgfx
34123412

34133413
case CommandBuffer::UpdateViewName:
34143414
{
3415-
BGFX_PROFILER_SCOPE("UpdateViewName", 0xff2040ff);
3415+
BGFX_PROFILER_SCOPE("UpdateViewName", kColorResource);
34163416

34173417
ViewId id;
34183418
_cmdbuf.read(id);
@@ -3428,7 +3428,7 @@ namespace bgfx
34283428

34293429
case CommandBuffer::InvalidateOcclusionQuery:
34303430
{
3431-
BGFX_PROFILER_SCOPE("InvalidateOcclusionQuery", 0xff2040ff);
3431+
BGFX_PROFILER_SCOPE("InvalidateOcclusionQuery", kColorResource);
34323432

34333433
OcclusionQueryHandle handle;
34343434
_cmdbuf.read(handle);
@@ -3439,7 +3439,7 @@ namespace bgfx
34393439

34403440
case CommandBuffer::SetName:
34413441
{
3442-
BGFX_PROFILER_SCOPE("SetName", 0xff2040ff);
3442+
BGFX_PROFILER_SCOPE("SetName", kColorResource);
34433443

34443444
Handle handle;
34453445
_cmdbuf.read(handle);

‎src/bgfx_p.h‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,25 @@ namespace bgfx
287287
{
288288
constexpr uint32_t kChunkMagicTex = BX_MAKEFOURCC('T', 'E', 'X', 0x0);
289289

290+
inline constexpr uint32_t toAbgr8(uint8_t _r, uint8_t _g, uint8_t _b, uint8_t _a = 0xff)
291+
{
292+
return 0
293+
| (uint32_t(_r) << 24)
294+
| (uint32_t(_g) << 16)
295+
| (uint32_t(_b) << 8)
296+
| (uint32_t(_a))
297+
;
298+
}
299+
300+
constexpr uint32_t kColorFrame = toAbgr8(0xa8, 0xe6, 0xcf);
301+
constexpr uint32_t kColorSubmit = toAbgr8(0xdc, 0xed, 0xc1);
302+
constexpr uint32_t kColorView = toAbgr8(0xff, 0xd3, 0xb6);
303+
constexpr uint32_t kColorDraw = toAbgr8(0x76, 0xb4, 0xbd);
304+
constexpr uint32_t kColorCompute = toAbgr8(0xbd, 0xea, 0xee);
305+
constexpr uint32_t kColorResource = toAbgr8(0x88, 0x74, 0xa3);
306+
constexpr uint32_t kColorMarker = toAbgr8(0xff, 0x00, 0x00);
307+
constexpr uint32_t kColorWait = toAbgr8(0xff, 0x8b, 0x94);
308+
290309
extern InternalData g_internalData;
291310
extern PlatformData g_platformData;
292311
extern bool g_platformDataChangedSinceReset;
@@ -3616,7 +3635,7 @@ namespace bgfx
36163635
BX_TRACE("render thread exit");
36173636
return bx::kExitSuccess;
36183637
}
3619-
#endif
3638+
#endif // BX_CONFIG_SUPPORTS_THREADING
36203639

36213640
// game thread
36223641
bool init(const Init& _init);
@@ -5693,7 +5712,7 @@ namespace bgfx
56935712
return true;
56945713
}
56955714

5696-
BGFX_PROFILER_SCOPE("bgfx/API thread wait", 0xff2040ff);
5715+
BGFX_PROFILER_SCOPE("bgfx/API thread wait", kColorWait);
56975716
int64_t start = bx::getHPCounter();
56985717
bool ok = m_apiSem.wait(_msecs);
56995718
if (ok)
@@ -5718,7 +5737,7 @@ namespace bgfx
57185737
{
57195738
if (!m_singleThreaded)
57205739
{
5721-
BGFX_PROFILER_SCOPE("bgfx/Render thread wait", 0xff2040ff);
5740+
BGFX_PROFILER_SCOPE("bgfx/Render thread wait", kColorWait);
57225741
int64_t start = bx::getHPCounter();
57235742
bool ok = m_renderSem.wait();
57245743
BX_ASSERT(ok, "Semaphore wait failed."); BX_UNUSED(ok);

0 commit comments

Comments
 (0)