From 24c3838b5fd2005d9df902c9a7d03fcba78adbe4 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Fri, 24 Jun 2016 16:42:45 +0800 Subject: tdf#100411 start the flush timer when batching (PostBatchDraw) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When we batch a draw command we need to start the flush timer (if not already started) as otherwise it could happen that we won't flush the offscreen texture at the correct time or at all. This fixes a problem with drawing of pop-up "help" text. (cherry picked from commit e1296e295e7d4f1104d2c90b1f51d52251358bea) Change-Id: I6afcf173c3ac517ed0612cd413d95e28c19faa81 Reviewed-on: https://gerrit.libreoffice.org/26630 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/inc/openglgdiimpl.hxx | 2 ++ vcl/opengl/gdiimpl.cxx | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index df7b9e9e617a..20372689d92e 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -169,6 +169,8 @@ public: // operations to do after painting void PostDraw(); + void PostBatchDraw(); + protected: bool AcquireContext(bool bForceCreate = false); bool ReleaseContext(); diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 188db65bfeb0..1422c6a85f34 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -249,6 +249,15 @@ void OpenGLSalGraphicsImpl::PostDraw() OpenGLZone::leave(); } +void OpenGLSalGraphicsImpl::PostBatchDraw() +{ + if (IsOffscreen()) + return; + + if (!mpFlush->IsActive()) + mpFlush->Start(); +} + void OpenGLSalGraphicsImpl::ApplyProgramMatrices(float fPixelOffset) { mpProgram->ApplyMatrix(GetWidth(), GetHeight(), fPixelOffset); @@ -1519,6 +1528,7 @@ void OpenGLSalGraphicsImpl::DrawMask( OpenGLTexture& rMask, SalColor nMaskColor, void OpenGLSalGraphicsImpl::DeferredTextDraw(OpenGLTexture& rTexture, SalColor aMaskColor, const SalTwoRect& rPosAry) { mpAccumulatedTextures->insert(rTexture, aMaskColor, rPosAry); + PostBatchDraw(); } void OpenGLSalGraphicsImpl::FlushDeferredDrawing() -- cgit