diff --git a/gfx/drivers/drm_gfx.c b/gfx/drivers/drm_gfx.c index 4bf3a8aeae..aebc6af346 100644 --- a/gfx/drivers/drm_gfx.c +++ b/gfx/drivers/drm_gfx.c @@ -793,9 +793,6 @@ static bool drm_gfx_frame(void *data, const void *frame, unsigned width, menu_driver_frame(video_info); #endif - video_info->cb_update_window_title( - video_info->context_data, video_info); - /* Update main surface: locate free page, blit and flip. */ drm_surface_update(_drmvars, frame, _drmvars->main_surface); return true; diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c index 7fe0814d7b..373af50c1e 100644 --- a/gfx/drivers/gdi_gfx.c +++ b/gfx/drivers/gdi_gfx.c @@ -362,9 +362,6 @@ static bool gdi_gfx_frame(void *data, const void *frame, InvalidateRect(hwnd, NULL, false); - video_info->cb_update_window_title( - video_info->context_data, video_info); - return true; } diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index a0819cf463..c33bf83f35 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -3076,10 +3076,6 @@ static bool gl2_frame(void *data, const void *frame, font_driver_render_msg(video_info, NULL, msg, NULL); } - if (video_info->cb_update_window_title) - video_info->cb_update_window_title( - video_info->context_data, video_info); - /* Reset state which could easily mess up libretro core. */ if (gl->hw_render_fbo_init) { diff --git a/gfx/drivers/gl1.c b/gfx/drivers/gl1.c index f0b91ba5f6..7f0383166e 100644 --- a/gfx/drivers/gl1.c +++ b/gfx/drivers/gl1.c @@ -883,9 +883,6 @@ static bool gl1_gfx_frame(void *data, const void *frame, if (msg) font_driver_render_msg(video_info, NULL, msg, NULL); - video_info->cb_update_window_title( - video_info->context_data, video_info); - /* Screenshots. */ if (gl1->readback_buffer_screenshot) gl1_readback(gl1, diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c index 76acada37f..15692c604f 100644 --- a/gfx/drivers/gl_core.c +++ b/gfx/drivers/gl_core.c @@ -1732,9 +1732,6 @@ static bool gl_core_frame(void *data, const void *frame, font_driver_render_msg(video_info, NULL, msg, NULL); } - video_info->cb_update_window_title( - video_info->context_data, video_info); - if (gl->readback_buffer_screenshot) { /* For screenshots, just do the regular slow readback. */ diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c index aeab3b8ca2..3979b2bdb2 100644 --- a/gfx/drivers/vg.c +++ b/gfx/drivers/vg.c @@ -442,8 +442,6 @@ static bool vg_frame(void *data, const void *frame, vg_draw_message(vg, msg); #endif - video_info->cb_update_window_title( - video_info->context_data, video_info); video_info->cb_swap_buffers( video_info->context_data, video_info); diff --git a/gfx/drivers/vga_gfx.c b/gfx/drivers/vga_gfx.c index d4f969933c..06ea6bcfc2 100644 --- a/gfx/drivers/vga_gfx.c +++ b/gfx/drivers/vga_gfx.c @@ -242,9 +242,6 @@ static bool vga_gfx_frame(void *data, const void *frame, if (msg) font_driver_render_msg(video_info, NULL, msg, NULL); - video_info->cb_update_window_title( - video_info->context_data, video_info); - return true; } diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c index c803fbbbac..00a55e1b2e 100644 --- a/gfx/drivers/vulkan.c +++ b/gfx/drivers/vulkan.c @@ -2094,10 +2094,6 @@ static bool vulkan_frame(void *data, const void *frame, video_info->cb_swap_buffers(video_info->context_data, video_info); - if (!vk->context->swap_interval_emulation_lock) - video_info->cb_update_window_title( - video_info->context_data, video_info); - /* Handle spurious swapchain invalidations as soon as we can, * i.e. right after swap buffers. */ if (vk->should_resize) diff --git a/retroarch.c b/retroarch.c index 0a80d3e55d..57060407ba 100644 --- a/retroarch.c +++ b/retroarch.c @@ -19383,10 +19383,6 @@ bool video_driver_started_fullscreen(void) /* Stub functions */ -static void update_window_title_null(void *data, void *data2) -{ -} - static void swap_buffers_null(void *data, void *data2) { } @@ -19488,9 +19484,6 @@ static void video_context_driver_reset(void) if (!current_video_context.get_metrics) current_video_context.get_metrics = get_metrics_null; - if (!current_video_context.update_window_title) - current_video_context.update_window_title = update_window_title_null; - if (!current_video_context.set_resize) current_video_context.set_resize = set_resize_null; @@ -19519,7 +19512,6 @@ void video_context_driver_destroy(void) current_video_context.get_video_output_next = NULL; current_video_context.get_metrics = get_metrics_null; current_video_context.translate_aspect = NULL; - current_video_context.update_window_title = update_window_title_null; current_video_context.check_window = NULL; current_video_context.set_resize = set_resize_null; current_video_context.suppress_screensaver = NULL; @@ -21287,6 +21279,12 @@ static void video_driver_frame(const void *data, unsigned width, video_driver_frame_count, (unsigned)pitch, video_driver_msg, &video_info); + /* TODO/FIXME - if we are in fullscreen, we should + * not call this function */ + if (current_video_context.update_window_title) + current_video_context.update_window_title( + video_info.context_data, &video_info); + video_driver_frame_count++; /* Display the FPS, with a higher priority. */ @@ -21532,7 +21530,6 @@ void video_driver_build_info(video_frame_info_t *video_info) video_info->input_driver_nonblock_state = input_driver_nonblock_state; video_info->context_data = video_context_data; - video_info->cb_update_window_title = current_video_context.update_window_title; video_info->cb_swap_buffers = current_video_context.swap_buffers; video_info->cb_get_metrics = current_video_context.get_metrics; video_info->cb_set_resize = current_video_context.set_resize; diff --git a/retroarch.h b/retroarch.h index af05233bb8..cc7c5755d3 100644 --- a/retroarch.h +++ b/retroarch.h @@ -1197,7 +1197,6 @@ typedef struct video_frame_info enum text_alignment text_align; } osd_stat_params; - void (*cb_update_window_title)(void*, void *); void (*cb_swap_buffers)(void*, void *); bool (*cb_get_metrics)(void *data, enum display_metric_types type, float *value);