libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-29 11:10:27 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #7394 from flyinghead/fh/nogl-fix

Browse Source 
Do not force the requested hw context to be Open GL
This commit is contained in:
Twinaphex 2018-10-09 20:37:45 +02:00 committed by GitHub
commit 28b18fe4c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/drivers/gl.c
View File

@ -1791,7 +1791,6 @@ static void *gl_init(const video_info_t *video,
{
hwr->version_major = gl->version_major;
hwr->version_minor = gl->version_minor;
hwr->context_type = RETRO_HW_CONTEXT_OPENGL;
}
#ifdef GL_CONTEXT_PROFILE_MASK
@ -1807,8 +1806,6 @@ static void *gl_init(const video_info_t *video,
gl_query_core_context_set(true);
gl->core_context_in_use = true;
if (hwr)
hwr->context_type = RETRO_HW_CONTEXT_OPENGL_CORE;
/**
* Ensure that the rest of the frontend knows we have a core context
*/
@ -1824,7 +1821,11 @@ static void *gl_init(const video_info_t *video,
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,
&gl->renderchain_data))