diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2014-12-22 19:10:59 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-07 00:01:41 +0000 |
| commit | b9a847b78ceaa3b5840429dab1bc50d35c7ef3de (patch) | |
| tree | 1bcd505077a08a8f24362e35362a0fad54bc9684 /include/vcl/opengl | |
| parent | 7ce1e0e1ecbb1b3ec5e3cc15306a9df7e786c564 (diff) | |
Fixup --without-x build
Accept gl linkage in hope of future offscreen mesa support.
Avoid linking with GLX though.
Change-Id: I4e666f60e74fe34075a8da9eeba95807cf8fe38c
Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/13452
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include/vcl/opengl')
| -rw-r--r-- | include/vcl/opengl/OpenGLContext.hxx | 10 | ||||
| -rw-r--r-- | include/vcl/opengl/OpenGLHelper.hxx | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 6f665875e256..02769231db34 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -17,6 +17,7 @@ #if defined( MACOSX ) #elif defined( IOS ) #elif defined( ANDROID ) +#elif defined( LIBO_HEADLESS ) #elif defined( UNX ) # include <prex.h> # include "GL/glxew.h" @@ -42,6 +43,7 @@ class NSOpenGLView; #endif #elif defined( IOS ) #elif defined( ANDROID ) +#elif defined( LIBO_HEADLESS ) #elif defined( UNX ) #include <GL/glext.h> #define GLX_GLXEXT_PROTOTYPES 1 @@ -110,6 +112,7 @@ struct GLWindow #elif defined( MACOSX ) #elif defined( IOS ) #elif defined( ANDROID ) +#elif defined( LIBO_HEADLESS ) #elif defined( UNX ) Display* dpy; int screen; @@ -137,6 +140,7 @@ struct GLWindow #elif defined( MACOSX ) #elif defined( IOS ) #elif defined( ANDROID ) +#elif defined( LIBO_HEADLESS ) #elif defined( UNX ) dpy(NULL), screen(0), @@ -176,7 +180,7 @@ public: // these methods are for the deep platform layer, don't use them in normal code // only in vcl's platform code -#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID +#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS) bool init(Display* dpy, Window win, int screen); bool init(Display* dpy, Pixmap pix, unsigned int width, unsigned int height, int nScreen); #elif defined( _WIN32 ) @@ -237,7 +241,7 @@ private: SAL_DLLPRIVATE bool InitGLEW(); SAL_DLLPRIVATE bool initWindow(); SAL_DLLPRIVATE bool ImplInit(); -#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID +#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS) SAL_DLLPRIVATE void initGLWindow(Visual* pVisual); #endif @@ -255,7 +259,7 @@ private: bool mbRequestLegacyContext; bool mbUseDoubleBufferedRendering; bool mbRequestVirtualDevice; -#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID +#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS) bool mbPixmap; // is a pixmap instead of a window #endif diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx index 4e11bf8306ef..2f4aec010e76 100644 --- a/include/vcl/opengl/OpenGLHelper.hxx +++ b/include/vcl/opengl/OpenGLHelper.hxx @@ -16,7 +16,7 @@ #include <rtl/ustring.hxx> -#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID +#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS) # include <prex.h> # include "GL/glxew.h" # include <postx.h> @@ -67,7 +67,7 @@ public: */ static bool isVCLOpenGLEnabled(); -#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID +#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS) static bool GetVisualInfo(Display* pDisplay, int nScreen, XVisualInfo& rVI); static GLXFBConfig GetPixmapFBConfig( Display* pDisplay, bool& bInverted ); #endif |