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

[Tomaž Vajngerl]

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

New commits:
commit bffbc6d5d7bb2a18fbe543acf8d80d49b2927f5e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Wed Sep 16 19:54:34 2015 +0200

    Revert "disable caching of virtual devices when OpenGL is enabled"
    
    Not needed anymore..
    
    This reverts commit 812e85a12c7e2c046113a72da9437982926bfb37.
    
    Reviewed-on: https://gerrit.libreoffice.org/18648
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 915d3ba9e453a19510f473bb2cdff6a7c5c3abfa)
    
    Change-Id: I2b25180a3ddaf5b838197a82eeec2de1c202a7d7
    Reviewed-on: https://gerrit.libreoffice.org/18649
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

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