haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable GL debug output only if available

This commit is contained in:
Maciej Suminski 2018-02-14 08:51:48 +01:00
parent f68bf33cd3
commit 5c8accef8e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/gal/opengl/opengl_gal.cpp
View File

@ -338,8 +338,6 @@ void OPENGL_GAL::BeginDrawing()
wxLogTrace( "GAL_PROFILE", wxLogTrace( "GAL_PROFILE",
wxT( "OPENGL_GAL::BeginDrawing(): %.1f ms" ), totalRealTime.msecs() ); wxT( "OPENGL_GAL::BeginDrawing(): %.1f ms" ), totalRealTime.msecs() );
#endif /* __WXDEBUG__ */ #endif /* __WXDEBUG__ */
//enableGlDebug( true );
} }
@ -1774,12 +1772,6 @@ void OPENGL_GAL::init()
GLenum err = glewInit(); GLenum err = glewInit();
#if defined (__LINUX__) // calling enableGlDebug crashes opengl on some OS (OSX and some Windows)
#ifdef DEBUG
enableGlDebug( true );
#endif
#endif
try try
{ {
if( GLEW_OK != err ) if( GLEW_OK != err )
@ -1789,6 +1781,13 @@ void OPENGL_GAL::init()
if( !GLEW_VERSION_2_1 ) if( !GLEW_VERSION_2_1 )
throw std::runtime_error( "OpenGL 2.1 or higher is required!" ); throw std::runtime_error( "OpenGL 2.1 or higher is required!" );
#if defined (__LINUX__) // calling enableGlDebug crashes opengl on some OS (OSX and some Windows)
#ifdef DEBUG
if( GLEW_ARB_debug_output )
enableGlDebug( true );
#endif
#endif
// Framebuffers have to be supported // Framebuffers have to be supported
if( !GLEW_EXT_framebuffer_object ) if( !GLEW_EXT_framebuffer_object )
throw std::runtime_error( "Framebuffer objects are not supported!" ); throw std::runtime_error( "Framebuffer objects are not supported!" );