[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - drawinglayer/source

[Tomaž Vajngerl]

 drawinglayer/source/processor2d/vclhelperbufferdevice.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 812e85a12c7e2c046113a72da9437982926bfb37
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu Sep 3 23:17:24 2015 +0900

    disable caching of virtual devices when OpenGL is enabled
    
    Change-Id: I15c5cca8c31d81026111a3fa3f050f53057d76b7
    (cherry picked from commit 6eff03b7d8b77b797f57f2344163ff67a99631f9)
    Reviewed-on: https://gerrit.libreoffice.org/18308
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 93919c0..0994646 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -27,6 +27,7 @@
 #include <vcl/lazydelete.hxx>
 #include <vcl/dibtools.hxx>
 
+#include <vcl/opengl/OpenGLWrapper.hxx>
 
 // buffered VDev usage
 
@@ -188,7 +189,12 @@ namespace
         maFreeBuffers.push_back(&rDevice);
         SAL_WARN_IF(maFreeBuffers.size() > 1000, "drawinglayer", "excessive cached buffers, "
             << maFreeBuffers.size() << " entries!");
-        Start();
+
+        if (OpenGLWrapper::isVCLOpenGLEnabled())
+            Invoke();
+        else
+            Start();
+
     }
 
     void VDevBuffer::Invoke()