diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-11-10 16:02:31 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-11-10 16:51:12 +0000 |
| commit | 45c6cb5f083934f311561599d34ce771bbabf835 (patch) | |
| tree | 09a6429a1929a3204b52c0925e4baa2b65de9666 /vcl/unx/generic/gdi | |
| parent | e2dde6a4d149301557c18d0bcb474fb187ee09e8 (diff) | |
vcl: cleanup the opengl selection API.
Change-Id: Icebf3c7d2911b27e29d2259b780a04048b293b3c
Diffstat (limited to 'vcl/unx/generic/gdi')
| -rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 5 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 6b2042c842c4..f36795ac4b28 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -45,7 +45,6 @@ #include <opengl/salbmp.hxx> #include <vcl/opengl/OpenGLHelper.hxx> -#include <officecfg/Office/Common.hxx> #if defined HAVE_VALGRIND_HEADERS #include <valgrind/memcheck.h> @@ -57,9 +56,7 @@ SalBitmap* X11SalInstance::CreateSalBitmap() { - static bool bOpenGLPossible = OpenGLHelper::supportsVCLOpenGL(); - bool bUseOpenGL = bOpenGLPossible ? officecfg::Office::Common::VCL::UseOpenGL::get() : false; - if (bUseOpenGL) + if (OpenGLHelper::isVCLOpenGLEnabled()) return new OpenGLSalBitmap(); else return new X11SalBitmap(); diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 47b20bc84d82..9609ec8543e4 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -62,8 +62,6 @@ #include "generic/printergfx.hxx" #include "xrender_peer.hxx" -#include <officecfg/Office/Common.hxx> - #include <vcl/opengl/OpenGLHelper.hxx> X11SalGraphics::X11SalGraphics(): @@ -84,9 +82,7 @@ X11SalGraphics::X11SalGraphics(): bPrinter_(false), bVirDev_(false) { - static bool bOpenGLPossible = OpenGLHelper::supportsVCLOpenGL(); - bool bUseOpenGL = bOpenGLPossible ? officecfg::Office::Common::VCL::UseOpenGL::get() : false; - if (bUseOpenGL) + if (OpenGLHelper::isVCLOpenGLEnabled()) { mpImpl.reset(new X11OpenGLSalGraphicsImpl(*this)); mpTextRenderImpl.reset((new OpenGLX11CairoTextRender(false, *this))); |