From 4a0407fb69c46def2c85b3697e1070c44c19d3a2 Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Wed, 18 Dec 2013 12:46:18 +0100 Subject: [PATCH] Removed some debug logs. --- common/gal/opengl/gpu_manager.cpp | 14 ++++++-------- common/view/view.cpp | 12 ++++++------ pcbnew/router/trace.h | 3 ++- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/common/gal/opengl/gpu_manager.cpp b/common/gal/opengl/gpu_manager.cpp index 8b556b32ce..25cd5fa418 100644 --- a/common/gal/opengl/gpu_manager.cpp +++ b/common/gal/opengl/gpu_manager.cpp @@ -34,11 +34,11 @@ #include #include #include -#ifdef __WXDEBUG__ +#ifdef PROFILE #include #include #include -#endif +#endif /* PROFILE */ using namespace KIGFX; @@ -187,10 +187,10 @@ void GPU_CACHED_MANAGER::EndDrawing() void GPU_CACHED_MANAGER::uploadToGpu() { -#ifdef __WXDEBUG__ +#ifdef PROFILE prof_counter totalTime; prof_start( &totalTime ); -#endif /* __WXDEBUG__ */ +#endif /* PROFILE */ if( !m_buffersInitialized ) Initialize(); @@ -207,15 +207,13 @@ void GPU_CACHED_MANAGER::uploadToGpu() m_indices.reset( new GLuint[bufferSize] ); if( glGetError() != GL_NO_ERROR ) - { DisplayError( NULL, wxT( "Error during data upload to the GPU memory" ) ); - } -#ifdef __WXDEBUG__ +#ifdef PROFILE prof_end( &totalTime ); wxLogDebug( wxT( "Uploading %d vertices to GPU / %.1f ms" ), bufferSize, totalTime.msecs() ); -#endif /* __WXDEBUG__ */ +#endif /* PROFILE */ } diff --git a/common/view/view.cpp b/common/view/view.cpp index a607c6112b..0ff8708ed0 100644 --- a/common/view/view.cpp +++ b/common/view/view.cpp @@ -34,9 +34,9 @@ #include #include -#ifdef __WXDEBUG__ +#ifdef PROFILE #include -#endif /* __WXDEBUG__ */ +#endif /* PROFILE */ using namespace KIGFX; @@ -981,10 +981,10 @@ void VIEW::RecacheAllItems( bool aImmediately ) r.SetMaximum(); -#ifdef __WXDEBUG__ +#ifdef PROFILE prof_counter totalRealTime; prof_start( &totalRealTime ); -#endif /* __WXDEBUG__ */ +#endif /* PROFILE */ for( LAYER_MAP_ITER i = m_layers.begin(); i != m_layers.end(); ++i ) { @@ -1000,12 +1000,12 @@ void VIEW::RecacheAllItems( bool aImmediately ) } } -#ifdef __WXDEBUG__ +#ifdef PROFILE prof_end( &totalRealTime ); wxLogDebug( wxT( "RecacheAllItems::immediately: %u %.1f ms" ), aImmediately, totalRealTime.msecs() ); -#endif /* __WXDEBUG__ */ +#endif /* PROFILE */ } diff --git a/pcbnew/router/trace.h b/pcbnew/router/trace.h index b1acfd688f..1f8a3e32c9 100644 --- a/pcbnew/router/trace.h +++ b/pcbnew/router/trace.h @@ -21,7 +21,8 @@ #ifndef __TRACE_H #define __TRACE_H -#ifdef DEBUG +// #ifdef DEBUG +#if 0 #include #include