diff --git a/gfx/common/d3d9_common.h b/gfx/common/d3d9_common.h
index 9e301d1ea1..baa3ce08d2 100644
--- a/gfx/common/d3d9_common.h
+++ b/gfx/common/d3d9_common.h
@@ -40,7 +40,6 @@ typedef struct d3d9_renderchain_driver
    void (*chain_free)(void *data);
    void *(*chain_new)(void);
    bool (*init)(d3d9_video_t *d3d,
-         const video_info_t *video_info,
          LPDIRECT3DDEVICE9 dev,
          const D3DVIEWPORT9 *final_viewport,
          const struct LinkInfo *info,
diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c
index c3692c0077..17e706459d 100644
--- a/gfx/drivers/d3d9.c
+++ b/gfx/drivers/d3d9.c
@@ -227,7 +227,6 @@ static bool d3d9_init_chain(d3d9_video_t *d3d, const video_info_t *video_info)
    if (
          !d3d->renderchain_driver->init(
             d3d,
-            &d3d->video_info,
             d3d->dev, &d3d->final_viewport, &link_info,
             d3d->video_info.rgb32)
       )
diff --git a/gfx/drivers_display/gfx_display_ctr.c b/gfx/drivers_display/gfx_display_ctr.c
index f49e30b715..9200def997 100644
--- a/gfx/drivers_display/gfx_display_ctr.c
+++ b/gfx/drivers_display/gfx_display_ctr.c
@@ -28,13 +28,8 @@
 #include "../../ctr/gpu_old.h"
 
 static const float *gfx_display_ctr_get_default_vertices(void) { return NULL; }
-
 static const float *gfx_display_ctr_get_default_tex_coords(void) { return NULL; }
-
-static void *gfx_display_ctr_get_default_mvp(video_frame_info_t *video_info)
-{
-   return NULL;
-}
+static void *gfx_display_ctr_get_default_mvp(void *data) { return NULL; }
 
 static void gfx_display_ctr_blend_begin(video_frame_info_t *video_info) { }
 static void gfx_display_ctr_blend_end(video_frame_info_t *video_info) { }
diff --git a/gfx/drivers_display/gfx_display_d3d10.c b/gfx/drivers_display/gfx_display_d3d10.c
index 7921dc523e..e3238c982f 100644
--- a/gfx/drivers_display/gfx_display_d3d10.c
+++ b/gfx/drivers_display/gfx_display_d3d10.c
@@ -38,7 +38,7 @@ static const float* gfx_display_d3d10_get_default_tex_coords(void)
    return NULL;
 }
 
-static void* gfx_display_d3d10_get_default_mvp(video_frame_info_t *video_info)
+static void* gfx_display_d3d10_get_default_mvp(void *data)
 {
    return NULL;
 }
diff --git a/gfx/drivers_display/gfx_display_d3d11.c b/gfx/drivers_display/gfx_display_d3d11.c
index 78aea5d9d4..328bb48922 100644
--- a/gfx/drivers_display/gfx_display_d3d11.c
+++ b/gfx/drivers_display/gfx_display_d3d11.c
@@ -37,7 +37,7 @@ static const float* gfx_display_d3d11_get_default_tex_coords(void)
    return NULL;
 }
 
-static void* gfx_display_d3d11_get_default_mvp(video_frame_info_t *video_info)
+static void* gfx_display_d3d11_get_default_mvp(void *data)
 {
    return NULL;
 }
diff --git a/gfx/drivers_display/gfx_display_d3d12.c b/gfx/drivers_display/gfx_display_d3d12.c
index 4240aa9c1d..7621a9f222 100644
--- a/gfx/drivers_display/gfx_display_d3d12.c
+++ b/gfx/drivers_display/gfx_display_d3d12.c
@@ -37,7 +37,7 @@ static const float* gfx_display_d3d12_get_default_tex_coords(void)
    return NULL;
 }
 
-static void* gfx_display_d3d12_get_default_mvp(video_frame_info_t *video_info)
+static void* gfx_display_d3d12_get_default_mvp(void *data)
 {
    return NULL;
 }
