Kaydet (Commit) 10b3ef58 authored tarafından Michael Meeks's avatar Michael Meeks Kaydeden (comit) Andras Timar

Extended GL painting debug tracing.

Change-Id: I52158729d240ca3cb9e7977bc6d1f5acb14437ad
Reviewed-on: https://gerrit.libreoffice.org/18134Reviewed-by: 's avatarJan Holesovsky <kendy@collabora.com>
Tested-by: 's avatarJan Holesovsky <kendy@collabora.com>
üst 5531f10f
...@@ -140,6 +140,7 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName,const OUString ...@@ -140,6 +140,7 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName,const OUString
{ {
OpenGLZone aZone; OpenGLZone aZone;
VCL_GL_INFO("vcl.opengl", "Load shader: vertex " << rVertexShaderName << " fragment " << rFragmentShaderName);
// Create the shaders // Create the shaders
GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER); GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER);
GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER); GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <salframe.hxx> #include <salframe.hxx>
#include <svdata.hxx> #include <svdata.hxx>
#include <comphelper/lok.hxx> #include <comphelper/lok.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
#define IMPL_PAINT_PAINT ((sal_uInt16)0x0001) #define IMPL_PAINT_PAINT ((sal_uInt16)0x0001)
#define IMPL_PAINT_PAINTALL ((sal_uInt16)0x0002) #define IMPL_PAINT_PAINTALL ((sal_uInt16)0x0002)
...@@ -245,6 +246,7 @@ void PaintHelper::PaintBuffer() ...@@ -245,6 +246,7 @@ void PaintHelper::PaintBuffer()
void PaintHelper::DoPaint(const vcl::Region* pRegion) void PaintHelper::DoPaint(const vcl::Region* pRegion)
{ {
WindowImpl* pWindowImpl = m_pWindow->ImplGetWindowImpl(); WindowImpl* pWindowImpl = m_pWindow->ImplGetWindowImpl();
vcl::Region* pWinChildClipRegion = m_pWindow->ImplGetWinChildClipRegion(); vcl::Region* pWinChildClipRegion = m_pWindow->ImplGetWinChildClipRegion();
ImplFrameData* pFrameData = m_pWindow->mpWindowImpl->mpFrameData; ImplFrameData* pFrameData = m_pWindow->mpWindowImpl->mpFrameData;
if (pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL || pFrameData->mbInBufferedPaint) if (pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL || pFrameData->mbInBufferedPaint)
...@@ -271,6 +273,9 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion) ...@@ -271,6 +273,9 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
pWindowImpl->mnPaintFlags = 0; pWindowImpl->mnPaintFlags = 0;
if (!pWindowImpl->maInvalidateRegion.IsEmpty()) if (!pWindowImpl->maInvalidateRegion.IsEmpty())
{ {
VCL_GL_INFO("vcl.opengl", "PaintHelper::DoPaint on " <<
typeid( *m_pWindow ).name() << " '" << m_pWindow->GetText() << "' begin");
m_pWindow->BeginPaint(); m_pWindow->BeginPaint();
// double-buffering: setup the buffer if it does not exist // double-buffering: setup the buffer if it does not exist
...@@ -302,6 +307,9 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion) ...@@ -302,6 +307,9 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
} }
m_pWindow->EndPaint(); m_pWindow->EndPaint();
VCL_GL_INFO("vcl.opengl", "PaintHelper::DoPaint end on " <<
typeid( *m_pWindow ).name() << " '" << m_pWindow->GetText() << "'");
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment