Get rid of video_frame_info dependency

gfx/drivers_context/android_ctx.c

@@ -102,7 +102,7 @@ static void android_gfx_ctx_destroy(void *data)
    free(data);
 }
 
-static void *android_gfx_ctx_init(video_frame_info_t *video_info, void *video_driver)
+static void *android_gfx_ctx_init(void *video_driver)
 {
 #ifdef HAVE_OPENGLES
    EGLint n, major, minor;

gfx/drivers_context/cgl_ctx.c

@@ -289,7 +289,7 @@ static CGSSurfaceID attach_gl_context_to_window(CGLContextObj glCtx,
     return sid;
 }
 
-static void *gfx_ctx_cgl_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_cgl_init(void *video_driver)
 {
    CGError err;
    gfx_ctx_cgl_data_t *cgl = (gfx_ctx_cgl_data_t*)calloc(1, sizeof(gfx_ctx_cgl_data_t));

gfx/drivers_context/cocoa_gl_ctx.m

@@ -819,7 +819,7 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data,
    return true;
 }
 
-static void *cocoagl_gfx_ctx_init(video_frame_info_t *video_info, void *video_driver)
+static void *cocoagl_gfx_ctx_init(void *video_driver)
 {
    cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)
    calloc(1, sizeof(cocoa_ctx_data_t));

gfx/drivers_context/drm_ctx.c

@@ -389,7 +389,7 @@ static void gfx_ctx_drm_destroy_resources(gfx_ctx_drm_data_t *drm)
 }
 #endif
 
-static void *gfx_ctx_drm_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_drm_init(void *video_driver)
 {
 #ifndef HAVE_ODROIDGO2
    int fd, i;

gfx/drivers_context/emscriptenegl_ctx.c

@@ -172,8 +172,7 @@ static void gfx_ctx_emscripten_destroy(void *data)
    free(data);
 }
 
