summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-09-03 23:17:24 +0900
committerJan Holesovsky <kendy@collabora.com>2015-09-03 15:13:02 +0000
commit812e85a12c7e2c046113a72da9437982926bfb37 (patch)
tree0df32f30884b99383ad230b825ffbb82b9f834cb
parent412d3916254396120e6abac7ff0385c675c7d448 (diff)
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@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r--drawinglayer/source/processor2d/vclhelperbufferdevice.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 93919c0019a2..0994646e5937 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()