summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-08-29 20:54:21 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-08-31 20:18:54 +0100
commit6cf43cf6b98866401702d3275a7a026d8fa01edf (patch)
tree8ea725161b44a1aff1929f70a2ef59e6afd20fa6
parentdaecb93affd5e5ec89eec0d18f433a296b9aed1d (diff)
Extended GL painting debug tracing.
Change-Id: I52158729d240ca3cb9e7977bc6d1f5acb14437ad
-rw-r--r--vcl/source/opengl/OpenGLHelper.cxx1
-rw-r--r--vcl/source/window/paint.cxx8
2 files changed, 9 insertions, 0 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 68b8d50ca70c..3eb8514c527e 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -138,6 +138,7 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName,const OUString
{
OpenGLZone aZone;
+ VCL_GL_INFO("vcl.opengl", "Load shader: vertex " << rVertexShaderName << " fragment " << rFragmentShaderName);
// Create the shaders
GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER);
GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 2edcd09e12da..8fc4c23fc158 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -32,6 +32,7 @@
#include <salframe.hxx>
#include <svdata.hxx>
#include <comphelper/lok.hxx>
+#include <vcl/opengl/OpenGLHelper.hxx>
#define IMPL_PAINT_PAINT ((sal_uInt16)0x0001)
#define IMPL_PAINT_PAINTALL ((sal_uInt16)0x0002)
@@ -245,6 +246,7 @@ void PaintHelper::PaintBuffer()
void PaintHelper::DoPaint(const vcl::Region* pRegion)
{
WindowImpl* pWindowImpl = m_pWindow->ImplGetWindowImpl();
+
vcl::Region* pWinChildClipRegion = m_pWindow->ImplGetWinChildClipRegion();
ImplFrameData* pFrameData = m_pWindow->mpWindowImpl->mpFrameData;
if (pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL || pFrameData->mbInBufferedPaint)
@@ -271,6 +273,9 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
pWindowImpl->mnPaintFlags = 0;
if (!pWindowImpl->maInvalidateRegion.IsEmpty())
{
+ VCL_GL_INFO("vcl.opengl", "PaintHelper::DoPaint on " <<
+ typeid( *m_pWindow ).name() << " '" << m_pWindow->GetText() << "' begin");
+
m_pWindow->BeginPaint();
// double-buffering: setup the buffer if it does not exist
@@ -302,6 +307,9 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
}
m_pWindow->EndPaint();
+
+ VCL_GL_INFO("vcl.opengl", "PaintHelper::DoPaint end on " <<
+ typeid( *m_pWindow ).name() << " '" << m_pWindow->GetText() << "'");
}
}