OpenGLES 2 context should not be accessible for GLES 1.0-ish contexts

like PSGL
This commit is contained in:
twinaphex 2016-08-08 17:23:54 +02:00
parent 30c847cc10
commit a61bff9330

View File

@ -1124,19 +1124,20 @@ bool rarch_environment_cb(unsigned cmd, void *data)
RARCH_LOG("Requesting no HW context.\n"); RARCH_LOG("Requesting no HW context.\n");
break; break;
#ifdef HAVE_VULKAN
case RETRO_HW_CONTEXT_VULKAN: case RETRO_HW_CONTEXT_VULKAN:
#ifdef HAVE_VULKAN
RARCH_LOG("Requesting Vulkan context.\n"); RARCH_LOG("Requesting Vulkan context.\n");
break; break;
#else #else
case RETRO_HW_CONTEXT_VULKAN:
RARCH_ERR("Requesting Vulkan context, but RetroArch is not compiled against Vulkan. Cannot use HW context.\n"); RARCH_ERR("Requesting Vulkan context, but RetroArch is not compiled against Vulkan. Cannot use HW context.\n");
return false; return false;
#endif #endif
#if defined(HAVE_OPENGLES) #if defined(HAVE_OPENGLES)
#if (defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3))
case RETRO_HW_CONTEXT_OPENGLES2: case RETRO_HW_CONTEXT_OPENGLES2:
#if defined(HAVE_OPENGLES3) #ifdef HAVE_OPENGLES3
case RETRO_HW_CONTEXT_OPENGLES3: case RETRO_HW_CONTEXT_OPENGLES3:
#endif #endif
RARCH_LOG("Requesting OpenGLES%u context.\n", RARCH_LOG("Requesting OpenGLES%u context.\n",
@ -1150,11 +1151,13 @@ bool rarch_environment_cb(unsigned cmd, void *data)
break; break;
#endif #endif
#endif
case RETRO_HW_CONTEXT_OPENGL: case RETRO_HW_CONTEXT_OPENGL:
case RETRO_HW_CONTEXT_OPENGL_CORE: case RETRO_HW_CONTEXT_OPENGL_CORE:
RARCH_ERR("Requesting OpenGL context, but RetroArch " RARCH_ERR("Requesting OpenGL context, but RetroArch "
"is compiled against OpenGLES2. Cannot use HW context.\n"); "is compiled against OpenGLES. Cannot use HW context.\n");
return false; return false;
#elif defined(HAVE_OPENGL) #elif defined(HAVE_OPENGL)
case RETRO_HW_CONTEXT_OPENGLES2: case RETRO_HW_CONTEXT_OPENGLES2:
case RETRO_HW_CONTEXT_OPENGLES3: case RETRO_HW_CONTEXT_OPENGLES3: