diff options
| author | Ryan Houdek <Sonicadvance1@Gmail.com> | 2014-01-18 04:11:59 +0000 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@Gmail.com> | 2014-01-18 04:11:59 +0000 |
| commit | 839df31347cd1331c5426c2eae549371d7ae160f (patch) | |
| tree | 48259531b09561eb7f703d01049a987d75a99910 /Source/Core/VideoBackends/Software/SWmain.cpp | |
| parent | 0a5bd83af2917534501537c36d7ed25cd1cef31c (diff) | |
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
Diffstat (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWmain.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index ed868070e7..dba35560ac 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -63,10 +63,7 @@ bool VideoSoftware::Initialize(void *&window_handle) g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str()); InitInterface(); - GLInterface->SetMode(GLInterfaceMode::MODE_OPENGL); -#ifdef USE_GLES - GLInterface->SetMode(GLInterfaceMode::MODE_OPENGLES2); -#endif + GLInterface->SetMode(GLInterfaceMode::MODE_DETECT); if (!GLInterface->Create(window_handle)) { INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n"); |