diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-25 20:25:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 11:33:18 +0000 |
| commit | 482d7ce61b423600b41b459eb26a2cc221cd0acf (patch) | |
| tree | 8da6edb8200889d93f0b344e61ed779c037a590f /include/vcl/opengl | |
| parent | 178e38dd82a2cffb2db747c7be82ba7a48338968 (diff) | |
change from glew to epoxy
because that works under wayland out of the box and gtk3 uses it already
Change-Id: Iefaac31e325534a81a5389f752804af917c1baef
Reviewed-on: https://gerrit.libreoffice.org/31213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl/opengl')
| -rw-r--r-- | include/vcl/opengl/OpenGLContext.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/opengl/OpenGLHelper.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/opengl/OpenGLWrapper.hxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index e77a6e994d12..37d354e576f8 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -12,7 +12,7 @@ #include <string.h> -#include <GL/glew.h> +#include <epoxy/gl.h> #include <vcl/dllapi.h> #include <vcl/window.hxx> @@ -158,8 +158,8 @@ private: virtual void destroyCurrentContext(); protected: - bool InitGLEW(); - static void InitGLEWDebugging(); + bool InitGL(); + static void InitGLDebugging(); static void InitChildWindow(SystemChildWindow *pChildWindow); static void BuffersSwapped(); virtual GLWindow& getModifiableOpenGLWindow() = 0; diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx index 458021f4ca27..23b9b79a361c 100644 --- a/include/vcl/opengl/OpenGLHelper.hxx +++ b/include/vcl/opengl/OpenGLHelper.hxx @@ -10,7 +10,7 @@ #ifndef INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX #define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX -#include <GL/glew.h> +#include <epoxy/gl.h> #include <sal/log.hxx> #include <vcl/dllapi.h> #include <vcl/bitmapex.hxx> diff --git a/include/vcl/opengl/OpenGLWrapper.hxx b/include/vcl/opengl/OpenGLWrapper.hxx index 5032234ba0e1..9c61a11c2a48 100644 --- a/include/vcl/opengl/OpenGLWrapper.hxx +++ b/include/vcl/opengl/OpenGLWrapper.hxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// Fully wrapped methods that have no exotic GL / GLEW header deps. +// Fully wrapped methods that have no exotic GL header deps. #ifndef INCLUDED_VCL_OPENGL_OPENGLWRAPPER_HXX #define INCLUDED_VCL_OPENGL_OPENGLWRAPPER_HXX |