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

[Markus Mohrhard]

 vcl/inc/openglgdiimpl.hxx      |    3 ++-
 vcl/unx/generic/gdi/salgdi.cxx |    4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 13af2f5b06a6c5d744c22357dc373d74bea4ab28
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Thu Oct 23 23:32:04 2014 +0200

    integrate WIP OpenGL rendering to unix backend
    
    for now can be enabled with USE_OPENGL environment variable
    
    Change-Id: I3d2c49c3a1cf0c06678b22addcab95c846bb7bf9

diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 1384c6f..fcdd776 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -21,8 +21,9 @@
 #define INCLUDED_VCL_OPENGLGDIIMPL_HXX
 
 #include "salgdiimpl.hxx"
+#include <vcl/dllapi.h>
 
-class OpenGLSalGraphicsImpl : public SalGraphicsImpl
+class VCL_PLUGIN_PUBLIC OpenGLSalGraphicsImpl : public SalGraphicsImpl
 {
 public:
     virtual ~OpenGLSalGraphicsImpl ();
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index b824bbc..67b5ff2 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -52,6 +52,7 @@
 
 #include "salgdiimpl.hxx"
 #include "gdiimpl.hxx"
+#include "openglgdiimpl.hxx"
 
 #include "generic/printergfx.hxx"
 #include "xrender_peer.hxx"
@@ -61,6 +62,9 @@ X11SalGraphics::X11SalGraphics():
     m_nXScreen( 0 ),
     pFontGC_(NULL)
 {
+    static const char* pOpenGL = getenv("USE_OPENGL");
+    if (pOpenGL)
+        mpImpl.reset(new OpenGLSalGraphicsImpl());
     m_pFrame            = NULL;
     m_pVDev             = NULL;
     m_pColormap         = NULL;