[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - vcl/source vcl/unx

[Markus Mohrhard]

 vcl/source/opengl/OpenGLContext.cxx |    3 ++-
 vcl/unx/generic/gdi/salbmp.cxx      |    7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 9eabde283b2c2806de4a5618cac7f1ebb394c228
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Tue Nov 4 18:50:49 2014 +0100

    use the configuration value
    
    Change-Id: I9410a8f3ab40d56660280f5898ae6dec2672c39c

diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 9078de6..6b2042c 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -44,6 +44,8 @@
 #include <unx/x11/xlimits.hxx>
 
 #include <opengl/salbmp.hxx>
+#include <vcl/opengl/OpenGLHelper.hxx>
+#include <officecfg/Office/Common.hxx>
 
 #if defined HAVE_VALGRIND_HEADERS
 #include <valgrind/memcheck.h>
@@ -55,8 +57,9 @@
 
 SalBitmap* X11SalInstance::CreateSalBitmap()
 {
-    static const char* pOpenGL = getenv("USE_OPENGL");
-    if (pOpenGL)
+    static bool bOpenGLPossible = OpenGLHelper::supportsVCLOpenGL();
+    bool bUseOpenGL = bOpenGLPossible ? officecfg::Office::Common::VCL::UseOpenGL::get() : false;
+    if (bUseOpenGL)
         return new OpenGLSalBitmap();
     else
         return new X11SalBitmap();
commit f8d5d4d92e43cb4ffb3250267d7a45a815c1f4cd
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Tue Nov 4 05:36:41 2014 +0100

    add comment to find uncommented code again
    
    Change-Id: Ice2f98f2e5d16ca4bc5b103e0ffba2fb1e2e5ad0

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index f1686e3..5e23427 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -540,7 +540,8 @@ bool OpenGLContext::init(HDC hDC, HWND hWnd)
 bool OpenGLContext::ImplInit()
 {
     SAL_INFO("vcl.opengl", "OpenGLContext::ImplInit----start");
-    /*if(m_pWindow)
+    /* TODO: moggi: FIXME add back
+     * if(m_pWindow)
         m_pWindow->setPosSizePixel(0,0,0,0);
     m_aGLWin.Width = 0;
     m_aGLWin.Height = 0;*/