asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable OpenGL warnings unless running with -v, closes #7171

Browse source
This commit is contained in:
Juan Linietsky 2017-11-13 13:40:07 -03:00
parent 65cc56c35d
commit 2e3a1caa06
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gles3/rasterizer_gles3.cpp
View file

@ -168,9 +168,11 @@ void RasterizerGLES3::initialize() {
#ifdef __APPLE__ #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.. // FIXME glDebugMessageCallbackARB does not seem to work on Mac OS X and opengl 3, this may be an issue with our opengl canvas..
#else #else
glEnable(_EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB); if (OS::get_singleton()->is_stdout_verbose()) {
glDebugMessageCallbackARB(_gl_debug_print, NULL); glEnable(_EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
glEnable(_EXT_DEBUG_OUTPUT); glDebugMessageCallbackARB(_gl_debug_print, NULL);
glEnable(_EXT_DEBUG_OUTPUT);
}
#endif #endif
#endif #endif

2
platform/windows/context_gl_win.cpp
View file

@ -165,7 +165,7 @@ Error ContextGL_Win::initialize() {
WGL_CONTEXT_MAJOR_VERSION_ARB, 3, //we want a 3.3 context WGL_CONTEXT_MAJOR_VERSION_ARB, 3, //we want a 3.3 context
WGL_CONTEXT_MINOR_VERSION_ARB, 3, WGL_CONTEXT_MINOR_VERSION_ARB, 3,
//and it shall be forward compatible so that we can only use up to date functionality //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 0
}; //zero indicates the end of the array }; //zero indicates the end of the array