ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not force the requested hw context to be Open GL

This commit is contained in:
flyinghead 2018-10-09 20:31:40 +02:00
parent c11e47b08a
commit 8d586e1a0c
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_major = gl->version_major;
hwr->version_minor = gl->version_minor; hwr->version_minor = gl->version_minor;
hwr->context_type = RETRO_HW_CONTEXT_OPENGL;
} }
#ifdef GL_CONTEXT_PROFILE_MASK #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_query_core_context_set(true);
gl->core_context_in_use = 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 * 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; goto error;
} }
} }
else
#endif #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))