|
|
@@ -7649,7 +7649,8 @@ namespace bgfx { namespace gl
|
|
|
|
|
|
tvm.clear();
|
|
|
uint16_t pos = 0;
|
|
|
- tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x89 : 0x8f, " %s / " BX_COMPILER_NAME " / " BX_CPU_NAME " / " BX_ARCH_NAME " / " BX_PLATFORM_NAME " "
|
|
|
+ tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
|
|
|
+ , " %s / " BX_COMPILER_NAME " / " BX_CPU_NAME " / " BX_ARCH_NAME " / " BX_PLATFORM_NAME " "
|
|
|
, getRendererName()
|
|
|
);
|
|
|
tvm.printf(0, pos++, 0x8f, " Vendor: %s ", m_vendor);
|
|
|
@@ -7662,7 +7663,7 @@ namespace bgfx { namespace gl
|
|
|
tvm.printf(0, pos++, 0x8f, " Memory: %s (process) ", processMemoryUsed);
|
|
|
|
|
|
pos = 10;
|
|
|
- tvm.printf(10, pos++, 0x8e, " Frame: %7.3f, % 7.3f \x1f, % 7.3f \x1e [ms] / % 6.2f FPS "
|
|
|
+ tvm.printf(10, pos++, 0x8b, " Frame: %7.3f, % 7.3f \x1f, % 7.3f \x1e [ms] / % 6.2f FPS "
|
|
|
, double(frameTime)*toMs
|
|
|
, double(min)*toMs
|
|
|
, double(max)*toMs
|
|
|
@@ -7673,7 +7674,7 @@ namespace bgfx { namespace gl
|
|
|
bx::snprintf(hmd, BX_COUNTOF(hmd), ", [%c] HMD ", hmdEnabled ? '\xfe' : ' ');
|
|
|
|
|
|
const uint32_t msaa = (m_resolution.m_flags&BGFX_RESET_MSAA_MASK)>>BGFX_RESET_MSAA_SHIFT;
|
|
|
- tvm.printf(10, pos++, 0x8e, " Reset flags: [%c] vsync, [%c] MSAAx%d%s, [%c] MaxAnisotropy "
|
|
|
+ tvm.printf(10, pos++, 0x8b, " Reset flags: [%c] vsync, [%c] MSAAx%d%s, [%c] MaxAnisotropy "
|
|
|
, !!(m_resolution.m_flags&BGFX_RESET_VSYNC) ? '\xfe' : ' '
|
|
|
, 0 != msaa ? '\xfe' : ' '
|
|
|
, 1<<msaa
|
|
|
@@ -7682,7 +7683,7 @@ namespace bgfx { namespace gl
|
|
|
);
|
|
|
|
|
|
double elapsedCpuMs = double(frameTime)*toMs;
|
|
|
- tvm.printf(10, pos++, 0x8e, " Submitted: %5d (draw %5d, compute %4d) / CPU %7.4f [ms] %c GPU %7.4f [ms] (latency %d) "
|
|
|
+ tvm.printf(10, pos++, 0x8b, " Submitted: %5d (draw %5d, compute %4d) / CPU %7.4f [ms] %c GPU %7.4f [ms] (latency %d) "
|
|
|
, _render->m_numRenderItems
|
|
|
, statsKeyType[0]
|
|
|
, statsKeyType[1]
|
|
|
@@ -7696,7 +7697,7 @@ namespace bgfx { namespace gl
|
|
|
|
|
|
for (uint32_t ii = 0; ii < BX_COUNTOF(s_primInfo); ++ii)
|
|
|
{
|
|
|
- tvm.printf(10, pos++, 0x8e, " %10s: %7d (#inst: %5d), submitted: %7d "
|
|
|
+ tvm.printf(10, pos++, 0x8b, " %10s: %7d (#inst: %5d), submitted: %7d "
|
|
|
, s_primName[ii]
|
|
|
, statsNumPrimsRendered[ii]
|
|
|
, statsNumInstances[ii]
|
|
|
@@ -7709,15 +7710,15 @@ namespace bgfx { namespace gl
|
|
|
tvm.printf(tvm.m_width-27, 0, 0x1f, " [F11 - RenderDoc capture] ");
|
|
|
}
|
|
|
|
|
|
- tvm.printf(10, pos++, 0x8e, " Indices: %7d ", statsNumIndices);
|
|
|
-// tvm.printf(10, pos++, 0x8e, " Uniform size: %7d, Max: %7d ", _render->m_uniformEnd, _render->m_uniformMax);
|
|
|
- tvm.printf(10, pos++, 0x8e, " DVB size: %7d ", _render->m_vboffset);
|
|
|
- tvm.printf(10, pos++, 0x8e, " DIB size: %7d ", _render->m_iboffset);
|
|
|
+ tvm.printf(10, pos++, 0x8b, " Indices: %7d ", statsNumIndices);
|
|
|
+// tvm.printf(10, pos++, 0x8b, " Uniform size: %7d, Max: %7d ", _render->m_uniformEnd, _render->m_uniformMax);
|
|
|
+ tvm.printf(10, pos++, 0x8b, " DVB size: %7d ", _render->m_vboffset);
|
|
|
+ tvm.printf(10, pos++, 0x8b, " DIB size: %7d ", _render->m_iboffset);
|
|
|
|
|
|
pos++;
|
|
|
- tvm.printf(10, pos++, 0x8e, " State cache: ");
|
|
|
- tvm.printf(10, pos++, 0x8e, " Sampler ");
|
|
|
- tvm.printf(10, pos++, 0x8e, " %6d "
|
|
|
+ tvm.printf(10, pos++, 0x8b, " State cache: ");
|
|
|
+ tvm.printf(10, pos++, 0x8b, " Sampler ");
|
|
|
+ tvm.printf(10, pos++, 0x8b, " %6d "
|
|
|
, m_samplerStateCache.getCount()
|
|
|
);
|
|
|
|
|
|
@@ -7745,19 +7746,19 @@ namespace bgfx { namespace gl
|
|
|
bx::prettify(tmp1, BX_COUNTOF(tmp1), vboFree[1]);
|
|
|
bx::prettify(tmp2, BX_COUNTOF(tmp2), vboFree[2]);
|
|
|
bx::prettify(tmp3, BX_COUNTOF(tmp3), vboFree[3]);
|
|
|
- tvm.printf(10, pos++, 0x8e, " VBO: %10s, %10s, %10s, %10s ", tmp0, tmp1, tmp2, tmp3);
|
|
|
+ tvm.printf(10, pos++, 0x8b, " VBO: %10s, %10s, %10s, %10s ", tmp0, tmp1, tmp2, tmp3);
|
|
|
|
|
|
bx::prettify(tmp0, BX_COUNTOF(tmp0), texFree[0]);
|
|
|
bx::prettify(tmp1, BX_COUNTOF(tmp1), texFree[1]);
|
|
|
bx::prettify(tmp2, BX_COUNTOF(tmp2), texFree[2]);
|
|
|
bx::prettify(tmp3, BX_COUNTOF(tmp3), texFree[3]);
|
|
|
- tvm.printf(10, pos++, 0x8e, " Texture: %10s, %10s, %10s, %10s ", tmp0, tmp1, tmp2, tmp3);
|
|
|
+ tvm.printf(10, pos++, 0x8b, " Texture: %10s, %10s, %10s, %10s ", tmp0, tmp1, tmp2, tmp3);
|
|
|
|
|
|
bx::prettify(tmp0, BX_COUNTOF(tmp0), rbfFree[0]);
|
|
|
bx::prettify(tmp1, BX_COUNTOF(tmp1), rbfFree[1]);
|
|
|
bx::prettify(tmp2, BX_COUNTOF(tmp2), rbfFree[2]);
|
|
|
bx::prettify(tmp3, BX_COUNTOF(tmp3), rbfFree[3]);
|
|
|
- tvm.printf(10, pos++, 0x8e, " Render Buffer: %10s, %10s, %10s, %10s ", tmp0, tmp1, tmp2, tmp3);
|
|
|
+ tvm.printf(10, pos++, 0x8b, " Render Buffer: %10s, %10s, %10s, %10s ", tmp0, tmp1, tmp2, tmp3);
|
|
|
}
|
|
|
else if (s_extension[Extension::NVX_gpu_memory_info].m_supported)
|
|
|
{
|
|
|
@@ -7781,23 +7782,23 @@ namespace bgfx { namespace gl
|
|
|
char tmp1[16];
|
|
|
|
|
|
bx::prettify(tmp0, BX_COUNTOF(tmp0), dedicated);
|
|
|
- tvm.printf(10, pos++, 0x8e, " Dedicated: %10s ", tmp0);
|
|
|
+ tvm.printf(10, pos++, 0x8b, " Dedicated: %10s ", tmp0);
|
|
|
|
|
|
bx::prettify(tmp0, BX_COUNTOF(tmp0), currAvail);
|
|
|
bx::prettify(tmp1, BX_COUNTOF(tmp1), totalAvail);
|
|
|
- tvm.printf(10, pos++, 0x8e, " Available: %10s / %10s ", tmp0, tmp1);
|
|
|
+ tvm.printf(10, pos++, 0x8b, " Available: %10s / %10s ", tmp0, tmp1);
|
|
|
|
|
|
bx::prettify(tmp0, BX_COUNTOF(tmp0), evictedCount);
|
|
|
bx::prettify(tmp1, BX_COUNTOF(tmp1), evictedMemory);
|
|
|
- tvm.printf(10, pos++, 0x8e, " Eviction: %10s / %10s ", tmp0, tmp1);
|
|
|
+ tvm.printf(10, pos++, 0x8b, " Eviction: %10s / %10s ", tmp0, tmp1);
|
|
|
}
|
|
|
#endif // BGFX_CONFIG_RENDERER_OPENGL
|
|
|
|
|
|
pos++;
|
|
|
double captureMs = double(captureElapsed)*toMs;
|
|
|
- tvm.printf(10, pos++, 0x8e, " Capture: %7.4f [ms] ", captureMs);
|
|
|
+ tvm.printf(10, pos++, 0x8b, " Capture: %7.4f [ms] ", captureMs);
|
|
|
|
|
|
- uint8_t attr[2] = { 0x89, 0x8a };
|
|
|
+ uint8_t attr[2] = { 0x8c, 0x8a };
|
|
|
uint8_t attrIndex = _render->m_waitSubmit < _render->m_waitRender;
|
|
|
tvm.printf(10, pos++, attr[attrIndex&1], " Submit wait: %7.4f [ms] ", double(_render->m_waitSubmit)*toMs);
|
|
|
tvm.printf(10, pos++, attr[(attrIndex+1)&1], " Render wait: %7.4f [ms] ", double(_render->m_waitRender)*toMs);
|