diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 451dfb30af..cb32085a5a 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -1625,8 +1625,10 @@ static void gl2_renderchain_resolve_extensions(gl_t *gl,
       chain->has_srgb_fbo           = gl_check_capability(GL_CAPS_SRGB_FBO);
 
    /* Use regular textures if we use HW render. */
-   chain->egl_images                = !gl->hw_render_use && gl_check_capability(GL_CAPS_EGLIMAGE) &&
-      video_context_driver_init_image_buffer(video);
+   chain->egl_images                = !gl->hw_render_use 
+      && gl_check_capability(GL_CAPS_EGLIMAGE) 
+      && gl->ctx_driver->image_buffer_init
+      && gl->ctx_driver->image_buffer_init(gl->ctx_data, video);
 }
 
 static void gl_load_texture_data(
diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c
index 6f63802227..aeab3b8ca2 100644
--- a/gfx/drivers/vg.c
+++ b/gfx/drivers/vg.c
@@ -254,7 +254,8 @@ static void *vg_init(const video_info_t *video,
    }
 
    if (vg_query_extension("KHR_EGL_image")
-         && video_context_driver_init_image_buffer((void*)video))
+         && vg->ctx_driver->image_buffer_init
+         && vg->ctx_driver->image_buffer_init(vg->ctx_data, (void*)video))
    {
       if (vg->ctx_driver->get_proc_address)
          pvgCreateEGLImageTargetKHR = (PFNVGCREATEEGLIMAGETARGETKHRPROC)vg->ctx_driver->get_proc_address("vgCreateEGLImageTargetKHR");
diff --git a/retroarch.c b/retroarch.c
index 59b49884fe..b2732d5e0a 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -19574,16 +19574,6 @@ const gfx_ctx_driver_t *video_context_driver_init_first(void *data,
    return NULL;
 }
 
-bool video_context_driver_init_image_buffer(const video_info_t *data)
-{
-   if (
-            current_video_context.image_buffer_init
-         && current_video_context.image_buffer_init(
-            video_context_data, data))
-      return true;
-   return false;
-}
-
 bool video_context_driver_write_to_image_buffer(gfx_ctx_image_t *img)
 {
    if (
diff --git a/retroarch.h b/retroarch.h
index 74e30aa649..d0436bff91 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -1835,8 +1835,6 @@ bool video_context_driver_find_prev_driver(void);
 
 bool video_context_driver_find_next_driver(void);
 
-bool video_context_driver_init_image_buffer(const video_info_t *data);
-
 bool video_context_driver_write_to_image_buffer(gfx_ctx_image_t *img);
 
 bool video_context_driver_get_video_output_prev(void);