mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move show memory details outside of the video context driver and

Browse Source 
into retroarch.c - avoid lots of code duplication
This commit is contained in:
twinaphex 2019-09-21 07:49:33 +02:00
parent f65e005d97
commit 302e2fdc53
15 changed files with 17 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/common/dxgi_common.c
View File

@ -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)
{

15
gfx/common/x11_common.c
View File

@ -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])

19
gfx/drivers/d3d8.c
View File

@ -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];

25
gfx/drivers/d3d9.c
View File

@ -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];

16
gfx/drivers_context/android_ctx.c
View File

@ -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 = {

16
gfx/drivers_context/drm_ctx.c
View File

@ -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 = {

17
gfx/drivers_context/gdi_ctx.c
View File

@ -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])

16
gfx/drivers_context/khr_display_ctx.c
View File

@ -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 = {

16
gfx/drivers_context/mali_fbdev_ctx.c
View File

@ -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 = {

27
gfx/drivers_context/network_ctx.c
View File

@ -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,

16
gfx/drivers_context/orbis_ctx.c
View File

@ -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 = {

16
gfx/drivers_context/ps3_ctx.c
View File

@ -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 = {

27
gfx/drivers_context/sixel_ctx.c
View File

@ -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,

17
gfx/drivers_context/wgl_ctx.c
View File

@ -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])

17
retroarch.c
View File

@ -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
{