diff --git a/gfx/common/dxgi_common.c b/gfx/common/dxgi_common.c index 013d0c98c7..649a6c6269 100644 --- a/gfx/common/dxgi_common.c +++ b/gfx/common/dxgi_common.c @@ -303,7 +303,7 @@ void dxgi_copy( #pragma warning(default : 4293) #endif -void dxgi_update_title(video_frame_info_t* video_info) +void dxgi_update_title(void) { #ifndef __WINRT__ const ui_window_t* window = ui_companion_driver_get_window_ptr(); diff --git a/gfx/common/dxgi_common.h b/gfx/common/dxgi_common.h index 01a3e282c9..b69b37186f 100644 --- a/gfx/common/dxgi_common.h +++ b/gfx/common/dxgi_common.h @@ -830,7 +830,7 @@ void dxgi_copy( int dst_pitch, void* dst_data); -void dxgi_update_title(video_frame_info_t* video_info); +void dxgi_update_title(void); DXGI_FORMAT glslang_format_to_dxgi(glslang_format fmt); diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c index 6e036692ec..712dde6450 100644 --- a/gfx/common/x11_common.c +++ b/gfx/common/x11_common.c @@ -678,9 +678,8 @@ bool x11_connect(void) return true; } -void x11_update_title(void *data, void *data2) +void x11_update_title(void *data) { - video_frame_info_t *video_info = (video_frame_info_t*)data2; char title[128]; title[0] = '\0'; diff --git a/gfx/common/x11_common.h b/gfx/common/x11_common.h index 17a775a34c..ffc205a36e 100644 --- a/gfx/common/x11_common.h +++ b/gfx/common/x11_common.h @@ -63,7 +63,7 @@ bool x11_alive(void *data); bool x11_connect(void); -void x11_update_title(void *data, void *data2); +void x11_update_title(void *data); bool x11_input_ctx_new(bool true_full); diff --git a/gfx/drivers/d3d10.c b/gfx/drivers/d3d10.c index 96e94d6ffa..e93dc451e1 100644 --- a/gfx/drivers/d3d10.c +++ b/gfx/drivers/d3d10.c @@ -1516,7 +1516,7 @@ static bool d3d10_gfx_frame( D3D10SetBlendState(d3d10->device, d3d10->blend_enable, NULL, D3D10_DEFAULT_SAMPLE_MASK); D3D10SetVertexBuffer(d3d10->device, 0, d3d10->sprites.vbo, sizeof(d3d10_sprite_t), 0); font_driver_render_msg(d3d10, video_info, msg, NULL, NULL); - dxgi_update_title(video_info); + dxgi_update_title(); } d3d10->sprites.enabled = false; diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c index d7819f29cd..cecef83e08 100644 --- a/gfx/drivers/d3d11.c +++ b/gfx/drivers/d3d11.c @@ -1592,7 +1592,7 @@ static bool d3d11_gfx_frame( D3D11SetBlendState(d3d11->context, d3d11->blend_enable, NULL, D3D11_DEFAULT_SAMPLE_MASK); D3D11SetVertexBuffer(context, 0, d3d11->sprites.vbo, sizeof(d3d11_sprite_t), 0); font_driver_render_msg(d3d11, video_info, msg, NULL, NULL); - dxgi_update_title(video_info); + dxgi_update_title(); } d3d11->sprites.enabled = false; diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c index 0e4787e268..23be1572dd 100644 --- a/gfx/drivers/d3d12.c +++ b/gfx/drivers/d3d12.c @@ -1574,7 +1574,7 @@ static bool d3d12_gfx_frame( D3D12IASetVertexBuffers(d3d12->queue.cmd, 0, 1, &d3d12->sprites.vbo_view); font_driver_render_msg(d3d12, video_info, msg, NULL, NULL); - dxgi_update_title(video_info); + dxgi_update_title(); } d3d12->sprites.enabled = false; diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c index 35e1ad09d5..4e3a325fe4 100644 --- a/gfx/drivers/d3d8.c +++ b/gfx/drivers/d3d8.c @@ -1461,7 +1461,7 @@ static void d3d8_get_overlay_interface(void *data, } #endif -static void d3d8_update_title(video_frame_info_t *video_info) +static void d3d8_update_title(void) { #ifndef _XBOX const ui_window_t *window = ui_companion_driver_get_window_ptr(); @@ -1586,7 +1586,7 @@ static bool d3d8_frame(void *data, const void *frame, d3d8_end_scene(d3d->dev); } - d3d8_update_title(video_info); + d3d8_update_title(); d3d8_swap(d3d, d3d->dev); return true; diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c index 1f8821bdc5..6b9745a160 100644 --- a/gfx/drivers/d3d9.c +++ b/gfx/drivers/d3d9.c @@ -1511,7 +1511,7 @@ static void d3d9_get_overlay_interface(void *data, } #endif -static void d3d9_update_title(video_frame_info_t *video_info) +static void d3d9_update_title(void) { #ifndef _XBOX const ui_window_t *window = ui_companion_driver_get_window_ptr(); @@ -1651,7 +1651,7 @@ static bool d3d9_frame(void *data, const void *frame, d3d9_end_scene(d3d->dev); } - d3d9_update_title(video_info); + d3d9_update_title(); d3d9_swap(d3d, d3d->dev); return true; diff --git a/gfx/drivers/drm_gfx.c b/gfx/drivers/drm_gfx.c index c748b26b08..3f5f8549b4 100644 --- a/gfx/drivers/drm_gfx.c +++ b/gfx/drivers/drm_gfx.c @@ -794,7 +794,7 @@ static bool drm_gfx_frame(void *data, const void *frame, unsigned width, #endif video_info->cb_update_window_title( - video_info->context_data, video_info); + video_info->context_data); /* Update main surface: locate free page, blit and flip. */ drm_surface_update(_drmvars, frame, _drmvars->main_surface); diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c index e1bc5b0e9e..96e49919b4 100644 --- a/gfx/drivers/gdi_gfx.c +++ b/gfx/drivers/gdi_gfx.c @@ -366,7 +366,7 @@ 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); + video_info->context_data); return true; } diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 1ee69af43b..eed632d011 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -3069,7 +3069,7 @@ static bool gl2_frame(void *data, const void *frame, if (video_info->cb_update_window_title) video_info->cb_update_window_title( - video_info->context_data, video_info); + video_info->context_data); /* 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 1e8379ae61..1cacab1c4f 100644 --- a/gfx/drivers/gl1.c +++ b/gfx/drivers/gl1.c @@ -892,7 +892,7 @@ static bool gl1_gfx_frame(void *data, const void *frame, font_driver_render_msg(gl1, video_info, msg, NULL, NULL); video_info->cb_update_window_title( - video_info->context_data, video_info); + video_info->context_data); /* Screenshots. */ if (gl1->readback_buffer_screenshot) diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c index 3535df174d..362fcf9487 100644 --- a/gfx/drivers/gl_core.c +++ b/gfx/drivers/gl_core.c @@ -1941,7 +1941,7 @@ static bool gl_core_frame(void *data, const void *frame, } video_info->cb_update_window_title( - video_info->context_data, video_info); + video_info->context_data); if (gl->readback_buffer_screenshot) { diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c index f33bd17b70..ca83ef7047 100644 --- a/gfx/drivers/vg.c +++ b/gfx/drivers/vg.c @@ -453,7 +453,7 @@ static bool vg_frame(void *data, const void *frame, #endif video_info->cb_update_window_title( - video_info->context_data, video_info); + video_info->context_data); 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 01bbd37412..260838c2a9 100644 --- a/gfx/drivers/vga_gfx.c +++ b/gfx/drivers/vga_gfx.c @@ -245,7 +245,7 @@ static bool vga_gfx_frame(void *data, const void *frame, font_driver_render_msg(data, video_info, msg, NULL, NULL); video_info->cb_update_window_title( - video_info->context_data, video_info); + video_info->context_data); return true; } diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c index 554a9c247d..d9224e786b 100644 --- a/gfx/drivers/vulkan.c +++ b/gfx/drivers/vulkan.c @@ -2110,7 +2110,7 @@ static bool vulkan_frame(void *data, const void *frame, if (!vk->context->swap_interval_emulation_lock) video_info->cb_update_window_title( - video_info->context_data, video_info); + video_info->context_data); /* Handle spurious swapchain invalidations as soon as we can, * i.e. right after swap buffers. */ diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c index 3d536a92ae..21be1d9bed 100644 --- a/gfx/drivers/xvideo.c +++ b/gfx/drivers/xvideo.c @@ -871,7 +871,7 @@ static bool xv_frame(void *data, const void *frame, unsigned width, true); XSync(g_x11_dpy, False); - x11_update_title(NULL, video_info); + x11_update_title(NULL); return true; } diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m index 02b82f5db4..975517edf5 100644 --- a/gfx/drivers_context/cocoa_gl_ctx.m +++ b/gfx/drivers_context/cocoa_gl_ctx.m @@ -369,7 +369,7 @@ float cocoagl_gfx_ctx_get_native_scale(void) } #if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL) -static void cocoagl_gfx_ctx_update_title(void *data, void *data2) +static void cocoagl_gfx_ctx_update_title(void *data) { const ui_window_t *window = ui_companion_driver_get_window_ptr(); diff --git a/gfx/drivers_context/fpga_ctx.c b/gfx/drivers_context/fpga_ctx.c index 9809288c10..b0093d777f 100644 --- a/gfx/drivers_context/fpga_ctx.c +++ b/gfx/drivers_context/fpga_ctx.c @@ -50,7 +50,7 @@ static bool gfx_ctx_fpga_set_resize(void *data, return false; } -static void gfx_ctx_fpga_update_title(void *data, void *data2) +static void gfx_ctx_fpga_update_title(void *data) { char title[128]; diff --git a/gfx/drivers_context/gdi_ctx.c b/gfx/drivers_context/gdi_ctx.c index 17c16f9f2c..08483e1d17 100644 --- a/gfx/drivers_context/gdi_ctx.c +++ b/gfx/drivers_context/gdi_ctx.c @@ -68,9 +68,8 @@ static bool gfx_ctx_gdi_set_resize(void *data, return false; } -static void gfx_ctx_gdi_update_title(void *data, void *data2) +static void gfx_ctx_gdi_update_title(void *data) { - 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]; diff --git a/gfx/drivers_context/network_ctx.c b/gfx/drivers_context/network_ctx.c index 25534f991c..1670f85878 100644 --- a/gfx/drivers_context/network_ctx.c +++ b/gfx/drivers_context/network_ctx.c @@ -48,10 +48,6 @@ static bool gfx_ctx_network_set_resize(void *data, return false; } -static void gfx_ctx_network_update_window_title(void *data, void *data2) -{ -} - static void gfx_ctx_network_get_video_size(void *data, unsigned *width, unsigned *height) { @@ -170,7 +166,7 @@ const gfx_ctx_driver_t gfx_ctx_network = { NULL, /* get_video_output_next */ gfx_ctx_network_get_metrics, NULL, - gfx_ctx_network_update_window_title, + NULL, /* update_title */ gfx_ctx_network_check_window, gfx_ctx_network_set_resize, gfx_ctx_network_has_focus, diff --git a/gfx/drivers_context/sdl_gl_ctx.c b/gfx/drivers_context/sdl_gl_ctx.c index 4a3e3d4486..e270436018 100644 --- a/gfx/drivers_context/sdl_gl_ctx.c +++ b/gfx/drivers_context/sdl_gl_ctx.c @@ -285,7 +285,7 @@ static void sdl_ctx_get_video_size(void *data, } } -static void sdl_ctx_update_title(void *data, void *data2) +static void sdl_ctx_update_title(void *data) { char title[128]; title[0] = '\0'; diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c index 76618f11e2..3101735492 100644 --- a/gfx/drivers_context/wayland_ctx.c +++ b/gfx/drivers_context/wayland_ctx.c @@ -1146,7 +1146,7 @@ static bool gfx_ctx_wl_set_resize(void *data, unsigned width, unsigned height) return true; } -static void gfx_ctx_wl_update_title(void *data, void *data2) +static void gfx_ctx_wl_update_title(void *data) { gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data; char title[128]; diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c index c647cfd9a3..2c2206b6b9 100644 --- a/gfx/drivers_context/wgl_ctx.c +++ b/gfx/drivers_context/wgl_ctx.c @@ -594,9 +594,8 @@ static bool gfx_ctx_wgl_set_resize(void *data, return false; } -static void gfx_ctx_wgl_update_title(void *data, void *data2) +static void gfx_ctx_wgl_update_title(void *data) { - video_frame_info_t* video_info = (video_frame_info_t*)data2; char title[128]; title[0] = '\0'; diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c index 592c328b95..b812f5e042 100644 --- a/gfx/drivers_context/x_ctx.c +++ b/gfx/drivers_context/x_ctx.c @@ -779,7 +779,7 @@ static bool gfx_ctx_x_set_video_mode(void *data, } x11_set_window_attr(g_x11_dpy, g_x11_win); - x11_update_title(NULL, video_info); + x11_update_title(NULL); if (fullscreen) x11_show_mouse(g_x11_dpy, g_x11_win, false); diff --git a/gfx/drivers_context/xegl_ctx.c b/gfx/drivers_context/xegl_ctx.c index dd172132b5..9ed5f32218 100644 --- a/gfx/drivers_context/xegl_ctx.c +++ b/gfx/drivers_context/xegl_ctx.c @@ -385,7 +385,7 @@ static bool gfx_ctx_xegl_set_video_mode(void *data, goto error; x11_set_window_attr(g_x11_dpy, g_x11_win); - x11_update_title(NULL, video_info); + x11_update_title(NULL); if (fullscreen) x11_show_mouse(g_x11_dpy, g_x11_win, false); diff --git a/retroarch.c b/retroarch.c index 67ccd0dcae..b3a5ef1788 100644 --- a/retroarch.c +++ b/retroarch.c @@ -21771,7 +21771,7 @@ bool video_driver_started_fullscreen(void) /* Stub functions */ -static void update_window_title_null(void *data, void *data2) { } +static void update_window_title_null(void *data) { } static void swap_buffers_null(void *data, void *data2) { } static bool get_metrics_null(void *data, enum display_metric_types type, float *value) { return false; } diff --git a/retroarch.h b/retroarch.h index e171b46b44..0936ec7b1a 100644 --- a/retroarch.h +++ b/retroarch.h @@ -1187,7 +1187,7 @@ typedef struct video_frame_info enum text_alignment text_align; } osd_stat_params; - void (*cb_update_window_title)(void*, void *); + void (*cb_update_window_title)(void*); void (*cb_swap_buffers)(void*, void *); bool (*cb_get_metrics)(void *data, enum display_metric_types type, float *value); @@ -1197,7 +1197,7 @@ typedef struct video_frame_info void *userdata; } video_frame_info_t; -typedef void (*update_window_title_cb)(void*, void*); +typedef void (*update_window_title_cb)(void*); typedef bool (*get_metrics_cb)(void *data, enum display_metric_types type, float *value); typedef bool (*set_resize_cb)(void*, unsigned, unsigned);