Cleanups of update_window_title functions

This commit is contained in:
twinaphex 2019-09-22 03:05:06 +02:00
parent ccc2bea0c4
commit 03bddff8e6
10 changed files with 15 additions and 42 deletions

View File

@ -3064,8 +3064,9 @@ static bool gl2_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 (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)

View File

@ -615,10 +615,6 @@ static void android_gfx_ctx_set_flags(void *data, uint32_t flags)
(void)flags;
}
static void android_gfx_update_window_title(void *data, void *data2)
{
}
const gfx_ctx_driver_t gfx_ctx_android = {
android_gfx_ctx_init,
android_gfx_ctx_destroy,
@ -633,7 +629,7 @@ const gfx_ctx_driver_t gfx_ctx_android = {
NULL, /* get_video_output_next */
android_gfx_ctx_get_metrics,
NULL,
android_gfx_update_window_title,
NULL, /* update_title */
android_gfx_ctx_check_window,
android_gfx_ctx_set_resize,
android_gfx_ctx_has_focus,

View File

@ -928,10 +928,6 @@ static void gfx_ctx_drm_set_flags(void *data, uint32_t flags)
drm->core_hw_context_enable = true;
}
void gfx_ctx_drm_update_window_title(void *data, void *data2)
{
}
const gfx_ctx_driver_t gfx_ctx_drm = {
gfx_ctx_drm_init,
gfx_ctx_drm_destroy,
@ -946,7 +942,7 @@ const gfx_ctx_driver_t gfx_ctx_drm = {
NULL, /* get_video_output_next */
NULL, /* get_metrics */
NULL,
gfx_ctx_drm_update_window_title,
NULL, /* update_title */
gfx_ctx_drm_check_window,
NULL, /* set_resize */
gfx_ctx_drm_has_focus,

View File

@ -50,7 +50,7 @@ static bool gfx_ctx_fpga_set_resize(void *data,
return false;
}
static void gfx_ctx_fpga_update_window_title(void *data, void *data2)
static void gfx_ctx_fpga_update_title(void *data, void *data2)
{
char title[128];
@ -176,7 +176,7 @@ const gfx_ctx_driver_t gfx_ctx_fpga = {
NULL, /* get_video_output_next */
gfx_ctx_fpga_get_metrics,
NULL,
gfx_ctx_fpga_update_window_title,
gfx_ctx_fpga_update_title,
gfx_ctx_fpga_check_window,
gfx_ctx_fpga_set_resize,
gfx_ctx_fpga_has_focus,

View File

@ -68,10 +68,10 @@ static bool gfx_ctx_gdi_set_resize(void *data,
return false;
}
static void gfx_ctx_gdi_update_window_title(void *data, void *data2)
static void gfx_ctx_gdi_update_title(void *data, void *data2)
{
video_frame_info_t* video_info = (video_frame_info_t*)data2;
const ui_window_t *window = ui_companion_driver_get_window_ptr();
const ui_window_t *window = ui_companion_driver_get_window_ptr();
char title[128];
title[0] = '\0';
@ -288,7 +288,7 @@ const gfx_ctx_driver_t gfx_ctx_gdi = {
NULL, /* get_video_output_next */
win32_get_metrics,
NULL,
gfx_ctx_gdi_update_window_title,
gfx_ctx_gdi_update_title,
gfx_ctx_gdi_check_window,
gfx_ctx_gdi_set_resize,
gfx_ctx_gdi_has_focus,

View File

@ -276,10 +276,6 @@ static void *gfx_ctx_khr_display_get_context_data(void *data)
return &khr->vk.context;
}
static void gfx_ctx_khr_display_update_window_title(void *data, void *data2)
{
}
const gfx_ctx_driver_t gfx_ctx_khr_display = {
gfx_ctx_khr_display_init,
gfx_ctx_khr_display_destroy,
@ -294,7 +290,7 @@ const gfx_ctx_driver_t gfx_ctx_khr_display = {
NULL, /* get_video_output_next */
NULL, /* get_metrics */
NULL,
gfx_ctx_khr_display_update_window_title,
NULL, /* update_title */
gfx_ctx_khr_display_check_window,
gfx_ctx_khr_display_set_resize,
gfx_ctx_khr_display_has_focus,

View File

@ -305,10 +305,6 @@ static float gfx_ctx_mali_fbdev_get_refresh_rate(void *data)
return mali->refresh_rate;
}
static void gfx_ctx_mali_fbdev_update_window_title(void *data, void *data2)
{
}
const gfx_ctx_driver_t gfx_ctx_mali_fbdev = {
gfx_ctx_mali_fbdev_init,
gfx_ctx_mali_fbdev_destroy,
@ -323,7 +319,7 @@ const gfx_ctx_driver_t gfx_ctx_mali_fbdev = {
NULL, /* get_video_output_next */
NULL, /* get_metrics */
NULL,
gfx_ctx_mali_fbdev_update_window_title,
NULL, /* update_title */
gfx_ctx_mali_fbdev_check_window,
NULL, /* set_resize */
gfx_ctx_mali_fbdev_has_focus,

View File

@ -287,10 +287,6 @@ static float orbis_ctx_get_refresh_rate(void *data)
return ctx_orbis->refresh_rate;
}
static void orbis_ctx_update_window_title(void *data, void *data2)
{
}
const gfx_ctx_driver_t orbis_ctx = {
orbis_ctx_init,
orbis_ctx_destroy,
@ -305,7 +301,7 @@ const gfx_ctx_driver_t orbis_ctx = {
NULL, /* get_video_output_next */
NULL, /* get_metrics */
NULL,
orbis_ctx_update_window_title,
NULL, /* update_title */
orbis_ctx_check_window,
NULL, /* set_resize */
orbis_ctx_has_focus,

View File

@ -409,10 +409,6 @@ static void gfx_ctx_ps3_set_flags(void *data, uint32_t flags)
(void)data;
}
static void gfx_ctx_ps3_update_window_title(void *data, void *data2)
{
}
const gfx_ctx_driver_t gfx_ctx_ps3 = {
gfx_ctx_ps3_init,
gfx_ctx_ps3_destroy,
@ -427,7 +423,7 @@ const gfx_ctx_driver_t gfx_ctx_ps3 = {
gfx_ctx_ps3_get_video_output_next,
NULL, /* get_metrics */
NULL,
gfx_ctx_ps3_update_window_title,
NULL, /* update_title */
gfx_ctx_ps3_check_window,
NULL, /* set_resize */
gfx_ctx_ps3_has_focus,

View File

@ -48,10 +48,6 @@ static bool gfx_ctx_sixel_set_resize(void *data,
return false;
}
static void gfx_ctx_sixel_update_window_title(void *data, void *data2)
{
}
static void gfx_ctx_sixel_get_video_size(void *data,
unsigned *width, unsigned *height)
{
@ -170,7 +166,7 @@ const gfx_ctx_driver_t gfx_ctx_sixel = {
NULL, /* get_video_output_next */
gfx_ctx_sixel_get_metrics,
NULL,
gfx_ctx_sixel_update_window_title,
NULL, /* update_title */
gfx_ctx_sixel_check_window,
gfx_ctx_sixel_set_resize,
gfx_ctx_sixel_has_focus,