From c22535b7e10fa2e595633ad6d7864b4c41184e8b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 25 Apr 2015 02:35:06 +0200 Subject: [PATCH] Reduce HAVE_FBO ifdefs --- gfx/d3d/d3d.cpp | 6 ++---- gfx/drivers/ctr_gfx.c | 4 +--- gfx/drivers/dispmanx_gfx.c | 2 -- gfx/drivers/exynos_gfx.c | 2 -- gfx/drivers/gl.c | 2 ++ gfx/drivers/omap_gfx.c | 6 ++---- gfx/drivers/psp1_gfx.c | 6 ++---- gfx/drivers/sdl2_gfx.c | 6 ++---- gfx/drivers/sdl_gfx.c | 6 ++---- gfx/drivers/sunxi_gfx.c | 2 -- gfx/video_driver.c | 2 -- gfx/video_driver.h | 2 -- gfx/video_thread_wrapper.c | 6 ++---- 13 files changed, 15 insertions(+), 37 deletions(-) diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index 334190e0f7..1c51f2d065 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -1932,10 +1932,8 @@ static const video_poke_interface_t d3d_poke_interface = { NULL, /* get_video_output_size */ NULL, /* get_video_output_prev */ NULL, /* get_video_output_next */ -#ifdef HAVE_FBO - NULL, -#endif - NULL, + NULL, /* get_current_framebuffer */ + NULL, /* get_proc_address */ d3d_set_aspect_ratio, d3d_apply_state_changes, #ifdef HAVE_MENU diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c index 8aa241e751..a5f2a5daa3 100644 --- a/gfx/drivers/ctr_gfx.c +++ b/gfx/drivers/ctr_gfx.c @@ -504,9 +504,7 @@ static const video_poke_interface_t ctr_poke_interface = NULL, /* get_video_output_size */ NULL, /* get_video_output_prev */ NULL, /* get_video_output_next */ -#ifdef HAVE_FBO - NULL, -#endif + NULL, /* get_current_framebuffer */ NULL, ctr_set_aspect_ratio, ctr_apply_state_changes, diff --git a/gfx/drivers/dispmanx_gfx.c b/gfx/drivers/dispmanx_gfx.c index 6f5a559c93..1c82791b2c 100644 --- a/gfx/drivers/dispmanx_gfx.c +++ b/gfx/drivers/dispmanx_gfx.c @@ -592,9 +592,7 @@ static const video_poke_interface_t dispmanx_poke_interface = { NULL, /* get_video_output_size */ NULL, /* get_video_output_prev */ NULL, /* get_video_output_next */ -#ifdef HAVE_FBO NULL, /* get_current_framebuffer */ -#endif NULL, /* get_proc_address */ NULL, /* dispmanx_set_aspect_ratio */ NULL, /* dispmanx_apply_state_changes */ diff --git a/gfx/drivers/exynos_gfx.c b/gfx/drivers/exynos_gfx.c index f0ea085ed3..b6ca4c9346 100644 --- a/gfx/drivers/exynos_gfx.c +++ b/gfx/drivers/exynos_gfx.c @@ -1627,9 +1627,7 @@ static const video_poke_interface_t exynos_poke_interface = { NULL, /* get_video_output_size */ NULL, /* get_video_output_prev */ NULL, /* get_video_output_next */ -#ifdef HAVE_FBO NULL, /* get_current_framebuffer */ -#endif NULL, /* get_proc_address */ exynos_set_aspect_ratio, exynos_apply_state_changes, diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index b4cb94afa1..83b7af8ba6 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -3175,6 +3175,8 @@ static const video_poke_interface_t gl_poke_interface = { gl_get_video_output_next, #ifdef HAVE_FBO gl_get_current_framebuffer, +#else + NULL, #endif gl_get_proc_address, gl_set_aspect_ratio, diff --git a/gfx/drivers/omap_gfx.c b/gfx/drivers/omap_gfx.c index 414eb095ca..1e233efd25 100644 --- a/gfx/drivers/omap_gfx.c +++ b/gfx/drivers/omap_gfx.c @@ -1142,10 +1142,8 @@ static const video_poke_interface_t omap_gfx_poke_interface = { NULL, /* get_video_output_size */ NULL, /* get_video_output_prev */ NULL, /* get_video_output_next */ -#ifdef HAVE_FBO - NULL, - NULL, -#endif + NULL, /* get_current_framebuffer */ + NULL, /* get_proc_address */ NULL, /* set_aspect_ratio */ NULL, /* apply_state_changes */ #ifdef HAVE_MENU diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c index 22ed1666c1..a2e8303e15 100644 --- a/gfx/drivers/psp1_gfx.c +++ b/gfx/drivers/psp1_gfx.c @@ -844,10 +844,8 @@ static const video_poke_interface_t psp_poke_interface = { NULL, /* get_video_output_size */ NULL, /* get_video_output_prev */ NULL, /* get_video_output_next */ -#ifdef HAVE_FBO - NULL, -#endif - NULL, + NULL, /* get_current_framebuffer */ + NULL, /* get_proc_address */ psp_set_aspect_ratio, psp_apply_state_changes, #ifdef HAVE_MENU diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c index 772dece53e..be0f80ec50 100644 --- a/gfx/drivers/sdl2_gfx.c +++ b/gfx/drivers/sdl2_gfx.c @@ -722,10 +722,8 @@ static video_poke_interface_t sdl2_video_poke_interface = { NULL, /* get_video_output_size */ NULL, /* get_video_output_prev */ NULL, /* get_video_output_next */ -#ifdef HAVE_FBO - NULL, -#endif - NULL, + NULL, /* get_current_framebuffer */ + NULL, /* get_proc_address */ sdl2_poke_set_aspect_ratio, sdl2_poke_apply_state_changes, #ifdef HAVE_MENU diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c index 2695525d47..eac9f51708 100644 --- a/gfx/drivers/sdl_gfx.c +++ b/gfx/drivers/sdl_gfx.c @@ -518,10 +518,8 @@ static const video_poke_interface_t sdl_poke_interface = { NULL, /* get_video_output_size */ NULL, /* get_video_output_prev */ NULL, /* get_video_output_next */ -#ifdef HAVE_FBO - NULL, - NULL, -#endif + NULL, /* get_current_framebuffer */ + NULL, /* get_proc_address */ sdl_set_aspect_ratio, sdl_apply_state_changes, #ifdef HAVE_MENU diff --git a/gfx/drivers/sunxi_gfx.c b/gfx/drivers/sunxi_gfx.c index ea82ba1c5a..ea69b26652 100644 --- a/gfx/drivers/sunxi_gfx.c +++ b/gfx/drivers/sunxi_gfx.c @@ -935,9 +935,7 @@ static const video_poke_interface_t sunxi_poke_interface = { NULL, /* get_video_output_size */ NULL, /* get_video_output_prev */ NULL, /* get_video_output_next */ -#ifdef HAVE_FBO NULL, /* get_current_framebuffer */ -#endif NULL, /* get_proc_address */ NULL, /* sunxi_set_aspect_ratio */ NULL, /* sunxi_apply_state_changes */ diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 5407d320c5..9bb129073c 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -248,13 +248,11 @@ static const video_driver_t *video_driver_ctx_get_ptr(void) **/ uintptr_t video_driver_get_current_framebuffer(void) { -#ifdef HAVE_FBO driver_t *driver = driver_get_ptr(); const video_poke_interface_t *poke = video_driver_get_poke_ptr(); if (poke && poke->get_current_framebuffer) return poke->get_current_framebuffer(driver->video_data); -#endif return 0; } diff --git a/gfx/video_driver.h b/gfx/video_driver.h index d6c856205d..bd5e8e2e33 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -105,9 +105,7 @@ typedef struct video_poke_interface void (*get_video_output_size)(void *data, unsigned *width, unsigned *height); void (*get_video_output_prev)(void *data); void (*get_video_output_next)(void *data); -#ifdef HAVE_FBO uintptr_t (*get_current_framebuffer)(void *data); -#endif retro_proc_address_t (*get_proc_address)(void *data, const char *sym); void (*set_aspect_ratio)(void *data, unsigned aspectratio_index); void (*apply_state_changes)(void *data); diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c index bd9dd4914e..ccb328c2a5 100644 --- a/gfx/video_thread_wrapper.c +++ b/gfx/video_thread_wrapper.c @@ -938,10 +938,8 @@ static const video_poke_interface_t thread_poke = { thread_get_video_output_size, thread_get_video_output_prev, thread_get_video_output_next, -#ifdef HAVE_FBO - NULL, -#endif - NULL, + NULL, /* get_current_framebuffer */ + NULL, /* get_proc_address */ thread_set_aspect_ratio, thread_apply_state_changes, #if defined(HAVE_MENU)