This commit is contained in:
twinaphex 2015-11-23 21:28:54 +01:00
parent f234996b49
commit 866501703f
7 changed files with 1 additions and 15 deletions

View File

@ -307,7 +307,6 @@ static CGSSurfaceID attach_gl_context_to_window(CGLContextObj glCtx,
static bool gfx_ctx_cgl_init(void *data) static bool gfx_ctx_cgl_init(void *data)
{ {
CGError err; 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)); gfx_ctx_cgl_data_t *cgl = (gfx_ctx_cgl_data_t*)calloc(1, sizeof(gfx_ctx_cgl_data_t));
if (!cgl) if (!cgl)

View File

@ -371,9 +371,7 @@ static bool gfx_ctx_drm_egl_init(void *data)
struct string_list *gpu_descriptors = NULL; struct string_list *gpu_descriptors = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
unsigned monitor = max(settings->video.monitor_index, 1); 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)); 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) if (!drm)
return false; return false;

View File

@ -208,7 +208,6 @@ static bool gfx_ctx_glx_init(void *data)
int nelements, major, minor; int nelements, major, minor;
GLXFBConfig *fbcs = NULL; GLXFBConfig *fbcs = NULL;
gfx_ctx_glx_data_t *glx = (gfx_ctx_glx_data_t*)calloc(1, sizeof(gfx_ctx_glx_data_t)); 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 *hw_render =
(const struct retro_hw_render_callback*)video_driver_callback(); (const struct retro_hw_render_callback*)video_driver_callback();

View File

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

View File

@ -67,12 +67,7 @@ static void sdl_ctx_destroy_resources(gfx_ctx_sdl_data_t *sdl)
static bool sdl_ctx_init(void *data) static bool sdl_ctx_init(void *data)
{ {
gfx_ctx_sdl_data_t *sdl = NULL; gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)
driver_t *driver = driver_get_ptr();
(void)data;
sdl = (gfx_ctx_sdl_data_t*)
calloc(1, sizeof(gfx_ctx_sdl_data_t)); calloc(1, sizeof(gfx_ctx_sdl_data_t));
if (!sdl) if (!sdl)
@ -236,7 +231,6 @@ error:
static void sdl_ctx_get_video_size(void *data, static void sdl_ctx_get_video_size(void *data,
unsigned *width, unsigned *height) unsigned *width, unsigned *height)
{ {
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)gfx_ctx_data_get_ptr(); gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)gfx_ctx_data_get_ptr();

View File

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

View File

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