diff --git a/gfx/drivers_display/gfx_display_d3d8.c b/gfx/drivers_display/gfx_display_d3d8.c
index faafc38ba1..cfe483f732 100644
--- a/gfx/drivers_display/gfx_display_d3d8.c
+++ b/gfx/drivers_display/gfx_display_d3d8.c
@@ -53,7 +53,7 @@ static const float *gfx_display_d3d8_get_default_tex_coords(void)
    return &d3d8_tex_coords[0];
 }
 
-static void *gfx_display_d3d8_get_default_mvp(video_frame_info_t *video_info)
+static void *gfx_display_d3d8_get_default_mvp(void *data)
 {
    static math_matrix_4x4 id;
    matrix_4x4_identity(id);
@@ -188,7 +188,7 @@ static void gfx_display_d3d8_draw(gfx_display_ctx_draw_t *draw,
    d3d8_vertex_buffer_unlock(d3d->menu_display.buffer);
 
    if (!draw->matrix_data)
-      draw->matrix_data = gfx_display_d3d8_get_default_mvp(video_info);
+      draw->matrix_data = gfx_display_d3d8_get_default_mvp(video_info->userdata);
 
    /* ugh */
    matrix_4x4_scale(m1,       2.0,  2.0, 0);
diff --git a/gfx/drivers_display/gfx_display_d3d9.c b/gfx/drivers_display/gfx_display_d3d9.c
index 2342ac7cf1..cf95e5f868 100644
--- a/gfx/drivers_display/gfx_display_d3d9.c
+++ b/gfx/drivers_display/gfx_display_d3d9.c
@@ -53,7 +53,7 @@ static const float *gfx_display_d3d9_get_default_tex_coords(void)
    return &d3d9_tex_coords[0];
 }
 
-static void *gfx_display_d3d9_get_default_mvp(video_frame_info_t *video_info)
+static void *gfx_display_d3d9_get_default_mvp(void *data)
 {
    static math_matrix_4x4 id;
    matrix_4x4_identity(id);
@@ -183,7 +183,7 @@ static void gfx_display_d3d9_draw(gfx_display_ctx_draw_t *draw,
          d3d->menu_display.buffer);
 
    if (!draw->matrix_data)
-      draw->matrix_data = gfx_display_d3d9_get_default_mvp(video_info);
+      draw->matrix_data = gfx_display_d3d9_get_default_mvp(video_info->userdata);
 
    /* ugh */
    matrix_4x4_scale(m1,       2.0,  2.0, 0);
diff --git a/gfx/drivers_display/gfx_display_gdi.c b/gfx/drivers_display/gfx_display_gdi.c
index 0f657747db..53256ef92b 100644
--- a/gfx/drivers_display/gfx_display_gdi.c
+++ b/gfx/drivers_display/gfx_display_gdi.c
@@ -32,18 +32,9 @@
 #include "../common/gdi_common.h"
 #endif
 
-static void *gfx_display_gdi_get_default_mvp(video_frame_info_t *video_info)
-{
-   return NULL;
-}
-
-static void gfx_display_gdi_blend_begin(video_frame_info_t *video_info)
-{
-}
-
-static void gfx_display_gdi_blend_end(video_frame_info_t *video_info)
-{
-}
+static void *gfx_display_gdi_get_default_mvp(void *data) { return NULL; }
+static void gfx_display_gdi_blend_begin(video_frame_info_t *video_info) { }
+static void gfx_display_gdi_blend_end(video_frame_info_t *video_info) { }
 
 static void gfx_display_gdi_draw(gfx_display_ctx_draw_t *draw,
       video_frame_info_t *video_info)
diff --git a/gfx/drivers_display/gfx_display_gl.c b/gfx/drivers_display/gfx_display_gl.c
index b03eb4d442..763cde5b9b 100644
--- a/gfx/drivers_display/gfx_display_gl.c
+++ b/gfx/drivers_display/gfx_display_gl.c
@@ -91,9 +91,9 @@ static const float *gfx_display_gl_get_default_tex_coords(void)
    return &gl_tex_coords[0];
 }
 
-static void *gfx_display_gl_get_default_mvp(video_frame_info_t *video_info)
+static void *gfx_display_gl_get_default_mvp(void *data)
 {
-   gl_t *gl = (gl_t*)video_info->userdata;
+   gl_t *gl = (gl_t*)data;
 
    if (!gl)
       return NULL;
@@ -250,7 +250,7 @@ static void gfx_display_gl_draw(gfx_display_ctx_draw_t *draw,
    gl->shader->set_coords(gl->shader_data, draw->coords);
    gl->shader->set_mvp(gl->shader_data,
          draw->matrix_data ? (math_matrix_4x4*)draw->matrix_data
-      : (math_matrix_4x4*)gfx_display_gl_get_default_mvp(video_info));
+      : (math_matrix_4x4*)gfx_display_gl_get_default_mvp(video_info->userdata));
 
 
    glDrawArrays(gfx_display_prim_to_gl_enum(
diff --git a/gfx/drivers_display/gfx_display_gl1.c b/gfx/drivers_display/gfx_display_gl1.c
index 124b80a5d6..07103d56bc 100644
--- a/gfx/drivers_display/gfx_display_gl1.c
+++ b/gfx/drivers_display/gfx_display_gl1.c
@@ -54,9 +54,9 @@ static const float *gfx_display_gl1_get_default_tex_coords(void)
    return &gl1_menu_tex_coords[0];
 }
 
-static void *gfx_display_gl1_get_default_mvp(video_frame_info_t *video_info)
+static void *gfx_display_gl1_get_default_mvp(void *data)
 {
-   gl1_t *gl1 = (gl1_t*)video_info->userdata;
+   gl1_t *gl1 = (gl1_t*)data;
 
    if (!gl1)
       return NULL;
@@ -123,7 +123,7 @@ static void gfx_display_gl1_draw(gfx_display_ctx_draw_t *draw,
 
    mvp.data   = gl1;
    mvp.matrix = draw->matrix_data ? (math_matrix_4x4*)draw->matrix_data
-      : (math_matrix_4x4*)gfx_display_gl1_get_default_mvp(video_info);
+      : (math_matrix_4x4*)gfx_display_gl1_get_default_mvp(video_info->userdata);
 
    glMatrixMode(GL_PROJECTION);
    glPushMatrix();
diff --git a/gfx/drivers_display/gfx_display_gl_core.c b/gfx/drivers_display/gfx_display_gl_core.c
index b4c1c79726..0e00fc5940 100644
--- a/gfx/drivers_display/gfx_display_gl_core.c
+++ b/gfx/drivers_display/gfx_display_gl_core.c
@@ -48,9 +48,9 @@ static const float gl_core_colors[] = {
    1.0f, 1.0f, 1.0f, 1.0f,
 };
 
-static void *gfx_display_gl_core_get_default_mvp(video_frame_info_t *video_info)
+static void *gfx_display_gl_core_get_default_mvp(void *data)
 {
-   gl_core_t *gl_core = (gl_core_t*)video_info->userdata;
+   gl_core_t *gl_core = (gl_core_t*)data;
    if (!gl_core)
       return NULL;
    return &gl_core->mvp_no_rot;
@@ -129,7 +129,7 @@ static void gfx_display_gl_core_draw_pipeline(gfx_display_ctx_draw_t *draw,
 
          /* Match UBO layout in shader. */
          memcpy(ubo_scratch_data,
-               gfx_display_gl_core_get_default_mvp(video_info),
+               gfx_display_gl_core_get_default_mvp(video_info->userdata),
                sizeof(math_matrix_4x4));
          memcpy(ubo_scratch_data + sizeof(math_matrix_4x4),
                output_size,
@@ -242,7 +242,7 @@ static void gfx_display_gl_core_draw(gfx_display_ctx_draw_t *draw,
    if (!loc)
    {
       const math_matrix_4x4 *mat = draw->matrix_data
-                     ? (const math_matrix_4x4*)draw->matrix_data : (const math_matrix_4x4*)gfx_display_gl_core_get_default_mvp(video_info);
+                     ? (const math_matrix_4x4*)draw->matrix_data : (const math_matrix_4x4*)gfx_display_gl_core_get_default_mvp(video_info->userdata);
       if (gl->pipelines.alpha_blend_loc.flat_ubo_vertex >= 0)
          glUniform4fv(gl->pipelines.alpha_blend_loc.flat_ubo_vertex,
                       4, mat->data);
diff --git a/gfx/drivers_display/gfx_display_metal.m b/gfx/drivers_display/gfx_display_metal.m
index 9b788b1445..2e8ab033aa 100644
--- a/gfx/drivers_display/gfx_display_metal.m
+++ b/gfx/drivers_display/gfx_display_metal.m
@@ -35,9 +35,9 @@ static const float *gfx_display_metal_get_default_tex_coords(void)
    return [MenuDisplay defaultTexCoords];
 }
 
-static void *gfx_display_metal_get_default_mvp(video_frame_info_t *video_info)
+static void *gfx_display_metal_get_default_mvp(void *data)
 {
-   MetalDriver *md = (__bridge MetalDriver *)video_info->userdata;
+   MetalDriver *md = (__bridge MetalDriver *)data;
    if (!md)
       return NULL;
 
diff --git a/gfx/drivers_display/gfx_display_switch.c b/gfx/drivers_display/gfx_display_switch.c
index a2fa8c5fc2..5c591d9e17 100644
--- a/gfx/drivers_display/gfx_display_switch.c
+++ b/gfx/drivers_display/gfx_display_switch.c
@@ -22,7 +22,7 @@
 
 #include "../gfx_display.h"
 
-static void *gfx_display_switch_get_default_mvp(video_frame_info_t *video_info)
+static void *gfx_display_switch_get_default_mvp(void *data)
 {
    return NULL;
 }
diff --git a/gfx/drivers_display/gfx_display_vita2d.c b/gfx/drivers_display/gfx_display_vita2d.c
index f56928d609..bdb8a6702a 100644
--- a/gfx/drivers_display/gfx_display_vita2d.c
+++ b/gfx/drivers_display/gfx_display_vita2d.c
@@ -64,10 +64,9 @@ static const float *gfx_display_vita2d_get_default_tex_coords(void)
    return &vita2d_tex_coords[0];
 }
 
-static void *gfx_display_vita2d_get_default_mvp(
-      video_frame_info_t *video_info)
+static void *gfx_display_vita2d_get_default_mvp(void *data)
 {
-   vita_video_t *vita2d = (vita_video_t*)video_info->userdata;
+   vita_video_t *vita2d = (vita_video_t*)data;
 
    if (!vita2d)
       return NULL;
@@ -141,13 +140,13 @@ static void gfx_display_vita2d_draw(gfx_display_ctx_draw_t *draw,
     }
 
     const math_matrix_4x4 *mat = draw->matrix_data
-                     ? (const math_matrix_4x4*)draw->matrix_data : (const math_matrix_4x4*)gfx_display_vita2d_get_default_mvp(video_info);
+                     ? (const math_matrix_4x4*)draw->matrix_data : (const math_matrix_4x4*)gfx_display_vita2d_get_default_mvp(video_info->userdata);
 
    switch (draw->pipeline.id)
    {
      default:
      {
-        vita2d_draw_array_textured_mat(texture, vertices, draw->coords->vertices, gfx_display_vita2d_get_default_mvp(video_info));
+        vita2d_draw_array_textured_mat(texture, vertices, draw->coords->vertices, gfx_display_vita2d_get_default_mvp(video_info->userdata));
         break;
      }
   }
diff --git a/gfx/drivers_display/gfx_display_vulkan.c b/gfx/drivers_display/gfx_display_vulkan.c
index 3c9034df1b..8c6ffd8060 100644
--- a/gfx/drivers_display/gfx_display_vulkan.c
+++ b/gfx/drivers_display/gfx_display_vulkan.c
@@ -48,9 +48,9 @@ static const float vk_colors[] = {
    1.0f, 1.0f, 1.0f, 1.0f,
 };
 
-static void *gfx_display_vk_get_default_mvp(video_frame_info_t *video_info)
+static void *gfx_display_vk_get_default_mvp(void *data)
 {
-   vk_t *vk = (vk_t*)video_info->userdata;
+   vk_t *vk = (vk_t*)data;
    if (!vk)
       return NULL;
    return &vk->mvp_no_rot;
@@ -164,7 +164,7 @@ static void gfx_display_vk_draw_pipeline(gfx_display_ctx_draw_t *draw,
 
          /* Match UBO layout in shader. */
          memcpy(ubo_scratch_data,
-               gfx_display_vk_get_default_mvp(video_info),
+               gfx_display_vk_get_default_mvp(video_info->userdata),
                sizeof(math_matrix_4x4));
          memcpy(ubo_scratch_data + sizeof(math_matrix_4x4),
                output_size,
@@ -284,7 +284,7 @@ static void gfx_display_vk_draw(gfx_display_ctx_draw_t *draw,
             (texture->default_smooth ? vk->samplers.linear
              : vk->samplers.nearest);
          call.uniform      = draw->matrix_data
-            ? draw->matrix_data : gfx_display_vk_get_default_mvp(video_info);
+            ? draw->matrix_data : gfx_display_vk_get_default_mvp(video_info->userdata);
          call.uniform_size = sizeof(math_matrix_4x4);
          call.vbo          = ⦥
          call.vertices     = draw->coords->vertices;
diff --git a/gfx/drivers_display/gfx_display_wiiu.c b/gfx/drivers_display/gfx_display_wiiu.c
index b3650ad1ef..7830e10ff6 100644
--- a/gfx/drivers_display/gfx_display_wiiu.c
+++ b/gfx/drivers_display/gfx_display_wiiu.c
@@ -38,7 +38,7 @@ static const float *gfx_display_wiiu_get_default_tex_coords(void)
    return NULL;
 }
 
-static void *gfx_display_wiiu_get_default_mvp(video_frame_info_t *video_info)
+static void *gfx_display_wiiu_get_default_mvp(void *data)
 {
    return NULL;
 }
diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c
index 5d8f6117a1..1b77c4694b 100644
--- a/gfx/gfx_display.c
+++ b/gfx/gfx_display.c
@@ -76,7 +76,7 @@ static gfx_display_t *disp_get_ptr(void)
    return &dispgfx;
 }
 
-static void *gfx_display_null_get_default_mvp(video_frame_info_t *video_info) { return NULL; }
+static void *gfx_display_null_get_default_mvp(void *data) { return NULL; }
 static void gfx_display_null_blend_begin(video_frame_info_t *video_info) { }
 static void gfx_display_null_blend_end(video_frame_info_t *video_info) { }
 static void gfx_display_null_draw(gfx_display_ctx_draw_t *draw,
@@ -801,7 +801,7 @@ void gfx_display_draw_bg(gfx_display_ctx_draw_t *draw,
 
    if (dispctx && dispctx->get_default_mvp)
       draw->matrix_data = (math_matrix_4x4*)dispctx->get_default_mvp(
-            video_info);
+            video_info->userdata);
 }
 
 void gfx_display_draw_gradient(gfx_display_ctx_draw_t *draw,
@@ -1240,7 +1240,7 @@ void gfx_display_rotate_z(gfx_display_ctx_rotate_draw_t *draw,
       )
       return;
 
-   b = (math_matrix_4x4*)dispctx->get_default_mvp(video_info);
+   b = (math_matrix_4x4*)dispctx->get_default_mvp(video_info->userdata);
 
    if (!b)
       return;
diff --git a/gfx/gfx_display.h b/gfx/gfx_display.h
index a87d159135..02599d4daa 100644
--- a/gfx/gfx_display.h
+++ b/gfx/gfx_display.h
@@ -121,7 +121,7 @@ typedef struct gfx_display_ctx_driver
    void (*clear_color)(gfx_display_ctx_clearcolor_t *clearcolor,
          video_frame_info_t *video_info);
    /* Get the default Model-View-Projection matrix */
-   void *(*get_default_mvp)(video_frame_info_t *video_info);
+   void *(*get_default_mvp)(void *data);
    /* Get the default vertices matrix */
    const float *(*get_default_vertices)(void);
    /* Get the default texture coordinates matrix */