mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-24 15:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Should hopefully fix Reicast issues"

Browse Source 
This reverts commit 509ecab3fe75f286881270a5d4c1ba4d3e75ba66.
This commit is contained in:
twinaphex 2018-10-08 18:54:26 +02:00
parent 509ecab3fe
commit 508e5efdd7
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gfx/drivers/gl.c
View File

@ -1780,32 +1780,26 @@ static void *gl_init(const video_info_t *video,
hwr = video_driver_get_hw_context(); hwr = video_driver_get_hw_context();
if (hwr) if (hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE)
{ {
hwr->version_major = gl->version_major; gfx_ctx_flags_t flags;
hwr->version_minor = gl->version_minor;
if (hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE) gl_query_core_context_set(true);
gl->core_context_in_use = true;
/**
* Ensure that the rest of the frontend knows we have a core context
*/
flags.flags = 0;
BIT32_SET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT);
video_context_driver_set_flags(&flags);
RARCH_LOG("[GL]: Using Core GL context, setting up VAO...\n");
if (!gl_check_capability(GL_CAPS_VAO))
{ {
gfx_ctx_flags_t flags; RARCH_ERR("[GL]: Failed to initialize VAOs.\n");
goto error;
gl_query_core_context_set(true);
gl->core_context_in_use = true;
/**
* Ensure that the rest of the frontend knows we have a core context
*/
flags.flags = 0;
BIT32_SET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT);
video_context_driver_set_flags(&flags);
RARCH_LOG("[GL]: Using Core GL context, setting up VAO...\n");
if (!gl_check_capability(GL_CAPS_VAO))
{
RARCH_ERR("[GL]: Failed to initialize VAOs.\n");
goto error;
}
} }
} }
@ -1819,7 +1813,7 @@ static void *gl_init(const video_info_t *video,
if (gl->renderchain_driver->restore_default_state) if (gl->renderchain_driver->restore_default_state)
gl->renderchain_driver->restore_default_state(gl, gl->renderchain_data); gl->renderchain_driver->restore_default_state(gl, gl->renderchain_data);
if (hwr && hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE) if (hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE)
if (gl->renderchain_driver->new_vao) if (gl->renderchain_driver->new_vao)
gl->renderchain_driver->new_vao(gl, gl->renderchain_data); gl->renderchain_driver->new_vao(gl, gl->renderchain_data);
@ -1829,7 +1823,7 @@ static void *gl_init(const video_info_t *video,
gl->hw_render_use = false; gl->hw_render_use = false;
gl->has_fbo = gl_check_capability(GL_CAPS_FBO); gl->has_fbo = gl_check_capability(GL_CAPS_FBO);
if (gl->has_fbo && hwr && hwr->context_type != RETRO_HW_CONTEXT_NONE) if (gl->has_fbo && hwr->context_type != RETRO_HW_CONTEXT_NONE)
gl->hw_render_use = true; gl->hw_render_use = true;
if (!resolve_extensions(gl, ctx_driver->ident, video)) if (!resolve_extensions(gl, ctx_driver->ident, video))
@ -1861,7 +1855,7 @@ static void *gl_init(const video_info_t *video,
RARCH_LOG("[GL]: Using resolution %ux%u\n", temp_width, temp_height); RARCH_LOG("[GL]: Using resolution %ux%u\n", temp_width, temp_height);
gl->vertex_ptr = (hwr && hwr->bottom_left_origin) gl->vertex_ptr = hwr->bottom_left_origin
? vertexes : vertexes_flipped; ? vertexes : vertexes_flipped;
/* Better pipelining with GPU due to synchronous glSubTexImage. /* Better pipelining with GPU due to synchronous glSubTexImage.