From 271e19304843063bb0f812a30c153961f6ff2677 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 7 Oct 2013 23:39:21 +0200 Subject: [PATCH] (XDK) Simplify update_window_title --- gfx/context/xdk_ctx.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/gfx/context/xdk_ctx.c b/gfx/context/xdk_ctx.c index 0fbdbc052d..9f24825b6a 100644 --- a/gfx/context/xdk_ctx.c +++ b/gfx/context/xdk_ctx.c @@ -85,38 +85,16 @@ static void gfx_ctx_xdk_update_window_title(void) { char buf[128], buf_fps[128]; bool fps_draw = g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW); - xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; if (gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps)) && fps_draw) { + char mem[128]; MEMORYSTATUS stat; - font_params_t font_parms = {0}; -#if defined(_XBOX1) - float mem_width = font_x + 30; - float mem_height = font_y + 50; -#elif defined(_XBOX360) - float mem_width = (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? 160 : 100; - float mem_height = 70; -#endif - GlobalMemoryStatus(&stat); - - font_parms.x = mem_width; - font_parms.y = mem_height; - font_parms.scale = 0; - font_parms.color = 0; - - if (d3d->font_ctx) - { - font_parms.y = mem_height + 30; - d3d->font_ctx->render_msg(d3d, buf, &font_parms); - } - - snprintf(buf, sizeof(buf), "%.2f MB free / %.2f MB total", stat.dwAvailPhys/(1024.0f*1024.0f), stat.dwTotalPhys/(1024.0f*1024.0f)); - - if (d3d->font_ctx) - d3d->font_ctx->render_msg(d3d, buf, &font_parms); + snprintf(mem, sizeof(mem) "|| MEM: %.2f/%.2f MB", stat.dwAvailPhys/(1024.0f*1024.0f), stat.dwTotalPhys/(1024.0f*1024.0f)); + strlcat(buf_fps, mem, sizeof(buf_fps)); + msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1); } }