diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-11-13 13:40:07 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-11-13 13:40:07 -0300 |
| commit | 2e3a1caa069c3eddfbf0b890bff7f7d85925b476 (patch) | |
| tree | f4187166387937cae6ef582b70ad13b7749bffb3 | |
| parent | 65cc56c35da357ac7799ed9616aba4898f17f232 (diff) | |
Disable OpenGL warnings unless running with -v, closes #7171
| -rw-r--r-- | drivers/gles3/rasterizer_gles3.cpp | 8 | ||||
| -rw-r--r-- | platform/windows/context_gl_win.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gles3/rasterizer_gles3.cpp b/drivers/gles3/rasterizer_gles3.cpp index 72a3c3256b..220a3533b7 100644 --- a/drivers/gles3/rasterizer_gles3.cpp +++ b/drivers/gles3/rasterizer_gles3.cpp @@ -168,9 +168,11 @@ void RasterizerGLES3::initialize() { #ifdef __APPLE__ // FIXME glDebugMessageCallbackARB does not seem to work on Mac OS X and opengl 3, this may be an issue with our opengl canvas.. #else - glEnable(_EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB); - glDebugMessageCallbackARB(_gl_debug_print, NULL); - glEnable(_EXT_DEBUG_OUTPUT); + if (OS::get_singleton()->is_stdout_verbose()) { + glEnable(_EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB); + glDebugMessageCallbackARB(_gl_debug_print, NULL); + glEnable(_EXT_DEBUG_OUTPUT); + } #endif #endif diff --git a/platform/windows/context_gl_win.cpp b/platform/windows/context_gl_win.cpp index 64b6d202a1..8571f0dc65 100644 --- a/platform/windows/context_gl_win.cpp +++ b/platform/windows/context_gl_win.cpp @@ -165,7 +165,7 @@ Error ContextGL_Win::initialize() { WGL_CONTEXT_MAJOR_VERSION_ARB, 3, //we want a 3.3 context WGL_CONTEXT_MINOR_VERSION_ARB, 3, //and it shall be forward compatible so that we can only use up to date functionality - WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB | _WGL_CONTEXT_DEBUG_BIT_ARB, + WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB /*| _WGL_CONTEXT_DEBUG_BIT_ARB*/, 0 }; //zero indicates the end of the array |