ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5189 from stenzek/gl-msaa 

OGL: Fix MSAA being forced to 1x
This commit is contained in:
Matthew Parlane 2017-04-01 12:14:51 +13:00 committed by GitHub
parent 67e950d02c 5326a18fdf
commit 587ed3213c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -580,6 +580,10 @@ Renderer::Renderer()
g_Config.backend_info.bSupportsEarlyZ = g_Config.backend_info.bSupportsEarlyZ =
g_ogl_config.bSupportsEarlyFragmentTests || g_ogl_config.bSupportsConservativeDepth; 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 (g_ogl_config.bSupportsDebug)
{ {
if (GLExtensions::Supports("GL_KHR_debug")) if (GLExtensions::Supports("GL_KHR_debug"))

4
Source/Core/VideoBackends/OGL/main.cpp
View File

@ -170,10 +170,6 @@ bool VideoBackend::FillBackendInfo()
return false; 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. // TODO: Move the remaining fields from the Renderer constructor here.
return true; return true;
} }