starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-13 01:44:33 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

ImGuiOverlays: Tidy up font weight in OSD

Browse Source
This commit is contained in:
Stenzek
2025-11-15 22:46:36 +10:00
parent 8ce216e42c
commit 67208460f4
4 changed files with 65 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/gpu.h
View File

@@ -149,6 +149,12 @@ public:
return (!m_force_progressive_scan && m_GPUSTAT.vertical_interlace);
}
/// Returns true if scanout is forced to progressive.
ALWAYS_INLINE bool IsProgressiveDisplayScanForced() const
{
return (m_force_progressive_scan && m_GPUSTAT.vertical_interlace);
}
/// Returns true if interlaced rendering is enabled and force progressive scan is disabled.
ALWAYS_INLINE bool IsInterlacedRenderingEnabled() const
{

28
src/core/gpu_backend.cpp
View File

@@ -586,32 +586,35 @@ void GPUBackend::HandleSubmitFrameCommand(const GPUBackendFramePresentationParam
RestoreDeviceContext();
}
#define BOLD(text) "\x02" text "\x01"
void GPUBackend::GetStatsString(SmallStringBase& str) const
{
if (IsUsingHardwareBackend())
{
if (g_gpu_settings.gpu_pgxp_depth_buffer)
{
str.format("\x02{}{} HW | \x01{}\x02 P | \x01{}\x02 DC | \x01{}\x02 RB | \x01{}\x02 C | \x01{}\x02 W | "
"\x01{}%\x02 U | \x01{}\x02 DBC",
str.format(BOLD("{}{} HW") " | {} " BOLD("P") " | {} " BOLD("DC") " | {} " BOLD("RB") " | {} " BOLD(
"C") " | {} " BOLD("W") " | {}% " BOLD("U") " | {} " BOLD("DBC"),
GPUDevice::RenderAPIToString(g_gpu_device->GetRenderAPI()), g_gpu_settings.gpu_use_thread ? "-MT" : "",
s_stats.num_primitives, s_stats.host_num_draws, s_stats.host_num_downloads, s_stats.num_copies,
s_stats.num_writes, s_stats.gpu_busy_pct, s_stats.num_depth_buffer_clears);
}
else
{
str.format(
"\x02{}{} HW | \x01{}\x02 P | \x01{}\x02 DC | \x01{}\x02 RB | \x01{}\x02 C | \x01{}\x02 W | \x01{}%\x02 U",
GPUDevice::RenderAPIToString(g_gpu_device->GetRenderAPI()), g_gpu_settings.gpu_use_thread ? "-MT" : "",
s_stats.num_primitives, s_stats.host_num_draws, s_stats.host_num_downloads, s_stats.num_copies,
s_stats.num_writes, s_stats.gpu_busy_pct);
str.format(BOLD("{}{} HW") " | {} " BOLD("P") " | {} " BOLD("DC") " | {} " BOLD("RB") " | {} " BOLD(
"C") " | {} " BOLD("W") " | {}% " BOLD("U"),
GPUDevice::RenderAPIToString(g_gpu_device->GetRenderAPI()), g_gpu_settings.gpu_use_thread ? "-MT" : "",
s_stats.num_primitives, s_stats.host_num_draws, s_stats.host_num_downloads, s_stats.num_copies,
s_stats.num_writes, s_stats.gpu_busy_pct);
}
}
else
{
str.format("\x02{}{} SW | \x01{}\x02 P | \x01{}\x02 R | \x01{}\x02 C | \x01{}\x02 W | \x01{}%\x02 U",
GPUDevice::RenderAPIToString(g_gpu_device->GetRenderAPI()), g_gpu_settings.gpu_use_thread ? "-MT" : "",
s_stats.num_primitives, s_stats.num_reads, s_stats.num_copies, s_stats.num_writes, s_stats.gpu_busy_pct);
str.format(
BOLD("{}{} SW") " | {} " BOLD("P") " | {} " BOLD("R") " | {} " BOLD("C") " | {} " BOLD("W") " | {}% " BOLD("U"),
GPUDevice::RenderAPIToString(g_gpu_device->GetRenderAPI()), g_gpu_settings.gpu_use_thread ? "-MT" : "",
s_stats.num_primitives, s_stats.num_reads, s_stats.num_copies, s_stats.num_writes, s_stats.gpu_busy_pct);
}
}
@@ -620,11 +623,14 @@ void GPUBackend::GetMemoryStatsString(SmallStringBase& str) const
const u32 vram_usage_mb = static_cast<u32>((g_gpu_device->GetVRAMUsage() + (1048576 - 1)) / 1048576);
const u32 stream_kb = static_cast<u32>((s_stats.host_buffer_streamed + (1024 - 1)) / 1024);
str.format("\x01{}MB\x02 VRAM | \x01{}KB\x02 STR | \x01{}\x02 B | \x01{}\x02 RP | \x01{}\x02 TC | \x01{}\x02 TU",
str.format("{}MB " BOLD("VRAM") " | {}KB " BOLD("STR") " | {} " BOLD("B") " | {} " BOLD("RP") " | {} " BOLD(
"TC") " | {} " BOLD("TU"),
vram_usage_mb, stream_kb, s_stats.host_num_barriers, s_stats.host_num_render_passes,
s_stats.host_num_copies, s_stats.host_num_uploads);
}
#undef BOLD
void GPUBackend::ResetStatistics()
{
s_counters = {};

52
src/core/imgui_overlays.cpp
View File

@@ -54,7 +54,7 @@ LOG_CHANNEL(ImGuiManager);
namespace ImGuiManager {
static constexpr float FIXED_BOLD_WEIGHT = 700.0f;
static constexpr float FIXED_BOLD_WEIGHT = 800.0f;
namespace {
@@ -367,6 +367,9 @@ static void DrawPerformanceStat(ImDrawList* dl, float& position_y, ImFont* font,
void ImGuiManager::DrawPerformanceOverlay(const GPUBackend* gpu, float& position_y, float scale, float margin,
float spacing)
{
#define BOLD(text) "\x02" text "\x01"
#define COLOR(text) "\x04" text "\x03"
if (!(g_gpu_settings.display_show_fps || g_gpu_settings.display_show_speed || g_gpu_settings.display_show_gpu_stats ||
g_gpu_settings.display_show_resolution || g_gpu_settings.display_show_latency_stats ||
g_gpu_settings.display_show_cpu_usage || g_gpu_settings.display_show_gpu_usage ||
@@ -391,18 +394,25 @@ void ImGuiManager::DrawPerformanceOverlay(const GPUBackend* gpu, float& position
const float speed = PerformanceCounters::GetEmulationSpeed();
if (g_gpu_settings.display_show_fps)
{
text.append_format("\x02G: \x01\x04{:.2f}\x03\x02 | V: \x01\x04{:.2f}\x03", PerformanceCounters::GetFPS(),
PerformanceCounters::GetVPS());
const float fps = PerformanceCounters::GetFPS();
const float vps = PerformanceCounters::GetVPS();
if (vps < 100.0f)
text.append_format(COLOR("{:.2f}") " " BOLD("FPS") " | " COLOR("{:.2f}") " " BOLD("VPS"), fps, vps);
else if (vps < 1000.0f)
text.append_format(COLOR("{:.1f}") " " BOLD("FPS") " | " COLOR("{:.1f}") " " BOLD("VPS"), fps, vps);
else
text.append_format(COLOR("{:.0f}") " " BOLD("FPS") " | " COLOR("{:.0f}") " " BOLD("VPS"), fps, vps);
}
if (g_gpu_settings.display_show_speed)
{
text.append_format("\x02{}\x04{}% \x01\x03", text.empty() ? "" : " | ", static_cast<u32>(std::round(speed)));
text.append_format("{}" COLOR("{}%") " ", text.empty() ? "" : " | ", static_cast<u32>(std::round(speed)));
const float target_speed = System::GetTargetSpeed();
if (target_speed <= 0.0f)
text.append("(Max)");
text.append(BOLD("(Max)"));
else
text.append_format("({:.0f}%)", target_speed * 100.0f);
text.append_format(BOLD("({:.0f}%)"), target_speed * 100.0f);
}
if (!text.empty())
{
@@ -435,11 +445,15 @@ void ImGuiManager::DrawPerformanceOverlay(const GPUBackend* gpu, float& position
if (g_gpu_settings.display_show_resolution)
{
const u32 resolution_scale = gpu->GetResolutionScale();
const bool pgxp = gpu->IsUsingHardwareBackend() && g_gpu_settings.gpu_pgxp_enable;
const auto [display_width, display_height] = g_gpu.GetFullDisplayResolution(); // NOTE: Racey read.
const bool interlaced = g_gpu.IsInterlacedDisplayEnabled();
const bool progressive_forced = g_gpu.IsProgressiveDisplayScanForced();
const bool pal = g_gpu.IsInPALMode();
text.format("{}x{} {} {} [{}x]", display_width * resolution_scale, display_height * resolution_scale,
pal ? "PAL" : "NTSC", interlaced ? "Interlaced" : "Progressive", resolution_scale);
text.format("{}x{} " BOLD("{} {}") " | {}x " BOLD("IR") "{}", display_width * resolution_scale,
display_height * resolution_scale, pal ? "PAL" : "NTSC",
interlaced ? "Interlaced" : (progressive_forced ? "Forced-Progressive" : "Progressive"),
resolution_scale, pgxp ? " | " BOLD("PGXP") : "");
DrawPerformanceStat(dl, position_y, fixed_font, fixed_font_size, FIXED_BOLD_WEIGHT, 0, shadow_offset, rbound,
text);
position_y += spacing;
@@ -455,8 +469,9 @@ void ImGuiManager::DrawPerformanceOverlay(const GPUBackend* gpu, float& position
if (g_gpu_settings.display_show_cpu_usage)
{
text.format("{:.2f}ms | {:.2f}ms | {:.2f}ms", PerformanceCounters::GetMinimumFrameTime(),
PerformanceCounters::GetAverageFrameTime(), PerformanceCounters::GetMaximumFrameTime());
text.format(" {:.2f}ms " BOLD("Min") " | {:.2f}ms " BOLD("Avg") " | {:.2f}ms " BOLD("Max"),
PerformanceCounters::GetMinimumFrameTime(), PerformanceCounters::GetAverageFrameTime(),
PerformanceCounters::GetMaximumFrameTime());
DrawPerformanceStat(dl, position_y, fixed_font, fixed_font_size, FIXED_BOLD_WEIGHT, 0, shadow_offset, rbound,
text);
position_y += spacing;
@@ -492,12 +507,11 @@ void ImGuiManager::DrawPerformanceOverlay(const GPUBackend* gpu, float& position
text.append_format("{}{}", first ? "" : "/", "ME");
}
text.append("]: \x01");
text.append("]:\x03 ");
}
else
{
text.assign("\x02"
"CPU: \x01");
text.assign(BOLD("CPU:") " ");
}
FormatProcessorStat(text, PerformanceCounters::GetCPUThreadUsage(),
PerformanceCounters::GetCPUThreadAverageTime());
@@ -507,7 +521,7 @@ void ImGuiManager::DrawPerformanceOverlay(const GPUBackend* gpu, float& position
if (g_gpu_settings.gpu_use_thread)
{
text.assign("\x02RNDR: \x01");
text.assign(BOLD("RNDR:") " ");
FormatProcessorStat(text, PerformanceCounters::GetGPUThreadUsage(),
PerformanceCounters::GetGPUThreadAverageTime());
DrawPerformanceStat(dl, position_y, fixed_font, fixed_font_size, FIXED_BOLD_WEIGHT, 0, shadow_offset, rbound,
@@ -518,8 +532,7 @@ void ImGuiManager::DrawPerformanceOverlay(const GPUBackend* gpu, float& position
#ifndef __ANDROID__
if (MediaCapture* cap = System::GetMediaCapture())
{
text.assign("\x02"
"CAP: \x01");
text.assign(BOLD("CAP:") " ");
FormatProcessorStat(text, cap->GetCaptureThreadUsage(), cap->GetCaptureThreadTime());
DrawPerformanceStat(dl, position_y, fixed_font, fixed_font_size, FIXED_BOLD_WEIGHT, 0, shadow_offset, rbound,
text);
@@ -530,7 +543,7 @@ void ImGuiManager::DrawPerformanceOverlay(const GPUBackend* gpu, float& position
if (g_gpu_settings.display_show_gpu_usage && g_gpu_device->IsGPUTimingEnabled())
{
text.assign("\x02GPU: \x01");
text.assign(BOLD("GPU:"));
FormatProcessorStat(text, PerformanceCounters::GetGPUUsage(), PerformanceCounters::GetGPUAverageTime());
DrawPerformanceStat(dl, position_y, fixed_font, fixed_font_size, FIXED_BOLD_WEIGHT, 0, shadow_offset, rbound,
text);
@@ -551,6 +564,11 @@ void ImGuiManager::DrawPerformanceOverlay(const GPUBackend* gpu, float& position
SetStatusIndicatorIcons(text, true);
DrawPerformanceStat(dl, position_y, ui_font, status_size, 0.0f, 0, shadow_offset, rbound, text);
}
#undef UNCOLOR
#undef COLOR
#undef UNBOLD
#undef BOLD
}
void ImGuiManager::DrawEnhancementsOverlay(const GPUBackend* gpu)

9
src/core/system.cpp
View File

@@ -3664,8 +3664,13 @@ void System::FormatLatencyStats(SmallStringBase& str)
(std::max(queued_frame_count, 1u))) -
Timer::ConvertValueToMilliseconds(static_cast<Timer::Value>(s_state.runahead_frames) * s_state.frame_period));
str.format("AL: {}ms | AF: {:.0f}ms | PF: {:.0f}ms | IL: {:.0f}ms | QF: {}", audio_latency, active_frame_time,
pre_frame_time, input_latency, queued_frame_count);
#define BOLD(text) "\x02" text "\x01"
str.format("{}ms " BOLD("AL") " | {:.0f}ms " BOLD("AF") " | {:.0f}ms " BOLD("PF") " | {:.0f}ms " BOLD(
"IL") " | {} " BOLD("QF"),
audio_latency, active_frame_time, pre_frame_time, input_latency, queued_frame_count);
#undef BOLD
}
void System::UpdateSpeedLimiterState()