From 839df31347cd1331c5426c2eae549371d7ae160f Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 18 Jan 2014 04:11:59 +0000 Subject: Merge of GL-AutoChoose. This branch is the final step of fully supporting both OpenGL and OpenGL ES in the same binary. This of course only applies to EGL and won't work for GLX/AGL/WGL since they don't really support GL ES. The changes here actually aren't too terrible, basically change every #ifdef USE_GLES to a runtime check. This adds a DetectMode() function to the EGL context backend. EGL will iterate through each of the configs and check for GL, GLES3_KHR, and GLES2 bits After that it'll change the mode from _DETECT to whichever one is the best supported. After that point we'll just create a context with the mode that was detected --- Source/Core/VideoCommon/VideoBackendBase.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'Source/Core/VideoCommon/VideoBackendBase.cpp') diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp index bddd51f0a8..b99b6743c9 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.cpp +++ b/Source/Core/VideoCommon/VideoBackendBase.cpp @@ -8,9 +8,7 @@ #ifdef _WIN32 #include "../VideoBackends/D3D/VideoBackend.h" #endif -#if !defined(USE_GLES) || USE_GLES3 #include "../VideoBackends/OGL/VideoBackend.h" -#endif #include "../VideoBackends/Software/VideoBackend.h" std::vector g_available_video_backends; -- cgit v1.2.3