diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-26 19:10:18 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-26 19:16:06 +0200 |
| commit | 88963dcfe78972111c7906b29492a602504ebf49 (patch) | |
| tree | ed63b4e46575fabf5b0df3f95a71704b94431de7 /slideshow | |
| parent | d72c4d4ba26666b4b0cc86c6ebaabb813a79e370 (diff) | |
that variable has nothing to do with glx
Change-Id: I202f716bcc65165e80928ccb81cec57f01bc0824
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 67a7080670dd..cfb1c5666ba4 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -287,7 +287,7 @@ public: /** Whether the display has GLX extension on X11, always true otherwise (?) */ - bool mbGLXPresent; + bool mbValidOpenGLContext; /** whether to generate mipmaped textures @@ -313,18 +313,18 @@ bool OGLTransitionerImpl::initialize( const Reference< presentation::XSlideShowV const Reference< rendering::XBitmap >& xLeavingSlide, const Reference< rendering::XBitmap >& xEnteringSlide ) { - bool const bGLXPresent( initWindowFromSlideShowView( xView ) ); - impl_initializeFlags( bGLXPresent ); + bool const bValidContext( initWindowFromSlideShowView( xView ) ); + impl_initializeFlags( bValidContext ); setSlides( xLeavingSlide, xEnteringSlide ); - return mbGLXPresent; + return mbValidOpenGLContext; } -void OGLTransitionerImpl::impl_initializeFlags( bool const bGLXPresent ) +void OGLTransitionerImpl::impl_initializeFlags( bool const bValidContext ) { - mbGLXPresent = bGLXPresent; - if ( bGLXPresent ) { + mbValidOpenGLContext = bValidContext; + if ( bValidContext ) { mnGLVersion = OpenGLHelper::getGLVersion(); SAL_INFO("slideshow.opengl", "GL version: " << mnGLVersion << "" ); @@ -1181,7 +1181,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc #endif osl::MutexGuard const guard( m_aMutex ); - if (isDisposed() || !mbGLXPresent || mpTransition->getSettings().mnRequiredGLVersion > mnGLVersion) + if (isDisposed() || !mbValidOpenGLContext || mpTransition->getSettings().mnRequiredGLVersion > mnGLVersion) return; mpContext->makeCurrent(); @@ -1342,8 +1342,7 @@ OGLTransitionerImpl::OGLTransitionerImpl() , maSlideSize() , mbBrokenTexturesATI(false) , mnGLVersion(0) - , mbGLXPresent(false) - , mbMesa(false) + , mbValidOpenGLContext(false) , mbGenerateMipmap(false) , mbHasTFPVisual(false) { |