diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-08-29 20:54:21 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-09-01 13:49:21 +0000 |
| commit | 06c595d788a0120834e53c978cc66b39887bfd99 (patch) | |
| tree | 3246bfe8304a1dfa1f6a74c2ecca1a64af6f9637 | |
| parent | bb2742902580265da7b4ec5923105124a6784964 (diff) | |
Extended GL painting debug tracing.
Change-Id: I52158729d240ca3cb9e7977bc6d1f5acb14437ad
Reviewed-on: https://gerrit.libreoffice.org/18134
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
| -rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/paint.cxx | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 859cda389c52..deaf91c08d33 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -140,6 +140,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 bc0050a6d58d..80de1a403d8c 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() << "'"); } } |