-static void *gfx_ctx_emscripten_init(video_frame_info_t *video_info,
+static void *gfx_ctx_emscripten_init(void *video_driver)
-   void *video_driver)
 {
 #ifdef HAVE_EGL
    unsigned width, height;

gfx/drivers_context/fpga_ctx.c

@@ -68,7 +68,7 @@ static void gfx_ctx_fpga_get_video_size(void *data,
     *height = g_resize_height;
 }
 
-static void *gfx_ctx_fpga_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_fpga_init(void *video_driver)
 {
    (void)video_driver;
 

gfx/drivers_context/gdi_ctx.c

@@ -107,8 +107,7 @@ static void gfx_ctx_gdi_get_video_size(void *data,
    }
 }
 
-static void *gfx_ctx_gdi_init(
+static void *gfx_ctx_gdi_init(void *video_driver)
-      video_frame_info_t *video_info, void *video_driver)
 {
    WNDCLASSEX wndclass     = {0};
    gfx_ctx_gdi_data_t *gdi = (gfx_ctx_gdi_data_t*)calloc(1, sizeof(*gdi));

gfx/drivers_context/gfx_null_ctx.c

@@ -112,7 +112,7 @@ static void gfx_ctx_null_bind_hw_render(void *data, bool enable)
    (void)enable;
 }
 
-static void *gfx_ctx_null_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_null_init(void *video_driver)
 {
    (void)video_driver;
 

gfx/drivers_context/khr_display_ctx.c

@@ -58,8 +58,7 @@ static void gfx_ctx_khr_display_get_video_size(void *data,
    *height = khr->height;
 }
 
-static void *gfx_ctx_khr_display_init(video_frame_info_t *video_info,
+static void *gfx_ctx_khr_display_init(void *video_driver)
-      void *video_driver)
 {
    khr_display_ctx_data_t *khr = (khr_display_ctx_data_t*)calloc(1, sizeof(*khr));
    if (!khr)

gfx/drivers_context/mali_fbdev_ctx.c

@@ -92,8 +92,7 @@ static void gfx_ctx_mali_fbdev_get_video_size(void *data,
    *height = mali->height;
 }
 
-static void *gfx_ctx_mali_fbdev_init(video_frame_info_t *video_info,
+static void *gfx_ctx_mali_fbdev_init(void *video_driver)
-      void *video_driver)
 {
 #ifdef HAVE_EGL
    EGLint n;

gfx/drivers_context/network_ctx.c

@@ -54,8 +54,7 @@ static void gfx_ctx_network_get_video_size(void *data,
    (void)data;
 }
 
-static void *gfx_ctx_network_init(
+static void *gfx_ctx_network_init(void *video_driver)
-      video_frame_info_t *video_info, void *video_driver)
 {
    (void)video_driver;
 

gfx/drivers_context/opendingux_fbdev_ctx.c

@@ -59,7 +59,7 @@ static void gfx_ctx_opendingux_destroy(void *data)
    }
 }
 
-static void *gfx_ctx_opendingux_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_opendingux_init(void *video_driver)
 {
 #ifdef HAVE_EGL
    EGLint n;

gfx/drivers_context/orbis_ctx.c

@@ -55,7 +55,7 @@ static void orbis_ctx_get_video_size(void *data,
     *height = ATTR_ORBISGL_HEIGHT;
 }
 
-static void *orbis_ctx_init(video_frame_info_t *video_info, void *video_driver)
+static void *orbis_ctx_init(void *video_driver)
 {
 #ifdef HAVE_EGL
     int ret;

gfx/drivers_context/osmesa_ctx.c

@@ -142,7 +142,7 @@ static void osmesa_fifo_write(gfx_ctx_osmesa_data_t *osmesa)
    }
 }
 
-static void *osmesa_ctx_init(video_frame_info_t *video_info, void *video_driver)
+static void *osmesa_ctx_init(void *video_driver)
 {
 #ifdef HAVE_OSMESA_CREATE_CONTEXT_ATTRIBS
    const int attribs[] = {

gfx/drivers_context/ps3_ctx.c

@@ -195,7 +195,7 @@ static void gfx_ctx_ps3_get_video_size(void *data,
 #endif
 }
 
-static void *gfx_ctx_ps3_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_ps3_init(void *video_driver)
 {
 #ifdef HAVE_PSGL
    PSGLdeviceParameters params;

gfx/drivers_context/qnx_ctx.c

@@ -74,7 +74,7 @@ static void gfx_ctx_qnx_destroy(void *data)
    free(data);
 }
 
-static void *gfx_ctx_qnx_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_qnx_init(void *video_driver)
 {
    EGLint n;
    EGLint major, minor;

gfx/drivers_context/sdl_gl_ctx.c

@@ -76,7 +76,7 @@ static void sdl_ctx_destroy_resources(gfx_ctx_sdl_data_t *sdl)
    SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }
 
-static void *sdl_ctx_init(video_frame_info_t *video_info, void *video_driver)
+static void *sdl_ctx_init(void *video_driver)
 {
    gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)
       calloc(1, sizeof(gfx_ctx_sdl_data_t));

gfx/drivers_context/sixel_ctx.c

@@ -54,8 +54,7 @@ static void gfx_ctx_sixel_get_video_size(void *data,
    (void)data;
 }
 
-static void *gfx_ctx_sixel_init(
+static void *gfx_ctx_sixel_init(void *video_driver)
-      video_frame_info_t *video_info, void *video_driver)
 {
    (void)video_driver;
 

gfx/drivers_context/switch_ctx.c

@@ -63,7 +63,7 @@ static void switch_ctx_get_video_size(void *data,
       }
 }
 
-static void *switch_ctx_init(video_frame_info_t *video_info, void *video_driver)
+static void *switch_ctx_init(void *video_driver)
 {
 #ifdef HAVE_EGL
     EGLint n;

gfx/drivers_context/uwp_egl_ctx.c

@@ -186,7 +186,7 @@ static void gfx_ctx_uwp_get_video_size(void *data,
    win32_check_window(&quit, &resize, width, height);
 }
 
-static void *gfx_ctx_uwp_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_uwp_init(void *video_driver)
 {
    gfx_ctx_uwp_data_t *uwp = (gfx_ctx_uwp_data_t*)calloc(1, sizeof(*uwp));
 

gfx/drivers_context/vc_egl_ctx.c

@@ -148,10 +148,12 @@ static void dispmanx_vsync_callback(DISPMANX_UPDATE_HANDLE_T u, void *data)
 
 static void gfx_ctx_vc_destroy(void *data);
 
-static void *gfx_ctx_vc_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_vc_init(void *video_driver)
 {
    VC_DISPMANX_ALPHA_T alpha;
    EGLint n, major, minor;
+   settings_t *settings           = config_get_ptr();
+   unsigned max_swapchain_images  = settings->uints.video_max_swapchain_images;
 
    DISPMANX_ELEMENT_HANDLE_T dispman_element;
    DISPMANX_DISPLAY_HANDLE_T dispman_display;
@@ -311,7 +313,7 @@ static void *gfx_ctx_vc_init(video_frame_info_t *video_info, void *video_driver)
    vc->vsync_condition_mutex = slock_new();
    vc->vsync_callback_set    = false;
 
-   if (video_info->max_swapchain_images <= 2)
+   if (max_swapchain_images <= 2)
    {
       /* Start sending vsync callbacks so we can wait for vsync after eglSwapBuffers */
       vc_dispmanx_vsync_callback(vc->dispman_display,

gfx/drivers_context/vita_ctx.c

@@ -121,7 +121,7 @@ static void vita_bind_hw_render(void *data, bool enable)
    (void)enable;
 }
 
-static void *vita_init(video_frame_info_t *video_info, void *video_driver)
+static void *vita_init(void *video_driver)
 {
    (void)video_driver;
 

gfx/drivers_context/vivante_fbdev_ctx.c

@@ -61,7 +61,7 @@ static void gfx_ctx_vivante_destroy(void *data)
 
 }
 
-static void *gfx_ctx_vivante_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_vivante_init(void *video_driver)
 {
 #ifdef HAVE_EGL
    EGLint n;

gfx/drivers_context/wayland_ctx.c

@@ -1215,7 +1215,7 @@ static bool gfx_ctx_wl_get_metrics(void *data,
    EGL_DEPTH_SIZE,      0
 #endif
 
-static void *gfx_ctx_wl_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_wl_init(void *video_driver)
 {
    int i;
 #ifdef HAVE_EGL

gfx/drivers_context/wgl_ctx.c

@@ -637,7 +637,7 @@ static void gfx_ctx_wgl_get_video_size(void *data,
    }
 }
 
-static void *gfx_ctx_wgl_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_wgl_init(void *video_driver)
 {
    WNDCLASSEX wndclass     = {0};
    gfx_ctx_wgl_data_t *wgl = (gfx_ctx_wgl_data_t*)calloc(1, sizeof(*wgl));

gfx/drivers_context/x_ctx.c

@@ -459,7 +459,7 @@ static bool gfx_ctx_x_set_resize(void *data,
    return true;
 }
 
-static void *gfx_ctx_x_init(video_frame_info_t *video_info, void *data)
+static void *gfx_ctx_x_init(void *data)
 {
    int nelements           = 0;
    int major               = 0;

gfx/drivers_context/xegl_ctx.c

@@ -105,7 +105,7 @@ EGL_BLUE_SIZE,       1, \
 EGL_ALPHA_SIZE,      0, \
 EGL_DEPTH_SIZE,      0
 
-static void *gfx_ctx_xegl_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_xegl_init(void *video_driver)
 {
 #ifdef HAVE_EGL
    static const EGLint egl_attribs_gl[] = {

retroarch.c

@@ -24153,7 +24153,8 @@ static const gfx_ctx_driver_t *video_context_driver_init(
       unsigned minor, bool hw_render_ctx,
       void **ctx_data)
 {
-   video_frame_info_t video_info;
+   settings_t      *settings  = configuration_settings;
+   bool video_shared_context  = settings->bools.video_shared_context;
 
    if (!ctx->bind_api(data, api, major, minor))
    {
@@ -24164,14 +24165,12 @@ static const gfx_ctx_driver_t *video_context_driver_init(
       return NULL;
    }
 
-   video_driver_build_info(&video_info);
+   if (!(*ctx_data = ctx->init(data)))
-
-   if (!(*ctx_data = ctx->init(&video_info, data)))
       return NULL;
 
    if (ctx->bind_hw_render)
       ctx->bind_hw_render(*ctx_data,
-            video_info.shared_context && hw_render_ctx);
+            video_shared_context && hw_render_ctx);
 
    return ctx;
 }

retroarch.h

@@ -1209,7 +1209,7 @@ typedef struct gfx_ctx_driver
     * to hold a pointer to it as the context never outlives the video driver.
     *
     * The context driver is responsible for it's own data.*/
-   void* (*init)(video_frame_info_t *video_info, void *video_driver);
+   void* (*init)(void *video_driver);
    void (*destroy)(void *data);
 
    enum gfx_ctx_api (*get_api)(void *data);