@@ -307,7 +307,6 @@ static CGSSurfaceID attach_gl_context_to_window(CGLContextObj glCtx,
static bool gfx_ctx_cgl_init(void *data)
{
CGError err;
driver_t *driver = driver_get_ptr();
gfx_ctx_cgl_data_t *cgl = (gfx_ctx_cgl_data_t*)calloc(1, sizeof(gfx_ctx_cgl_data_t));

if (!cgl)
@@ -371,9 +371,7 @@ static bool gfx_ctx_drm_egl_init(void *data)
struct string_list *gpu_descriptors = NULL;
settings_t *settings = config_get_ptr();
unsigned monitor = max(settings->video.monitor_index, 1);

gfx_ctx_drm_egl_data_t *drm = (gfx_ctx_drm_egl_data_t*)calloc(1, sizeof(gfx_ctx_drm_egl_data_t));
driver_t *driver = driver_get_ptr();

if (!drm)
return false;
@@ -208,7 +208,6 @@ static bool gfx_ctx_glx_init(void *data)
int nelements, major, minor;
GLXFBConfig *fbcs = NULL;
gfx_ctx_glx_data_t *glx = (gfx_ctx_glx_data_t*)calloc(1, sizeof(gfx_ctx_glx_data_t));
driver_t *driver = driver_get_ptr();
const struct retro_hw_render_callback *hw_render =
(const struct retro_hw_render_callback*)video_driver_callback();

@@ -224,7 +224,6 @@ static bool gfx_ctx_ps3_init(void *data)
PSGLdeviceParameters params;
PSGLinitOptions options;
#endif
driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
gfx_ctx_ps3_data_t *ps3 = (gfx_ctx_ps3_data_t*)
calloc(1, sizeof(gfx_ctx_ps3_data_t));
@@ -67,12 +67,7 @@ static void sdl_ctx_destroy_resources(gfx_ctx_sdl_data_t *sdl)

static bool sdl_ctx_init(void *data)
{
gfx_ctx_sdl_data_t *sdl = NULL;
driver_t *driver = driver_get_ptr();

(void)data;

sdl = (gfx_ctx_sdl_data_t*)
gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)
calloc(1, sizeof(gfx_ctx_sdl_data_t));

if (!sdl)
@@ -236,7 +231,6 @@ static bool sdl_ctx_set_video_mode(void *data, unsigned width, unsigned height,
static void sdl_ctx_get_video_size(void *data,
unsigned *width, unsigned *height)
{
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)gfx_ctx_data_get_ptr();

@@ -298,8 +298,6 @@ static bool gfx_ctx_wl_init(void *data)
EGLint major = 0, minor = 0;
EGLint n;
const EGLint *attrib_ptr;
driver_t *driver = driver_get_ptr();

gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)
calloc(1, sizeof(gfx_ctx_wayland_data_t));

@@ -258,7 +258,6 @@ static bool gfx_ctx_xegl_set_video_mode(void *data,
XVisualInfo temp = {0};
XSetWindowAttributes swa = {0};
XVisualInfo *vi = NULL;
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();

int (*old_handler)(Display*, XErrorEvent*) = NULL;