diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-12-12 12:43:49 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-12-12 12:43:49 -0600 |
| commit | f9ff0bc55dda398ffdb790d22b6eb7fb7287968a (patch) | |
| tree | 8541d66bc919398696ddb5c2a6803bf72417b1a7 /Source/Core/VideoBackends | |
| parent | 2a0adc3972f7fba5e1be8c2ff4430c7e2421663d (diff) | |
Have our OpenGL/ES context creation be less stupid.
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Src/main.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/Src/SWmain.cpp | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/OGL/Src/main.cpp b/Source/Core/VideoBackends/OGL/Src/main.cpp index 7ad18bca25..60b7fe6017 100644 --- a/Source/Core/VideoBackends/OGL/Src/main.cpp +++ b/Source/Core/VideoBackends/OGL/Src/main.cpp @@ -179,6 +179,10 @@ bool VideoBackend::Initialize(void *&window_handle) UpdateActiveConfig(); InitInterface(); + GLInterface->SetMode(GLInterfaceMode::MODE_OPENGL); +#ifdef USE_GLES3 + GLInterface->SetMode(GLInterfaceMode::MODE_OPENGLES3); +#endif if (!GLInterface->Create(window_handle)) return false; diff --git a/Source/Core/VideoBackends/Software/Src/SWmain.cpp b/Source/Core/VideoBackends/Software/Src/SWmain.cpp index 074b6bc38b..582325d5f4 100644 --- a/Source/Core/VideoBackends/Software/Src/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/Src/SWmain.cpp @@ -61,8 +61,12 @@ void VideoSoftware::ShowConfig(void *_hParent) bool VideoSoftware::Initialize(void *&window_handle) { g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str()); - InitInterface(); + InitInterface(); + GLInterface->SetMode(GLInterfaceMode::MODE_OPENGL); +#ifdef USE_GLES + GLInterface->SetMode(GLInterfaceMode::MODE_OPENGLES2); +#endif if (!GLInterface->Create(window_handle)) { INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n"); |