diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-08-11 21:44:10 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-13 02:00:08 +0200 |
| commit | 140b031935da665c3cd75d89d2dc685d82f04b1c (patch) | |
| tree | d8e5bad1e2cdeba541dcf577b3b840b96193b0ae /slideshow | |
| parent | 69e95b394616d0384e70dc6dad335eefce6a2dc2 (diff) | |
we always have GLX 1.3, even on the baseline
Change-Id: I381aca6e09a63d21bcbdf2625c4d829f84819bf8
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index f90ddc8e0cba..361ad1322ef7 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -284,10 +284,6 @@ public: */ float mnGLVersion; -#ifdef UNX - float mnGLXVersion; -#endif - /** Whether the display has GLX extension on X11, always true otherwise (?) */ @@ -448,7 +444,7 @@ void OGLTransitionerImpl::impl_prepareSlides() #if defined( GLX_EXT_texture_from_pixmap ) - if( mnGLXVersion >= 1.2999 && mbTextureFromPixmap && xLeavingSet.is() && xEnteringSet.is() && mbHasTFPVisual ) { + if( mbTextureFromPixmap && xLeavingSet.is() && xEnteringSet.is() && mbHasTFPVisual ) { Sequence< Any > leaveArgs; Sequence< Any > enterArgs; if( (xLeavingSet->getFastPropertyValue( 1 ) >>= leaveArgs) && @@ -1358,9 +1354,6 @@ OGLTransitionerImpl::OGLTransitionerImpl() , maSlideSize() , mbBrokenTexturesATI(false) , mnGLVersion(0) -#ifdef UNX - , mnGLXVersion(0.0) -#endif , mbGLXPresent(false) , mbMesa(false) , mbTextureFromPixmap(false) |