diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-11-25 12:41:47 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-11-25 12:41:47 -0500 |
| commit | 4afb85ef33c39fbda60a92620990e4ae1f2bd763 (patch) | |
| tree | ea18e9058d9391953c4567bfa09ede5b50a6b6e3 /Source/Core/VideoBackends/OGL/Render.cpp | |
| parent | aa92797f930caa1ef3104b3f333f9e15d6e6e570 (diff) | |
| parent | 6f3e20ac4256460ab726a4ed693718f51883fcc9 (diff) | |
Merge pull request #1584 from degasus/master
OGL: also show driver warnings on release builds
Diffstat (limited to 'Source/Core/VideoBackends/OGL/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 3d21b6891c..b66d24b0fd 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -161,7 +161,6 @@ static void ApplySSAASettings() } } -#if defined(_DEBUG) || defined(DEBUGFAST) static void GLAPIENTRY ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* message, const void* userParam) { const char *s_source; @@ -195,7 +194,6 @@ static void GLAPIENTRY ErrorCallback( GLenum source, GLenum type, GLuint id, GLe default: ERROR_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break; } } -#endif // Two small Fallbacks to avoid GL_ARB_ES2_compatibility static void GLAPIENTRY DepthRangef(GLfloat neardepth, GLfloat fardepth) @@ -520,7 +518,7 @@ Renderer::Renderer() g_ogl_config.eSupportedGLSLVersion = GLSL_150; } } -#if defined(_DEBUG) || defined(DEBUGFAST) + if (GLExtensions::Supports("GL_KHR_debug")) { glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, nullptr, true); @@ -533,7 +531,7 @@ Renderer::Renderer() glDebugMessageCallbackARB( ErrorCallback, nullptr ); glEnable( GL_DEBUG_OUTPUT ); } -#endif + int samples; glGetIntegerv(GL_SAMPLES, &samples); if (samples > 1) |