CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-19 00:41:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add has_fbo member variable - fixes GL issues

Browse Source
This commit is contained in:
twinaphex 2017-11-13 05:23:15 +01:00
parent 40a8388c29
commit 6fa5fcfa1f
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/common/gl_common.h
View File

@ -55,6 +55,7 @@ typedef struct gl
bool fbo_feedback_enable;
bool hw_render_fbo_init;
bool hw_render_depth_init;
bool has_fbo;
bool has_srgb_fbo_gles3;
bool has_fp_fbo;
bool has_srgb_fbo;

7
gfx/drivers/gl.c
View File

@ -449,7 +449,7 @@ GLenum min_filter_to_mag(GLenum type)
static uintptr_t gl_get_current_framebuffer(void *data)
{
gl_t *gl = (gl_t*)data;
if (!gl || !gl->fbo_inited)
if (!gl || !gl->has_fbo)
return 0;
return gl->hw_render_fbo[(gl->tex_index + 1) % gl->textures];
}
@ -1364,6 +1364,7 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident)
* have_sync - Use ARB_sync to reduce latency.
*/
gl->has_srgb_fbo = false;
gl->has_fbo = gl_check_capability(GL_CAPS_FBO);
gl->have_full_npot_support = gl_check_capability(GL_CAPS_FULL_NPOT_SUPPORT);
gl->have_mipmap = gl_check_capability(GL_CAPS_MIPMAP);
gl->have_es2_compat = gl_check_capability(GL_CAPS_ES2_COMPAT);
@ -1844,7 +1845,7 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
gl->textures = 4;
gl->hw_render_use = false;
if (gl->fbo_inited && hwr->context_type != RETRO_HW_CONTEXT_NONE)
if (gl->has_fbo && hwr->context_type != RETRO_HW_CONTEXT_NONE)
gl->hw_render_use = true;
if (gl->hw_render_use)
@ -1950,7 +1951,7 @@ 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->fbo_inited)
if (gl->has_fbo)
{
if (gl->hw_render_use &&
gl->renderchain_driver->init_hw_render &&

4
gfx/drivers_renderchain/gl2_renderchain.c
View File

@ -773,7 +773,7 @@ void gl2_renderchain_init(
if (shader_info.num == 1 && !scale.valid)
return;
if (!gl_check_capability(GL_CAPS_FBO))
if (!gl->has_fbo)
{
RARCH_ERR("[GL]: Failed to locate FBO functions. Won't be able to use render-to-texture.\n");
return;
@ -873,7 +873,7 @@ static bool gl2_renderchain_init_hw_render(
RARCH_LOG("[GL]: Max texture size: %d px, renderbuffer size: %d px.\n",
max_fbo_size, max_renderbuffer_size);
if (!gl_check_capability(GL_CAPS_FBO))
if (!gl->has_fbo)
return false;
RARCH_LOG("[GL]: Supports FBO (render-to-texture).\n");