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 /slideshow | |
| 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 'slideshow')
| -rw-r--r-- | slideshow/Library_OGLTrans.mk | 9 | ||||
| -rw-r--r-- | slideshow/Library_slideshow.mk | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/opengl/TransitionImpl.cxx | 1 | ||||
| -rw-r--r-- | slideshow/source/engine/opengl/TransitionImpl.hxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/opengl/TransitionerImpl.cxx | 2 |
5 files changed, 3 insertions, 13 deletions
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index b908a0bb3650..fb04596cb7ba 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\ $(eval $(call gb_Library_use_externals,OGLTrans,\ boost_headers \ - glew \ + epoxy \ glm_headers \ )) @@ -56,13 +56,6 @@ $(eval $(call gb_Library_use_system_win32_libs,OGLTrans,\ opengl32 \ )) -else - -$(eval $(call gb_Library_add_libs,OGLTrans,\ - -lGL \ - -lX11 \ -)) - endif $(eval $(call gb_Library_add_exception_objects,OGLTrans,\ diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 3a9aac6ad245..0583f5e5f10a 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_externals,slideshow,\ )) ifeq ($(ENABLE_HEADLESS),) $(eval $(call gb_Library_use_externals,slideshow,\ - glew \ + epoxy \ )) endif diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx index a807fffc6b43..1c691214730c 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionImpl.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ -#include <GL/glew.h> #include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/type_ptr.hpp> #include <vcl/opengl/OpenGLHelper.hxx> diff --git a/slideshow/source/engine/opengl/TransitionImpl.hxx b/slideshow/source/engine/opengl/TransitionImpl.hxx index 9ee73ddfc39f..6f2e16450c2b 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.hxx +++ b/slideshow/source/engine/opengl/TransitionImpl.hxx @@ -31,8 +31,6 @@ #include <config_lgpl.h> #include <glm/gtc/type_ptr.hpp> -#include <GL/glew.h> - #include <limits> #include <memory> #include <vector> diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx index ef1d385e77fb..01cd3e5717b6 100644 --- a/slideshow/source/engine/opengl/TransitionerImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx @@ -810,7 +810,7 @@ void buildMipmaps( GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void * data) { - if (GLEW_ARB_framebuffer_object) { + if (epoxy_has_gl_extension("GL_ARB_framebuffer_object")) { glTexImage2D( GL_TEXTURE_2D, 0, internalFormat, width, height, 0, format, type, data); |