mirror of
https://github.com/libretro/RetroArch
synced 2025-04-15 23:42:30 +00:00
Take out HAVE_EGL ifdefs in gfx_context_driver_t definition
This commit is contained in:
parent
133d7b7dd2
commit
3213baf452
@ -674,6 +674,8 @@ const gfx_ctx_driver_t gfx_ctx_apple = {
|
||||
apple_gfx_ctx_input_driver,
|
||||
apple_gfx_ctx_get_proc_address,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
"apple",
|
||||
apple_gfx_ctx_bind_hw_render,
|
||||
};
|
||||
|
@ -490,10 +490,8 @@ const gfx_ctx_driver_t gfx_ctx_android = {
|
||||
android_gfx_ctx_swap_buffers,
|
||||
android_gfx_ctx_input_driver,
|
||||
android_gfx_ctx_get_proc_address,
|
||||
#ifdef HAVE_EGL
|
||||
NULL,
|
||||
NULL,
|
||||
#endif
|
||||
NULL,
|
||||
"android",
|
||||
android_gfx_ctx_bind_hw_render,
|
||||
|
@ -464,10 +464,8 @@ const gfx_ctx_driver_t gfx_ctx_bbqnx = {
|
||||
gfx_ctx_qnx_swap_buffers,
|
||||
gfx_ctx_qnx_input_driver,
|
||||
gfx_ctx_qnx_get_proc_address,
|
||||
#ifdef HAVE_EGL
|
||||
NULL,
|
||||
NULL,
|
||||
#endif
|
||||
NULL,
|
||||
"blackberry_qnx",
|
||||
gfx_qnx_ctx_bind_hw_render,
|
||||
|
@ -519,10 +519,8 @@ const gfx_ctx_driver_t gfx_ctx_d3d = {
|
||||
gfx_ctx_d3d_swap_buffers,
|
||||
gfx_ctx_d3d_input_driver,
|
||||
NULL,
|
||||
#ifdef HAVE_EGL
|
||||
NULL,
|
||||
NULL,
|
||||
#endif
|
||||
gfx_ctx_d3d_show_mouse,
|
||||
"d3d",
|
||||
};
|
||||
|
@ -989,4 +989,3 @@ const gfx_ctx_driver_t gfx_ctx_drm_egl = {
|
||||
"kms-egl",
|
||||
gfx_ctx_drm_egl_bind_hw_render,
|
||||
};
|
||||
|
||||
|
@ -154,10 +154,8 @@ const gfx_ctx_driver_t gfx_ctx_null = {
|
||||
gfx_ctx_null_swap_buffers,
|
||||
gfx_ctx_null_input_driver,
|
||||
NULL,
|
||||
#ifdef HAVE_EGL
|
||||
NULL,
|
||||
NULL,
|
||||
#endif
|
||||
gfx_ctx_null_show_mouse,
|
||||
"null",
|
||||
gfx_ctx_null_bind_hw_render,
|
||||
|
@ -813,10 +813,8 @@ const gfx_ctx_driver_t gfx_ctx_glx = {
|
||||
gfx_ctx_glx_swap_buffers,
|
||||
gfx_ctx_glx_input_driver,
|
||||
gfx_ctx_glx_get_proc_address,
|
||||
#ifdef HAVE_EGL
|
||||
NULL,
|
||||
NULL,
|
||||
#endif
|
||||
gfx_ctx_glx_show_mouse,
|
||||
"glx",
|
||||
|
||||
|
@ -332,10 +332,8 @@ const gfx_ctx_driver_t gfx_ctx_mali_fbdev = {
|
||||
gfx_ctx_mali_fbdev_swap_buffers,
|
||||
gfx_ctx_mali_fbdev_input_driver,
|
||||
gfx_ctx_mali_fbdev_get_proc_address,
|
||||
#ifdef HAVE_EGL
|
||||
NULL,
|
||||
NULL,
|
||||
#endif
|
||||
NULL,
|
||||
"mali-fbdev",
|
||||
};
|
||||
|
@ -400,6 +400,8 @@ const gfx_ctx_driver_t gfx_ctx_ps3 = {
|
||||
gfx_ctx_ps3_input_driver,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
"ps3",
|
||||
};
|
||||
|
||||
|
@ -447,10 +447,8 @@ const gfx_ctx_driver_t gfx_ctx_sdl_gl =
|
||||
sdl_ctx_swap_buffers,
|
||||
sdl_ctx_input_driver,
|
||||
sdl_ctx_get_proc_address,
|
||||
#ifdef HAVE_EGL
|
||||
NULL,
|
||||
NULL,
|
||||
#endif
|
||||
sdl_ctx_show_mouse,
|
||||
"sdl_gl",
|
||||
NULL /* bind_hw_render */
|
||||
|
@ -315,10 +315,8 @@ const gfx_ctx_driver_t gfx_ctx_vivante_fbdev = {
|
||||
gfx_ctx_vivante_swap_buffers,
|
||||
gfx_ctx_vivante_input_driver,
|
||||
gfx_ctx_vivante_get_proc_address,
|
||||
#ifdef HAVE_EGL
|
||||
NULL,
|
||||
NULL,
|
||||
#endif
|
||||
NULL,
|
||||
"vivante-fbdev",
|
||||
};
|
||||
|
@ -716,10 +716,8 @@ const gfx_ctx_driver_t gfx_ctx_wgl = {
|
||||
gfx_ctx_wgl_swap_buffers,
|
||||
gfx_ctx_wgl_input_driver,
|
||||
gfx_ctx_wgl_get_proc_address,
|
||||
#ifdef HAVE_EGL
|
||||
NULL,
|
||||
NULL,
|
||||
#endif
|
||||
gfx_ctx_wgl_show_mouse,
|
||||
"wgl",
|
||||
gfx_ctx_wgl_bind_hw_render,
|
||||
|
@ -706,10 +706,9 @@ static void gfx_ctx_xegl_destroy(void *data)
|
||||
static void gfx_ctx_xegl_input_driver(void *data,
|
||||
const input_driver_t **input, void **input_data)
|
||||
{
|
||||
void *xinput;
|
||||
void *xinput = input_x.init();
|
||||
|
||||
(void)data;
|
||||
xinput = input_x.init();
|
||||
|
||||
*input = xinput ? &input_x : NULL;
|
||||
*input_data = xinput;
|
||||
@ -814,7 +813,8 @@ static bool gfx_ctx_xegl_get_metrics(void *data,
|
||||
return x11_get_metrics(data, type, value);
|
||||
}
|
||||
|
||||
const gfx_ctx_driver_t gfx_ctx_x_egl = {
|
||||
const gfx_ctx_driver_t gfx_ctx_x_egl =
|
||||
{
|
||||
gfx_ctx_xegl_init,
|
||||
gfx_ctx_xegl_destroy,
|
||||
gfx_ctx_xegl_bind_api,
|
||||
@ -841,4 +841,3 @@ const gfx_ctx_driver_t gfx_ctx_x_egl = {
|
||||
"x-egl",
|
||||
gfx_ctx_xegl_bind_hw_render,
|
||||
};
|
||||
|
||||
|
@ -127,7 +127,6 @@ typedef struct gfx_ctx_driver
|
||||
* Does not take opaque, to avoid lots of ugly wrapper code. */
|
||||
gfx_ctx_proc_t (*get_proc_address)(const char*);
|
||||
|
||||
#ifdef HAVE_EGL
|
||||
/* Returns true if this context supports EGLImage buffers for
|
||||
* screen drawing and was initalized correctly. */
|
||||
bool (*init_egl_image_buffer)(void*, const video_info_t*);
|
||||
@ -139,7 +138,6 @@ typedef struct gfx_ctx_driver
|
||||
bool (*write_egl_image)(void*, const void *frame, unsigned width,
|
||||
unsigned height, unsigned pitch, bool rgb32,
|
||||
unsigned index, void **image_handle);
|
||||
#endif
|
||||
|
||||
/* Shows or hides mouse. Can be NULL if context doesn't
|
||||
* have a concept of mouse pointer. */
|
||||
|
Loading…
x
Reference in New Issue
Block a user