summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-11-30 16:22:11 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-12-04 01:57:01 +0000
commitb75087d098c4cdc44769c2bb02b6f8654dc20d37 (patch)
tree3d4bcdc9c4555cc83435b6eada154840e5d9b68e
parentAvoid excessive flushing by hold paint guard over window update. (diff)
downloadcore-b75087d098c4cdc44769c2bb02b6f8654dc20d37.tar.gz
core-b75087d098c4cdc44769c2bb02b6f8654dc20d37.zip
Remove lots of paint debugging - squash me ...
Change-Id: I968205786e7cd9857a0325b55d1a45d1adc4306c
-rw-r--r--vcl/opengl/gdiimpl.cxx11
-rw-r--r--vcl/source/app/salvtables.cxx2
2 files changed, 0 insertions, 13 deletions
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index b21eb12d8b1f..31813fb7a0af 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -154,10 +154,6 @@ void OpenGLSalGraphicsImpl::Init()
mpContext->ReleaseFramebuffer( maOffscreenTex );
}
maOffscreenTex = OpenGLTexture();
- SAL_DEBUG("paint: " << this << " size mismatch - delete texture " <<
- maOffscreenTex.GetWidth() << " x " <<
- maOffscreenTex.GetHeight() << " vs. " <<
- GetWidth() << " x " << GetHeight());
VCL_GL_INFO("::Init - re-size offscreen texture");
}
@@ -438,7 +434,6 @@ bool OpenGLSalGraphicsImpl::CheckOffscreenTexture()
mpContext->ReleaseFramebuffer( maOffscreenTex );
maOffscreenTex = OpenGLTexture();
VCL_GL_INFO( "re-size offscreen texture" );
- SAL_DEBUG( "paint: " << this << " re-size offscreen texture" );
}
}
@@ -446,8 +441,6 @@ bool OpenGLSalGraphicsImpl::CheckOffscreenTexture()
{
VCL_GL_INFO( "create texture of size "
<< GetWidth() << " x " << GetHeight() );
- SAL_DEBUG( "paint: " << this << " create texture of size "
- << GetWidth() << " x " << GetHeight() );
maOffscreenTex = OpenGLTexture( GetWidth(), GetHeight() );
bClearTexture = true;
}
@@ -1957,7 +1950,6 @@ void OpenGLSalGraphicsImpl::flush()
if( !maOffscreenTex )
{
- SAL_DEBUG("paint: " << this << " flush and swap - no texture !");
VCL_GL_INFO( "flushAndSwap - odd no texture !" );
return;
}
@@ -1965,12 +1957,9 @@ void OpenGLSalGraphicsImpl::flush()
if (mnDrawCountAtFlush == mnDrawCount)
{
VCL_GL_INFO( "eliding redundant flushAndSwap, no drawing since last!" );
- SAL_DEBUG( "paint: " << this << " eliding redundant flushAndSwap, no drawing since last!" );
return;
}
- SAL_DEBUG("paint: " << this << " flush and swap");
-
mnDrawCountAtFlush = mnDrawCount;
OpenGLZone aZone;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index bc77397ed6b3..fce0e699f9a1 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -63,12 +63,10 @@ void SalFrame::BeginPaint()
{
m_nPaintNesting++;
assert (m_nPaintNesting > 0);
- SAL_DEBUG("paint: " << this << " begin " << m_nPaintNesting);
}
void SalFrame::EndPaint()
{
- SAL_DEBUG("paint: " << this << " end " << m_nPaintNesting);
assert (m_nPaintNesting > 0);
if (--m_nPaintNesting == 0)
Flush();