mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Roll all this back

Browse Source
This commit is contained in:
twinaphex 2018-10-09 20:42:47 +02:00
parent 28b18fe4c2
commit c02536af08
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gfx/drivers/gl.c
View File

@ -1787,19 +1787,7 @@ 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;
hwr->version_minor = gl->version_minor;
}
#ifdef GL_CONTEXT_PROFILE_MASK
/* Check if we have a core context */
GLint glflags = 0;
glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &glflags);
while (glGetError() != GL_NO_ERROR);
if (glflags & GL_CONTEXT_CORE_PROFILE_BIT)
{ {
gfx_ctx_flags_t flags; gfx_ctx_flags_t flags;
@ -1821,11 +1809,6 @@ static void *gl_init(const video_info_t *video,
goto error; goto error;
} }
} }
else
#endif
if (hwr && hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE)
hwr->context_type = RETRO_HW_CONTEXT_OPENGL;
if (!renderchain_gl_init_first(&gl->renderchain_driver, if (!renderchain_gl_init_first(&gl->renderchain_driver,
&gl->renderchain_data)) &gl->renderchain_data))
@ -1837,7 +1820,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);
@ -1847,7 +1830,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))
@ -1879,7 +1862,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.