diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-04-01 12:14:51 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-01 12:14:51 +1300 |
| commit | 587ed3213cb96deb91a736341c44613adaec8616 (patch) | |
| tree | 3d9a0987478333fec396da2df941713dd2ebc70d /Source | |
| parent | 67e950d02c42b7a20db77c26903ae6c63c2b88e1 (diff) | |
| parent | 5326a18fdfe520ed424d9d7c811191cfb55aeb08 (diff) | |
Merge pull request #5189 from stenzek/gl-msaa
OGL: Fix MSAA being forced to 1x
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 69554269cb..198dc7f05f 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -580,6 +580,10 @@ Renderer::Renderer() g_Config.backend_info.bSupportsEarlyZ = g_ogl_config.bSupportsEarlyFragmentTests || g_ogl_config.bSupportsConservativeDepth; + glGetIntegerv(GL_MAX_SAMPLES, &g_ogl_config.max_samples); + if (g_ogl_config.max_samples < 1 || !g_ogl_config.bSupportsMSAA) + g_ogl_config.max_samples = 1; + if (g_ogl_config.bSupportsDebug) { if (GLExtensions::Supports("GL_KHR_debug")) diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index c1cf73f413..300d096978 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -170,10 +170,6 @@ bool VideoBackend::FillBackendInfo() return false; } - glGetIntegerv(GL_MAX_SAMPLES, &g_ogl_config.max_samples); - if (g_ogl_config.max_samples < 1 || !g_ogl_config.bSupportsMSAA) - g_ogl_config.max_samples = 1; - // TODO: Move the remaining fields from the Renderer constructor here. return true; } |