mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-19 21:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce HAVE_FBO ifdefs

Browse Source
This commit is contained in:
twinaphex 2015-04-25 02:35:06 +02:00
parent 642c5d4557
commit c22535b7e1
13 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/d3d/d3d.cpp
View File

@ -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

4
gfx/drivers/ctr_gfx.c
View File

@ -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,

2
gfx/drivers/dispmanx_gfx.c
View File

@ -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 */

2
gfx/drivers/exynos_gfx.c
View File

@ -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,

2
gfx/drivers/gl.c
View File

@ -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,

6
gfx/drivers/omap_gfx.c
View File

@ -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

6
gfx/drivers/psp1_gfx.c
View File

@ -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

6
gfx/drivers/sdl2_gfx.c
View File

@ -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

6
gfx/drivers/sdl_gfx.c
View File

@ -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

2
gfx/drivers/sunxi_gfx.c
View File

@ -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 */

2
gfx/video_driver.c
View File

@ -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;
}

2
gfx/video_driver.h
View File

@ -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);

6
gfx/video_thread_wrapper.c
View File

@ -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)