diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-26 19:05:40 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-26 19:16:05 +0200 |
| commit | d409d5810c3ab53040f664c3b4cfab412ba97ae4 (patch) | |
| tree | 88b59611a4b84f77dfc20ab5f00ad0002818fa0e /slideshow | |
| parent | 35e954149d976e0e69a9f8b382fc67f5abc5eaa7 (diff) | |
use glew variable to check for the feature
Change-Id: I1e2ae37a75826d321268395d4a3c23c7ed8d7b17
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 949dc36adf20..c23da5af1019 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -294,11 +294,6 @@ public: bool mbMesa; /** - whether texture from pixmap extension is available - */ - bool mbTextureFromPixmap; - - /** whether to generate mipmaped textures */ bool mbGenerateMipmap; @@ -383,9 +378,6 @@ 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); @@ -446,7 +438,7 @@ void OGLTransitionerImpl::impl_prepareSlides() GLWindow& rGLWindow(mpContext->getOpenGLWindow()); - if( mbTextureFromPixmap && xLeavingSet.is() && xEnteringSet.is() && mbHasTFPVisual ) { + if( GLXEW_EXT_texture_from_pixmap && xLeavingSet.is() && xEnteringSet.is() && mbHasTFPVisual ) { Sequence< Any > leaveArgs; Sequence< Any > enterArgs; if( (xLeavingSet->getFastPropertyValue( 1 ) >>= leaveArgs) && @@ -1358,7 +1350,6 @@ OGLTransitionerImpl::OGLTransitionerImpl() , mnGLVersion(0) , mbGLXPresent(false) , mbMesa(false) - , mbTextureFromPixmap(false) , mbGenerateMipmap(false) , mbHasTFPVisual(false) { |