mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cut down on HAVE_FBO usage and make sure gl->fbo_inited is set to

Browse Source 
false if HAVE_FBO is not defined
This commit is contained in:
twinaphex 2017-11-12 17:15:29 +01:00
parent ac14f8bb2a
commit c5292025c3
5 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers/caca_gfx.c
View File

@ -312,11 +312,7 @@ static const video_poke_interface_t caca_poke_interface = {
NULL,
NULL,
NULL,
#ifdef HAVE_FBO
NULL,
#else
NULL,
#endif
NULL,
NULL,
NULL,

4
gfx/drivers/gdi_gfx.c
View File

@ -538,11 +538,7 @@ static const video_poke_interface_t gdi_poke_interface = {
gdi_get_video_output_size,
gdi_get_video_output_prev,
gdi_get_video_output_next,
#ifdef HAVE_FBO
NULL,
#else
NULL,
#endif
NULL,
NULL,
NULL,

36
gfx/drivers/gl.c
View File

@ -449,6 +449,8 @@ GLenum min_filter_to_mag(GLenum type)
static uintptr_t gl_get_current_framebuffer(void *data)
{
gl_t *gl = (gl_t*)data;
if (!gl->fbo_inited)
return NULL;
return gl->hw_render_fbo[(gl->tex_index + 1) % gl->textures];
}
@ -1841,10 +1843,9 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
*/
gl->textures = 4;
gl->hw_render_use = false;
#ifdef HAVE_FBO
if (hwr->context_type != RETRO_HW_CONTEXT_NONE)
if (gl->fbo_inited && hwr->context_type != RETRO_HW_CONTEXT_NONE)
gl->hw_render_use = true;
#endif
if (gl->hw_render_use)
{
@ -1949,12 +1950,15 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
if (gl->renderchain_driver->init)
gl->renderchain_driver->init(gl, gl->tex_w, gl->tex_h);
if (gl->hw_render_use &&
gl->renderchain_driver->init_hw_render &&
!gl->renderchain_driver->init_hw_render(gl, gl->tex_w, gl->tex_h))
if (gl->fbo_inited)
{
RARCH_ERR("[GL]: Hardware rendering context initialization failed.\n");
goto error;
if (gl->hw_render_use &&
gl->renderchain_driver->init_hw_render &&
!gl->renderchain_driver->init_hw_render(gl, gl->tex_w, gl->tex_h))
{
RARCH_ERR("[GL]: Hardware rendering context initialization failed.\n");
goto error;
}
}
inp.input = input;
@ -2125,11 +2129,13 @@ static bool gl_set_shader(void *data,
goto error;
}
if (gl->renderchain_driver->deinit_fbo)
gl->renderchain_driver->deinit_fbo(gl);
#ifdef HAVE_FBO
glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);
#endif
if (gl->fbo_inited)
{
if (gl->renderchain_driver->deinit_fbo)
gl->renderchain_driver->deinit_fbo(gl);
glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);
}
init_data.shader_type = type;
init_data.shader = NULL;
@ -2542,11 +2548,7 @@ static const video_poke_interface_t gl_poke_interface = {
gl_get_video_output_size,
gl_get_video_output_prev,
gl_get_video_output_next,
#ifdef HAVE_FBO
gl_get_current_framebuffer,
#else
NULL,
#endif
gl_get_proc_address,
gl_set_aspect_ratio,
gl_apply_state_changes,

2
gfx/drivers/gl_symlinks.h
View File

@ -27,7 +27,7 @@
#include "config.h"
#endif
#if defined(HAVE_FBO) && defined(HAVE_PSGL)
#if defined(HAVE_PSGL)
#define glGenFramebuffers glGenFramebuffersOES
#define glBindFramebuffer glBindFramebufferOES
#define glFramebufferTexture2D glFramebufferTexture2DOES

4
gfx/drivers_renderchain/gl2_renderchain.c
View File

@ -428,8 +428,6 @@ static void gl2_renderchain_render(
static void gl2_renderchain_deinit_fbo(void *data)
{
gl_t *gl = (gl_t*)data;
if (!gl->fbo_inited)
return;
glDeleteTextures(gl->fbo_pass, gl->fbo_texture);
glDeleteFramebuffers(gl->fbo_pass, gl->fbo);
@ -749,6 +747,7 @@ static void gl2_renderchain_start_render(void *data,
void gl2_renderchain_init(
void *data, unsigned fbo_width, unsigned fbo_height)
{
#ifdef HAVE_FBO
int i;
unsigned width, height;
video_shader_ctx_scale_t scaler;
@ -851,6 +850,7 @@ void gl2_renderchain_init(
}
gl->fbo_inited = true;
#endif
}
static bool gl2_renderchain_init_hw_render(