diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index d6362c90c1..1890205207 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -73,7 +73,7 @@ static void emscripten_mainloop(void)
       if ((emscripten_frame_count & 1) == 0)
       {
          glClear(GL_COLOR_BUFFER_BIT);
-         video_info.cb_swap_buffers(video_info.context_data, &video_info);
+         video_info.cb_swap_buffers(video_info.context_data);
          return;
       }
    }
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index eed632d011..a559c55880 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -3103,12 +3103,12 @@ static bool gl2_frame(void *data, const void *frame,
          && !video_info->runloop_is_slowmotion
          && !video_info->runloop_is_paused)
    {
-      video_info->cb_swap_buffers(video_info->context_data, video_info);
+      video_info->cb_swap_buffers(video_info->context_data);
       glClear(GL_COLOR_BUFFER_BIT);
    }
 #endif
 
-   video_info->cb_swap_buffers(video_info->context_data, video_info);
+   video_info->cb_swap_buffers(video_info->context_data);
 
    /* check if we are fast forwarding or in menu, if we are ignore hard sync */
    if (  gl->have_sync
diff --git a/gfx/drivers/gl1.c b/gfx/drivers/gl1.c
index 1cacab1c4f..48f5b37e3e 100644
--- a/gfx/drivers/gl1.c
+++ b/gfx/drivers/gl1.c
@@ -910,12 +910,12 @@ static bool gl1_gfx_frame(void *data, const void *frame,
          && !video_info->runloop_is_slowmotion
          && !video_info->runloop_is_paused)
    {
-      video_info->cb_swap_buffers(video_info->context_data, video_info);
+      video_info->cb_swap_buffers(video_info->context_data);
       glClear(GL_COLOR_BUFFER_BIT);
    }
 #endif
 
-   video_info->cb_swap_buffers(video_info->context_data, video_info);
+   video_info->cb_swap_buffers(video_info->context_data);
 
    /* check if we are fast forwarding or in menu, if we are ignore hard sync */
    if (video_info->hard_sync
diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c
index 362fcf9487..ccffb54f86 100644
--- a/gfx/drivers/gl_core.c
+++ b/gfx/drivers/gl_core.c
@@ -1965,11 +1965,11 @@ static bool gl_core_frame(void *data, const void *frame,
          && !video_info->runloop_is_slowmotion
          && !video_info->runloop_is_paused)
    {
-      video_info->cb_swap_buffers(video_info->context_data, video_info);
+      video_info->cb_swap_buffers(video_info->context_data);
       glClear(GL_COLOR_BUFFER_BIT);
    }
 
-   video_info->cb_swap_buffers(video_info->context_data, video_info);
+   video_info->cb_swap_buffers(video_info->context_data);
 
    if (video_info->hard_sync &&
        !video_info->input_driver_nonblock_state &&
diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c
index ca83ef7047..6fccd6d289 100644
--- a/gfx/drivers/vg.c
+++ b/gfx/drivers/vg.c
@@ -454,8 +454,7 @@ static bool vg_frame(void *data, const void *frame,
 
    video_info->cb_update_window_title(
          video_info->context_data);
-   video_info->cb_swap_buffers(
-         video_info->context_data, video_info);
+   video_info->cb_swap_buffers(video_info->context_data);
 
    return true;
 }
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index d9224e786b..061d8f1d73 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -1658,7 +1658,7 @@ static void vulkan_inject_black_frame(vk_t *vk, video_frame_info_t *video_info)
    slock_unlock(vk->context->queue_lock);
 #endif
 
-   video_info->cb_swap_buffers(video_info->context_data, video_info);
+   video_info->cb_swap_buffers(video_info->context_data);
 }
 
 static bool vulkan_frame(void *data, const void *frame,
@@ -2106,7 +2106,7 @@ static bool vulkan_frame(void *data, const void *frame,
    slock_unlock(vk->context->queue_lock);
 #endif
 
-   video_info->cb_swap_buffers(video_info->context_data, video_info);
+   video_info->cb_swap_buffers(video_info->context_data);
 
    if (!vk->context->swap_interval_emulation_lock)
       video_info->cb_update_window_title(
diff --git a/gfx/drivers_context/android_ctx.c b/gfx/drivers_context/android_ctx.c
index efe433b88a..de1a87dfaf 100644
--- a/gfx/drivers_context/android_ctx.c
+++ b/gfx/drivers_context/android_ctx.c
@@ -510,7 +510,7 @@ dpi_fallback:
    return true;
 }
 
-static void android_gfx_ctx_swap_buffers(void *data, void *data2)
+static void android_gfx_ctx_swap_buffers(void *data)
 {
    android_ctx_data_t *and  = (android_ctx_data_t*)data;
 
diff --git a/gfx/drivers_context/cgl_ctx.c b/gfx/drivers_context/cgl_ctx.c
index 2e00227199..feb018e67b 100644
--- a/gfx/drivers_context/cgl_ctx.c
+++ b/gfx/drivers_context/cgl_ctx.c
@@ -97,7 +97,7 @@ static void gfx_ctx_cgl_check_window(void *data, bool *quit,
    }
 }
 
-static void gfx_ctx_cgl_swap_buffers(void *data, void *data2)
+static void gfx_ctx_cgl_swap_buffers(void *data)
 {
    gfx_ctx_cgl_data_t *cgl = (gfx_ctx_cgl_data_t*)data;
 
diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index 975517edf5..725e352baf 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -616,7 +616,7 @@ static void cocoagl_gfx_ctx_swap_interval(void *data, int i)
    }
 }
 
-static void cocoagl_gfx_ctx_swap_buffers(void *data, void *data2)
+static void cocoagl_gfx_ctx_swap_buffers(void *data)
 {
 #ifdef HAVE_VULKAN
    cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data;
diff --git a/gfx/drivers_context/drm_ctx.c b/gfx/drivers_context/drm_ctx.c
index e5f518b922..fc73a6cd4f 100644
--- a/gfx/drivers_context/drm_ctx.c
+++ b/gfx/drivers_context/drm_ctx.c
@@ -245,10 +245,9 @@ static void gfx_ctx_drm_check_window(void *data, bool *quit,
 }
 
 #ifdef HAVE_ODROIDGO2
-static void gfx_ctx_drm_swap_buffers(void *data, void *data2)
+static void gfx_ctx_drm_swap_buffers(void *data)
 {
    gfx_ctx_drm_data_t        *drm = (gfx_ctx_drm_data_t*)data;
-   video_frame_info_t *video_info = (video_frame_info_t*)data2;
 
    switch (drm_api)
    {
@@ -273,10 +272,11 @@ static void gfx_ctx_drm_swap_buffers(void *data, void *data2)
    }
 }
 #else
-static void gfx_ctx_drm_swap_buffers(void *data, void *data2)
+static void gfx_ctx_drm_swap_buffers(void *data)
 {
    gfx_ctx_drm_data_t        *drm = (gfx_ctx_drm_data_t*)data;
-   video_frame_info_t *video_info = (video_frame_info_t*)data2;
+   settings_t *settings           = config_get_ptr();
+   unsigned max_swapchain_images  = settings->uints.video_max_swapchain_images;
 
    switch (drm_api)
    {
@@ -302,7 +302,7 @@ static void gfx_ctx_drm_swap_buffers(void *data, void *data2)
    waiting_for_flip = gfx_ctx_drm_queue_flip();
 
    /* Triple-buffered page flips */
-   if (video_info->max_swapchain_images >= 3 &&
+   if (max_swapchain_images >= 3 &&
          gbm_surface_has_free_buffers(g_gbm_surface))
       return;
 
diff --git a/gfx/drivers_context/emscriptenegl_ctx.c b/gfx/drivers_context/emscriptenegl_ctx.c
index e0c059d954..351a459bfe 100644
--- a/gfx/drivers_context/emscriptenegl_ctx.c
+++ b/gfx/drivers_context/emscriptenegl_ctx.c
@@ -135,12 +135,12 @@ static void gfx_ctx_emscripten_check_window(void *data, bool *quit,
    *quit       = false;
 }
 
-static void gfx_ctx_emscripten_swap_buffers(void *data, void *data2)
+static void gfx_ctx_emscripten_swap_buffers(void *data)
 {
    emscripten_ctx_data_t *emscripten = (emscripten_ctx_data_t*)data;
 
-   /* doesn't really do anything in WebGL, but it might if we use WebGL workers
-    * in the future */
+   /* doesn't really do anything in WebGL, but it might 
+    * if we use WebGL workers in the future */
 #ifdef HAVE_EGL
    egl_swap_buffers(&emscripten->egl);
 #endif
diff --git a/gfx/drivers_context/fpga_ctx.c b/gfx/drivers_context/fpga_ctx.c
index b0093d777f..1d7f4e57e6 100644
--- a/gfx/drivers_context/fpga_ctx.c
+++ b/gfx/drivers_context/fpga_ctx.c
@@ -159,11 +159,6 @@ static uint32_t gfx_ctx_fpga_get_flags(void *data)
    return flags;
 }
 
-static void gfx_ctx_fpga_swap_buffers(void *data, void *data2)
-{
-   (void)data;
-}
-
 const gfx_ctx_driver_t gfx_ctx_fpga = {
    gfx_ctx_fpga_init,
    gfx_ctx_fpga_destroy,
@@ -182,7 +177,7 @@ const gfx_ctx_driver_t gfx_ctx_fpga = {
    gfx_ctx_fpga_has_focus,
    gfx_ctx_fpga_suppress_screensaver,
    gfx_ctx_fpga_has_windowed,
-   gfx_ctx_fpga_swap_buffers,
+   NULL, /* swap_buffers */
    gfx_ctx_fpga_input_driver,
    NULL,
    NULL,
diff --git a/gfx/drivers_context/gdi_ctx.c b/gfx/drivers_context/gdi_ctx.c
index 08483e1d17..65bf9f0717 100644
--- a/gfx/drivers_context/gdi_ctx.c
+++ b/gfx/drivers_context/gdi_ctx.c
@@ -246,10 +246,8 @@ static uint32_t gfx_ctx_gdi_get_flags(void *data)
    return flags;
 }
 
-static void gfx_ctx_gdi_swap_buffers(void *data, void *data2)
+static void gfx_ctx_gdi_swap_buffers(void *data)
 {
-   (void)data;
-
    SwapBuffers(win32_gdi_hdc);
 }
 
diff --git a/gfx/drivers_context/gfx_null_ctx.c b/gfx/drivers_context/gfx_null_ctx.c
index c9eb03c31f..d461eb3845 100644
--- a/gfx/drivers_context/gfx_null_ctx.c
+++ b/gfx/drivers_context/gfx_null_ctx.c
@@ -34,11 +34,6 @@ static void gfx_ctx_null_check_window(void *data, bool *quit,
    (void)resize;
 }
 
-static void gfx_ctx_null_swap_buffers(void *data, void *data2)
-{
-   (void)data;
-}
-
 static void gfx_ctx_null_get_video_size(void *data, unsigned *width, unsigned *height)
 {
    (void)data;
@@ -157,7 +152,7 @@ const gfx_ctx_driver_t gfx_ctx_null = {
    gfx_ctx_null_has_focus,
    gfx_ctx_null_suppress_screensaver,
    false, /* has_windowed */
-   gfx_ctx_null_swap_buffers,
+   NULL, /* swap_buffers */
    gfx_ctx_null_input_driver,
    NULL,
    NULL,
diff --git a/gfx/drivers_context/khr_display_ctx.c b/gfx/drivers_context/khr_display_ctx.c
index 593fb3000c..b4b81a9f77 100644
--- a/gfx/drivers_context/khr_display_ctx.c
+++ b/gfx/drivers_context/khr_display_ctx.c
@@ -242,7 +242,7 @@ static void gfx_ctx_khr_display_set_swap_interval(void *data,
    }
 }
 
-static void gfx_ctx_khr_display_swap_buffers(void *data, void *data2)
+static void gfx_ctx_khr_display_swap_buffers(void *data)
 {
    khr_display_ctx_data_t *khr = (khr_display_ctx_data_t*)data;
    vulkan_present(&khr->vk, khr->vk.context.current_swapchain_index);
diff --git a/gfx/drivers_context/mali_fbdev_ctx.c b/gfx/drivers_context/mali_fbdev_ctx.c
index a54e0b43ea..0823653229 100644
--- a/gfx/drivers_context/mali_fbdev_ctx.c
+++ b/gfx/drivers_context/mali_fbdev_ctx.c
@@ -253,7 +253,7 @@ static void gfx_ctx_mali_fbdev_set_swap_interval(void *data,
 #endif
 }
 
-static void gfx_ctx_mali_fbdev_swap_buffers(void *data, void *data2)
+static void gfx_ctx_mali_fbdev_swap_buffers(void *data)
 {
    mali_ctx_data_t *mali = (mali_ctx_data_t*)data;
 
diff --git a/gfx/drivers_context/network_ctx.c b/gfx/drivers_context/network_ctx.c
index 1670f85878..a4a50d5626 100644
--- a/gfx/drivers_context/network_ctx.c
+++ b/gfx/drivers_context/network_ctx.c
@@ -147,7 +147,7 @@ static uint32_t gfx_ctx_network_get_flags(void *data)
    return flags;
 }
 
-static void gfx_ctx_network_swap_buffers(void *data, void *data2)
+static void gfx_ctx_network_swap_buffers(void *data)
 {
    (void)data;
 }
diff --git a/gfx/drivers_context/opendingux_fbdev_ctx.c b/gfx/drivers_context/opendingux_fbdev_ctx.c
index 972ad42131..0e20837031 100644
--- a/gfx/drivers_context/opendingux_fbdev_ctx.c
+++ b/gfx/drivers_context/opendingux_fbdev_ctx.c
@@ -211,7 +211,7 @@ static bool gfx_ctx_opendingux_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static void gfx_ctx_opendingux_swap_buffers(void *data, void *data2)
+static void gfx_ctx_opendingux_swap_buffers(void *data)
 {
    opendingux_ctx_data_t *viv = (opendingux_ctx_data_t*)data;
 
diff --git a/gfx/drivers_context/orbis_ctx.c b/gfx/drivers_context/orbis_ctx.c
index 6a871d4b00..5c7ba0d0f0 100644
--- a/gfx/drivers_context/orbis_ctx.c
+++ b/gfx/drivers_context/orbis_ctx.c
@@ -233,7 +233,7 @@ static void orbis_ctx_set_swap_interval(void *data,
 #endif
 }
 
-static void orbis_ctx_swap_buffers(void *data, void *data2)
+static void orbis_ctx_swap_buffers(void *data)
 {
     orbis_ctx_data_t *ctx_orbis = (orbis_ctx_data_t *)data;
 
diff --git a/gfx/drivers_context/osmesa_ctx.c b/gfx/drivers_context/osmesa_ctx.c
index 1c428998f8..365eeacc05 100644
--- a/gfx/drivers_context/osmesa_ctx.c
+++ b/gfx/drivers_context/osmesa_ctx.c
@@ -340,7 +340,7 @@ static bool osmesa_ctx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static void osmesa_ctx_swap_buffers(void *data, void *data2)
+static void osmesa_ctx_swap_buffers(void *data)
 {
    gfx_ctx_osmesa_data_t *osmesa = (gfx_ctx_osmesa_data_t*)data;
    osmesa_fifo_accept(osmesa);
diff --git a/gfx/drivers_context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c
index 5a26a09b25..54c4d2345f 100644
--- a/gfx/drivers_context/ps3_ctx.c
+++ b/gfx/drivers_context/ps3_ctx.c
@@ -173,7 +173,7 @@ static bool gfx_ctx_ps3_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static void gfx_ctx_ps3_swap_buffers(void *data, void *data2)
+static void gfx_ctx_ps3_swap_buffers(void *data)
 {
    (void)data;
 #ifdef HAVE_PSGL
diff --git a/gfx/drivers_context/qnx_ctx.c b/gfx/drivers_context/qnx_ctx.c
index ac9a0e6526..805853eb50 100644
--- a/gfx/drivers_context/qnx_ctx.c
+++ b/gfx/drivers_context/qnx_ctx.c
@@ -413,7 +413,7 @@ static void gfx_ctx_qnx_set_swap_interval(void *data, int swap_interval)
 #endif
 }
 
-static void gfx_ctx_qnx_swap_buffers(void *data, void *data2)
+static void gfx_ctx_qnx_swap_buffers(void *data)
 {
    qnx_ctx_data_t *qnx = (qnx_ctx_data_t*)data;
 
diff --git a/gfx/drivers_context/sdl_gl_ctx.c b/gfx/drivers_context/sdl_gl_ctx.c
index e270436018..085de4627e 100644
--- a/gfx/drivers_context/sdl_gl_ctx.c
+++ b/gfx/drivers_context/sdl_gl_ctx.c
@@ -375,7 +375,7 @@ static bool sdl_ctx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static void sdl_ctx_swap_buffers(void *data, void *data2)
+static void sdl_ctx_swap_buffers(void *data)
 {
 #ifdef HAVE_SDL2
    gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)data;
diff --git a/gfx/drivers_context/sixel_ctx.c b/gfx/drivers_context/sixel_ctx.c
index c0f9b4b847..074e9b16cd 100644
--- a/gfx/drivers_context/sixel_ctx.c
+++ b/gfx/drivers_context/sixel_ctx.c
@@ -147,11 +147,6 @@ static uint32_t gfx_ctx_sixel_get_flags(void *data)
    return flags;
 }
 
-static void gfx_ctx_sixel_swap_buffers(void *data, void *data2)
-{
-   (void)data;
-}
-
 const gfx_ctx_driver_t gfx_ctx_sixel = {
    gfx_ctx_sixel_init,
    gfx_ctx_sixel_destroy,
@@ -172,7 +167,7 @@ const gfx_ctx_driver_t gfx_ctx_sixel = {
    gfx_ctx_sixel_has_focus,
    gfx_ctx_sixel_suppress_screensaver,
    true, /* has_windowed */
-   gfx_ctx_sixel_swap_buffers,
+   NULL, /* swap_buffers */
    gfx_ctx_sixel_input_driver,
    NULL,
    NULL,
diff --git a/gfx/drivers_context/switch_ctx.c b/gfx/drivers_context/switch_ctx.c
index dca656b77c..3101dd1926 100644
--- a/gfx/drivers_context/switch_ctx.c
+++ b/gfx/drivers_context/switch_ctx.c
@@ -240,9 +240,9 @@ static void switch_ctx_set_swap_interval(void *data,
 #endif
 }
 
-static void switch_ctx_swap_buffers(void *data, void *data2)
+static void switch_ctx_swap_buffers(void *data)
 {
-    switch_ctx_data_t *ctx_nx = (switch_ctx_data_t *)data;
+    switch_ctx_data_t *ctx_nx = (switch_ctx_data_t*)data;
 
 #ifdef HAVE_EGL
     egl_swap_buffers(&ctx_nx->egl);
diff --git a/gfx/drivers_context/uwp_egl_ctx.c b/gfx/drivers_context/uwp_egl_ctx.c
index 522acd486a..32d2a8e66b 100644
--- a/gfx/drivers_context/uwp_egl_ctx.c
+++ b/gfx/drivers_context/uwp_egl_ctx.c
@@ -154,18 +154,16 @@ static gfx_ctx_proc_t gfx_ctx_uwp_get_proc_address(const char* symbol)
 }
 
 
-static void gfx_ctx_uwp_swap_buffers(void *data, void *data2)
+static void gfx_ctx_uwp_swap_buffers(void *data)
 {
-   (void)data;
-
    switch (uwp_api)
    {
-   case GFX_CTX_OPENGL_ES_API:
-      egl_swap_buffers(&uwp_egl);
-      break;
-   case GFX_CTX_NONE:
-   default:
-      break;
+      case GFX_CTX_OPENGL_ES_API:
+         egl_swap_buffers(&uwp_egl);
+         break;
+      case GFX_CTX_NONE:
+      default:
+         break;
    }
 }
 
diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
index 2dd03c50c2..a66f9b25ff 100644
--- a/gfx/drivers_context/vc_egl_ctx.c
+++ b/gfx/drivers_context/vc_egl_ctx.c
@@ -194,18 +194,6 @@ static void *gfx_ctx_vc_init(video_frame_info_t *video_info, void *video_driver)
    if (!vc)
        return NULL;
 
-   /* If we set this env variable, Broadcom's EGL implementation will block
-    * on vsync with a double buffer when we call eglSwapBuffers. Less input lag!
-    * Has to be done before any EGL call.
-    * NOTE this is commented out because it should be the right way to do it, but
-    * currently it doesn't work, so we are using an vsync callback based solution.*/
-#if 0
-   if (video_info->max_swapchain_images <= 2)
-      setenv("V3D_DOUBLE_BUFFER", "1", 1);
-   else
-      setenv("V3D_DOUBLE_BUFFER", "0", 1);
-#endif
-
    bcm_host_init();
 
 #ifdef HAVE_EGL
@@ -648,11 +636,12 @@ error:
    return false;
 }
 
-static void gfx_ctx_vc_swap_buffers(void *data, void *data2)
+static void gfx_ctx_vc_swap_buffers(void *data)
 {
 #ifdef HAVE_EGL
    vc_ctx_data_t              *vc = (vc_ctx_data_t*)data;
-   video_frame_info_t *video_info = (video_frame_info_t*)data2;
+   settings_t *settings           = config_get_ptr();
+   unsigned max_swapchain_images  = settings->uints.video_max_swapchain_images;
 
    if (!vc)
       return;
@@ -661,7 +650,7 @@ static void gfx_ctx_vc_swap_buffers(void *data, void *data2)
 
    /* Wait for vsync immediately if we don't
     * want egl_swap_buffers to triple-buffer */
-   if (video_info->max_swapchain_images <= 2)
+   if (max_swapchain_images <= 2)
    {
       /* We DON'T wait to wait without callback function ready! */
       if (!vc->vsync_callback_set)
diff --git a/gfx/drivers_context/vita_ctx.c b/gfx/drivers_context/vita_ctx.c
index 2f4b2a7d66..3af77e3564 100644
--- a/gfx/drivers_context/vita_ctx.c
+++ b/gfx/drivers_context/vita_ctx.c
@@ -48,7 +48,7 @@ static void vita_check_window(void *data, bool *quit,
    *quit = (bool)false;
 }
 
-static void vita_swap_buffers(void *data, void *data2)
+static void vita_swap_buffers(void *data)
 {
    (void)data;
    vglStopRendering();
diff --git a/gfx/drivers_context/vivante_fbdev_ctx.c b/gfx/drivers_context/vivante_fbdev_ctx.c
index bcdb199c18..8625ac1f93 100644
--- a/gfx/drivers_context/vivante_fbdev_ctx.c
+++ b/gfx/drivers_context/vivante_fbdev_ctx.c
@@ -225,7 +225,7 @@ static void gfx_ctx_vivante_set_swap_interval(void *data, int swap_interval)
 #endif
 }
 
-static void gfx_ctx_vivante_swap_buffers(void *data, void *data2)
+static void gfx_ctx_vivante_swap_buffers(void *data)
 {
    vivante_ctx_data_t *viv = (vivante_ctx_data_t*)data;
 
diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c
index 3101735492..2e9d33e06b 100644
--- a/gfx/drivers_context/wayland_ctx.c
+++ b/gfx/drivers_context/wayland_ctx.c
@@ -1816,7 +1816,7 @@ static void *gfx_ctx_wl_get_context_data(void *data)
 }
 #endif
 
-static void gfx_ctx_wl_swap_buffers(void *data, void *data2)
+static void gfx_ctx_wl_swap_buffers(void *data)
 {
    gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
 
diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
index 2c2206b6b9..affcbfda5c 100644
--- a/gfx/drivers_context/wgl_ctx.c
+++ b/gfx/drivers_context/wgl_ctx.c
@@ -536,7 +536,7 @@ static void gfx_ctx_wgl_check_window(void *data, bool *quit,
    }
 }
 
-static void gfx_ctx_wgl_swap_buffers(void *data, void *data2)
+static void gfx_ctx_wgl_swap_buffers(void *data)
 {
    (void)data;
 
diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c
index b812f5e042..41cd07eb87 100644
--- a/gfx/drivers_context/x_ctx.c
+++ b/gfx/drivers_context/x_ctx.c
@@ -354,7 +354,7 @@ static void gfx_ctx_x_swap_interval(void *data, int interval)
    }
 }
 
-static void gfx_ctx_x_swap_buffers(void *data, void *data2)
+static void gfx_ctx_x_swap_buffers(void *data)
 {
    gfx_ctx_x_data_t *x = (gfx_ctx_x_data_t*)data;
 
diff --git a/gfx/drivers_context/xegl_ctx.c b/gfx/drivers_context/xegl_ctx.c
index 9ed5f32218..8a40cf8300 100644
--- a/gfx/drivers_context/xegl_ctx.c
+++ b/gfx/drivers_context/xegl_ctx.c
@@ -520,7 +520,7 @@ static void gfx_ctx_xegl_show_mouse(void *data, bool state)
    x11_show_mouse(g_x11_dpy, g_x11_win, state);
 }
 
-static void gfx_ctx_xegl_swap_buffers(void *data, void *data2)
+static void gfx_ctx_xegl_swap_buffers(void *data)
 {
    xegl_ctx_data_t *xegl = (xegl_ctx_data_t*)data;
 
diff --git a/retroarch.c b/retroarch.c
index b3a5ef1788..3da02c4beb 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -21772,7 +21772,7 @@ bool video_driver_started_fullscreen(void)
 /* Stub functions */
 
 static void update_window_title_null(void *data) { }
-static void swap_buffers_null(void *data, void *data2) { }
+static void swap_buffers_null(void *data) { }
 static bool get_metrics_null(void *data, enum display_metric_types type,
       float *value) { return false; }
 static bool set_resize_null(void *a, unsigned b, unsigned c) { return false; }
diff --git a/retroarch.h b/retroarch.h
index 0936ec7b1a..c50450b804 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -1188,7 +1188,7 @@ typedef struct video_frame_info
    } osd_stat_params;
 
    void (*cb_update_window_title)(void*);
-   void (*cb_swap_buffers)(void*, void *);
+   void (*cb_swap_buffers)(void*);
    bool (*cb_get_metrics)(void *data, enum display_metric_types type,
       float *value);
    bool (*cb_set_resize)(void*, unsigned, unsigned);
@@ -1268,7 +1268,7 @@ typedef struct gfx_ctx_driver
 
    /* Swaps buffers. VBlank sync depends on
     * earlier calls to swap_interval. */
-   void (*swap_buffers)(void*, void *);
+   void (*swap_buffers)(void*);
 
    /* Most video backends will want to use a certain input driver.
     * Checks for it here. */