diff --git a/gfx/drivers_renderchain/gl1_renderchain.c b/gfx/drivers_renderchain/gl1_renderchain.c
index 04a756db9f..a9762cf0ba 100644
--- a/gfx/drivers_renderchain/gl1_renderchain.c
+++ b/gfx/drivers_renderchain/gl1_renderchain.c
@@ -60,11 +60,12 @@ GLenum min_filter_to_mag(GLenum type);
 void gl1_renderchain_free(void *data, void *chain_data)
 {
    (void)chain_data;
-   (void)gl;
+   (void)data;
 }
 
 static void gl1_renderchain_bind_prev_texture(
       void *data,
+      void *chain_data,
       const struct video_tex_info *tex_info)
 {
    gl_t *gl = (gl_t*)data;
@@ -76,7 +77,8 @@ static void gl1_renderchain_bind_prev_texture(
 }
 
 static void gl1_renderchain_viewport_info(
-      void *data, struct video_viewport *vp)
+      void *data, void *chain_data,
+      struct video_viewport *vp)
 {
    unsigned width, height;
    unsigned top_y, top_dist;
@@ -95,7 +97,8 @@ static void gl1_renderchain_viewport_info(
 }
 
 static bool gl1_renderchain_read_viewport(
-      void *data, uint8_t *buffer, bool is_idle)
+      void *data, void *chain_data,
+      uint8_t *buffer, bool is_idle)
 {
    unsigned                     num_pixels = 0;
    gl_t                                *gl = (gl_t*)data;
@@ -134,9 +137,9 @@ static bool gl1_renderchain_read_viewport(
    return true;
 }
 
-void gl1_renderchain_free_internal(void *data)
+void gl1_renderchain_free_internal(void *data, void *chain_data)
 {
-   gl1_renderchain_t *cg_data = (gl1_renderchain_t*)data;
+   gl1_renderchain_t *cg_data = (gl1_renderchain_t*)chain_data;
 
    if (!cg_data)
       return;
@@ -183,7 +186,8 @@ static void gl1_renderchain_ff_matrix(const void *data)
    glLoadMatrixf(ident.data);
 }
 
-static void gl1_renderchain_disable_client_arrays(void)
+static void gl1_renderchain_disable_client_arrays(void *data,
+      void *chain_data)
 {
    if (gl_query_core_context_in_use())
       return;
@@ -196,7 +200,8 @@ static void gl1_renderchain_disable_client_arrays(void)
    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 }
 
-static void gl1_renderchain_restore_default_state(void *data)
+static void gl1_renderchain_restore_default_state(void *data,
+      void *chain_data)
 {
    gl_t *gl = (gl_t*)data;
    if (!gl)
@@ -209,6 +214,7 @@ static void gl1_renderchain_restore_default_state(void *data)
 
 static void gl1_renderchain_copy_frame(
       void *data, 
+      void *chain_data,
       video_frame_info_t *video_info,
       const void *frame,
       unsigned width, unsigned height, unsigned pitch)
@@ -244,6 +250,7 @@ static void gl1_renderchain_copy_frame(
 }
 
 static void gl1_renderchain_readback(void *data,
+      void *chain_data,
       unsigned alignment,
       unsigned fmt, unsigned type,
       void *src)
@@ -260,6 +267,7 @@ static void gl1_renderchain_readback(void *data,
 }
 
 static void gl1_renderchain_set_mvp(void *data,
+      void *chain_data,
       void *shader_data, const void *mat_data)
 {
    math_matrix_4x4 ident;
@@ -274,6 +282,7 @@ static void gl1_renderchain_set_mvp(void *data,
 }
 
 static void gl1_renderchain_set_coords(void *handle_data,
+      void *chain_data,
       void *shader_data, const struct video_coords *coords)
 {
    /* Fall back to fixed function-style if needed and possible. */