Removed some debug logs.
This commit is contained in:
parent
7e60cc530a
commit
4a0407fb69
|
@ -34,11 +34,11 @@
|
||||||
#include <typeinfo>
|
#include <typeinfo>
|
||||||
#include <wx/msgdlg.h>
|
#include <wx/msgdlg.h>
|
||||||
#include <confirm.h>
|
#include <confirm.h>
|
||||||
#ifdef __WXDEBUG__
|
#ifdef PROFILE
|
||||||
#include <profile.h>
|
#include <profile.h>
|
||||||
#include <wx/debug.h>
|
#include <wx/debug.h>
|
||||||
#include <wx/log.h>
|
#include <wx/log.h>
|
||||||
#endif
|
#endif /* PROFILE */
|
||||||
|
|
||||||
using namespace KIGFX;
|
using namespace KIGFX;
|
||||||
|
|
||||||
|
@ -187,10 +187,10 @@ void GPU_CACHED_MANAGER::EndDrawing()
|
||||||
|
|
||||||
void GPU_CACHED_MANAGER::uploadToGpu()
|
void GPU_CACHED_MANAGER::uploadToGpu()
|
||||||
{
|
{
|
||||||
#ifdef __WXDEBUG__
|
#ifdef PROFILE
|
||||||
prof_counter totalTime;
|
prof_counter totalTime;
|
||||||
prof_start( &totalTime );
|
prof_start( &totalTime );
|
||||||
#endif /* __WXDEBUG__ */
|
#endif /* PROFILE */
|
||||||
|
|
||||||
if( !m_buffersInitialized )
|
if( !m_buffersInitialized )
|
||||||
Initialize();
|
Initialize();
|
||||||
|
@ -207,15 +207,13 @@ void GPU_CACHED_MANAGER::uploadToGpu()
|
||||||
m_indices.reset( new GLuint[bufferSize] );
|
m_indices.reset( new GLuint[bufferSize] );
|
||||||
|
|
||||||
if( glGetError() != GL_NO_ERROR )
|
if( glGetError() != GL_NO_ERROR )
|
||||||
{
|
|
||||||
DisplayError( NULL, wxT( "Error during data upload to the GPU memory" ) );
|
DisplayError( NULL, wxT( "Error during data upload to the GPU memory" ) );
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef __WXDEBUG__
|
#ifdef PROFILE
|
||||||
prof_end( &totalTime );
|
prof_end( &totalTime );
|
||||||
|
|
||||||
wxLogDebug( wxT( "Uploading %d vertices to GPU / %.1f ms" ), bufferSize, totalTime.msecs() );
|
wxLogDebug( wxT( "Uploading %d vertices to GPU / %.1f ms" ), bufferSize, totalTime.msecs() );
|
||||||
#endif /* __WXDEBUG__ */
|
#endif /* PROFILE */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -34,9 +34,9 @@
|
||||||
#include <gal/graphics_abstraction_layer.h>
|
#include <gal/graphics_abstraction_layer.h>
|
||||||
#include <painter.h>
|
#include <painter.h>
|
||||||
|
|
||||||
#ifdef __WXDEBUG__
|
#ifdef PROFILE
|
||||||
#include <profile.h>
|
#include <profile.h>
|
||||||
#endif /* __WXDEBUG__ */
|
#endif /* PROFILE */
|
||||||
|
|
||||||
using namespace KIGFX;
|
using namespace KIGFX;
|
||||||
|
|
||||||
|
@ -981,10 +981,10 @@ void VIEW::RecacheAllItems( bool aImmediately )
|
||||||
|
|
||||||
r.SetMaximum();
|
r.SetMaximum();
|
||||||
|
|
||||||
#ifdef __WXDEBUG__
|
#ifdef PROFILE
|
||||||
prof_counter totalRealTime;
|
prof_counter totalRealTime;
|
||||||
prof_start( &totalRealTime );
|
prof_start( &totalRealTime );
|
||||||
#endif /* __WXDEBUG__ */
|
#endif /* PROFILE */
|
||||||
|
|
||||||
for( LAYER_MAP_ITER i = m_layers.begin(); i != m_layers.end(); ++i )
|
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 );
|
prof_end( &totalRealTime );
|
||||||
|
|
||||||
wxLogDebug( wxT( "RecacheAllItems::immediately: %u %.1f ms" ),
|
wxLogDebug( wxT( "RecacheAllItems::immediately: %u %.1f ms" ),
|
||||||
aImmediately, totalRealTime.msecs() );
|
aImmediately, totalRealTime.msecs() );
|
||||||
#endif /* __WXDEBUG__ */
|
#endif /* PROFILE */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,8 @@
|
||||||
#ifndef __TRACE_H
|
#ifndef __TRACE_H
|
||||||
#define __TRACE_H
|
#define __TRACE_H
|
||||||
|
|
||||||
#ifdef DEBUG
|
// #ifdef DEBUG
|
||||||
|
#if 0
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
Loading…
Reference in New Issue