diff --git a/gfx/common/dxgi_common.c b/gfx/common/dxgi_common.c index 18e879e2bd..013d0c98c7 100644 --- a/gfx/common/dxgi_common.c +++ b/gfx/common/dxgi_common.c @@ -307,21 +307,6 @@ void dxgi_update_title(video_frame_info_t* video_info) { #ifndef __WINRT__ const ui_window_t* window = ui_companion_driver_get_window_ptr(); - const settings_t *settings = config_get_ptr(); - - if (settings->bools.video_memory_show) - { - char mem[128]; - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); - } if (window) { diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c index 6f59827cdb..46e8d2c498 100644 --- a/gfx/common/x11_common.c +++ b/gfx/common/x11_common.c @@ -679,26 +679,11 @@ bool x11_connect(void) void x11_update_title(void *data, void *data2) { - const settings_t *settings = config_get_ptr(); video_frame_info_t *video_info = (video_frame_info_t*)data2; char title[128]; title[0] = '\0'; - if (settings->bools.video_memory_show) - { - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); - } - video_driver_get_window_title(title, sizeof(title)); if (title[0]) diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c index 011d01372f..85ade46788 100644 --- a/gfx/drivers/d3d8.c +++ b/gfx/drivers/d3d8.c @@ -1460,28 +1460,9 @@ static void d3d8_get_overlay_interface(void *data, static void d3d8_update_title(video_frame_info_t *video_info) { - const settings_t *settings = config_get_ptr(); #ifndef _XBOX const ui_window_t *window = ui_companion_driver_get_window_ptr(); -#endif - if (settings->bools.video_memory_show) - { -#ifndef __WINRT__ - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); -#endif - } - -#ifndef _XBOX if (window) { char title[128]; diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c index de147d4736..1131d5d560 100644 --- a/gfx/drivers/d3d9.c +++ b/gfx/drivers/d3d9.c @@ -1510,30 +1510,9 @@ static void d3d9_get_overlay_interface(void *data, static void d3d9_update_title(video_frame_info_t *video_info) { - const settings_t *settings = config_get_ptr(); -#ifdef _XBOX - const ui_window_t *window = NULL; -#else - const ui_window_t *window = ui_companion_driver_get_window_ptr(); -#endif - - if (settings->bools.video_memory_show) - { -#ifndef __WINRT__ - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); -#endif - } - #ifndef _XBOX + const ui_window_t *window = ui_companion_driver_get_window_ptr(); + if (window) { char title[128]; diff --git a/gfx/drivers_context/android_ctx.c b/gfx/drivers_context/android_ctx.c index b3523e0d94..c60c51294b 100644 --- a/gfx/drivers_context/android_ctx.c +++ b/gfx/drivers_context/android_ctx.c @@ -617,22 +617,6 @@ static void android_gfx_ctx_set_flags(void *data, uint32_t flags) static void android_gfx_update_window_title(void *data, void *data2) { - const settings_t *settings = config_get_ptr(); - video_frame_info_t* video_info = (video_frame_info_t*)data2; - - if (settings->bools.video_memory_show) - { - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); - } } const gfx_ctx_driver_t gfx_ctx_android = { diff --git a/gfx/drivers_context/drm_ctx.c b/gfx/drivers_context/drm_ctx.c index 1dba5e5e6e..efa53058ff 100644 --- a/gfx/drivers_context/drm_ctx.c +++ b/gfx/drivers_context/drm_ctx.c @@ -930,22 +930,6 @@ static void gfx_ctx_drm_set_flags(void *data, uint32_t flags) void gfx_ctx_drm_update_window_title(void *data, void *data2) { - const settings_t *settings = config_get_ptr(); - video_frame_info_t* video_info = (video_frame_info_t*)data2; - - if (settings->bools.video_memory_show) - { - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); - } } const gfx_ctx_driver_t gfx_ctx_drm = { diff --git a/gfx/drivers_context/gdi_ctx.c b/gfx/drivers_context/gdi_ctx.c index 069e295437..3535950770 100644 --- a/gfx/drivers_context/gdi_ctx.c +++ b/gfx/drivers_context/gdi_ctx.c @@ -70,29 +70,12 @@ static bool gfx_ctx_gdi_set_resize(void *data, static void gfx_ctx_gdi_update_window_title(void *data, void *data2) { - const settings_t *settings = config_get_ptr(); video_frame_info_t* video_info = (video_frame_info_t*)data2; const ui_window_t *window = ui_companion_driver_get_window_ptr(); char title[128]; title[0] = '\0'; - if (settings->bools.video_memory_show) - { -#ifndef __WINRT__ - int64_t mem_bytes_used = frontend_driver_get_used_memory(); - int64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); -#endif - } - video_driver_get_window_title(title, sizeof(title)); if (window && title[0]) diff --git a/gfx/drivers_context/khr_display_ctx.c b/gfx/drivers_context/khr_display_ctx.c index 47fc94cd45..06735c70bb 100644 --- a/gfx/drivers_context/khr_display_ctx.c +++ b/gfx/drivers_context/khr_display_ctx.c @@ -278,22 +278,6 @@ static void *gfx_ctx_khr_display_get_context_data(void *data) static void gfx_ctx_khr_display_update_window_title(void *data, void *data2) { - const settings_t *settings = config_get_ptr(); - video_frame_info_t *video_info = (video_frame_info_t*)data2; - - if (settings->bools.video_memory_show) - { - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); - } } const gfx_ctx_driver_t gfx_ctx_khr_display = { diff --git a/gfx/drivers_context/mali_fbdev_ctx.c b/gfx/drivers_context/mali_fbdev_ctx.c index a716abc8e5..2e728a0a77 100644 --- a/gfx/drivers_context/mali_fbdev_ctx.c +++ b/gfx/drivers_context/mali_fbdev_ctx.c @@ -307,22 +307,6 @@ static float gfx_ctx_mali_fbdev_get_refresh_rate(void *data) static void gfx_ctx_mali_fbdev_update_window_title(void *data, void *data2) { - const settings_t *settings = config_get_ptr(); - video_frame_info_t* video_info = (video_frame_info_t*)data2; - - if (settings->bools.video_memory_show) - { - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); - } } const gfx_ctx_driver_t gfx_ctx_mali_fbdev = { diff --git a/gfx/drivers_context/network_ctx.c b/gfx/drivers_context/network_ctx.c index 3ea71916c2..921c933b72 100644 --- a/gfx/drivers_context/network_ctx.c +++ b/gfx/drivers_context/network_ctx.c @@ -50,33 +50,6 @@ static bool gfx_ctx_network_set_resize(void *data, static void gfx_ctx_network_update_window_title(void *data, void *data2) { - const settings_t *settings = config_get_ptr(); - video_frame_info_t *video_info = (video_frame_info_t*)data2; -#if defined(_WIN32) && !defined(_XBOX) - const ui_window_t *window = ui_companion_driver_get_window_ptr(); - char title[128]; - - title[0] = '\0'; - - if (settings->bools.video_memory_show) - { - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); - } - - video_driver_get_window_title(title, sizeof(title)); - - if (window && title[0]) - window->set_title(&main_window, title); -#endif } static void gfx_ctx_network_get_video_size(void *data, diff --git a/gfx/drivers_context/orbis_ctx.c b/gfx/drivers_context/orbis_ctx.c index d9db9037b4..5ec445f786 100644 --- a/gfx/drivers_context/orbis_ctx.c +++ b/gfx/drivers_context/orbis_ctx.c @@ -289,22 +289,6 @@ static float orbis_ctx_get_refresh_rate(void *data) static void orbis_ctx_update_window_title(void *data, void *data2) { - const settings_t *settings = config_get_ptr(); - video_frame_info_t* video_info = (video_frame_info_t*)data2; - - if (settings->bools.video_memory_show) - { - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); - } } const gfx_ctx_driver_t orbis_ctx = { diff --git a/gfx/drivers_context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c index 94751aef41..112202cd38 100644 --- a/gfx/drivers_context/ps3_ctx.c +++ b/gfx/drivers_context/ps3_ctx.c @@ -411,22 +411,6 @@ static void gfx_ctx_ps3_set_flags(void *data, uint32_t flags) static void gfx_ctx_ps3_update_window_title(void *data, void *data2) { - const settings_t *settings = config_get_ptr(); - video_frame_info_t* video_info = (video_frame_info_t*)data2; - - if (settings->bools.video_memory_show) - { - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); - } } const gfx_ctx_driver_t gfx_ctx_ps3 = { diff --git a/gfx/drivers_context/sixel_ctx.c b/gfx/drivers_context/sixel_ctx.c index 2fb19b6885..6b99459b61 100644 --- a/gfx/drivers_context/sixel_ctx.c +++ b/gfx/drivers_context/sixel_ctx.c @@ -50,33 +50,6 @@ static bool gfx_ctx_sixel_set_resize(void *data, static void gfx_ctx_sixel_update_window_title(void *data, void *data2) { - const settings_t *settings = config_get_ptr(); - video_frame_info_t *video_info = (video_frame_info_t*)data2; -#if defined(_WIN32) && !defined(_XBOX) - const ui_window_t *window = ui_companion_driver_get_window_ptr(); - char title[128]; - - title[0] = '\0'; - - if (settings->bools.video_memory_show) - { - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); - } - - video_driver_get_window_title(title, sizeof(title)); - - if (window && title[0]) - window->set_title(&main_window, title); -#endif } static void gfx_ctx_sixel_get_video_size(void *data, diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c index 899267fe71..78c1ba429e 100644 --- a/gfx/drivers_context/wgl_ctx.c +++ b/gfx/drivers_context/wgl_ctx.c @@ -512,28 +512,11 @@ static bool gfx_ctx_wgl_set_resize(void *data, static void gfx_ctx_wgl_update_title(void *data, void *data2) { - const settings_t *settings = config_get_ptr(); video_frame_info_t* video_info = (video_frame_info_t*)data2; char title[128]; title[0] = '\0'; - if (settings->bools.video_memory_show) - { -#ifndef __WINRT__ - uint64_t mem_bytes_used = frontend_driver_get_used_memory(); - uint64_t mem_bytes_total = frontend_driver_get_total_memory(); - char mem[128]; - - mem[0] = '\0'; - - snprintf( - mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), - mem_bytes_total / (1024.0f * 1024.0f)); - strlcat(video_info->fps_text, mem, sizeof(video_info->fps_text)); -#endif - } - video_driver_get_window_title(title, sizeof(title)); if (title[0]) diff --git a/retroarch.c b/retroarch.c index 548dec5e6e..7b6b2e7041 100644 --- a/retroarch.c +++ b/retroarch.c @@ -19122,6 +19122,7 @@ static void video_driver_frame(const void *data, unsigned width, if (video_driver_frame_count) { static char title[256]; + settings_t *settings = configuration_settings; unsigned write_index = video_driver_frame_time_count++ & (MEASURE_FRAME_TIME_SAMPLES_COUNT - 1); @@ -19129,8 +19130,7 @@ static void video_driver_frame(const void *data, unsigned width, video_driver_frame_time_samples[write_index] = frame_time; fps_time = new_time; - if (video_driver_frame_count == 1) - strlcpy(title, video_driver_window_title, sizeof(title)); + strlcpy(title, video_driver_window_title, sizeof(title)); if (video_info.fps_show) { @@ -19174,6 +19174,19 @@ static void video_driver_frame(const void *data, unsigned width, curr_time = new_time; video_driver_window_title_update = true; } + + if (settings->bools.video_memory_show) + { + char mem[128]; + uint64_t mem_bytes_used = frontend_driver_get_used_memory(); + uint64_t mem_bytes_total = frontend_driver_get_total_memory(); + + mem[0] = '\0'; + snprintf( + mem, sizeof(mem), " || MEM: %.2f/%.2fMB", mem_bytes_used / (1024.0f * 1024.0f), + mem_bytes_total / (1024.0f * 1024.0f)); + strlcat(video_info.fps_text, mem, sizeof(video_info.fps_text)); + } } else {