diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-08-12 05:56:45 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-13 02:00:08 +0200 |
commit | b4ed7cc37eb50380b3eccfba12edf08805dc25b5 (patch) | |
tree | bcaa012b8866647ee2742d8cabfb88cfb3c91ca9 /slideshow | |
parent | we always have GLX 1.3, even on the baseline (diff) | |
download | core-b4ed7cc37eb50380b3eccfba12edf08805dc25b5.tar.gz core-b4ed7cc37eb50380b3eccfba12edf08805dc25b5.zip |
make OGLTrans build on windows
We still need to fix a number of issues around pixmap to make it really useful.
Change-Id: I747d735d043d91d51809801edd9b778622b6063c
Diffstat (limited to 'slideshow')
-rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 361ad1322ef7..673d72a56d81 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -383,7 +383,9 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta GLWindow& rGLWindow(mpContext->getOpenGLWindow()); +#ifdef UNX mbTextureFromPixmap = rGLWindow.HasGLXExtension( "GLX_EXT_texture_from_pixmap" ); +#endif mbGenerateMipmap = rGLWindow.HasGLExtension( "GL_SGIS_generate_mipmap" ); glEnable(GL_CULL_FACE); |