diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-26 19:07:04 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-26 19:16:05 +0200 |
| commit | d72c4d4ba26666b4b0cc86c6ebaabb813a79e370 (patch) | |
| tree | 5842f9d1a325e7b89605d1f54a3318f5e1304554 /slideshow | |
| parent | d409d5810c3ab53040f664c3b4cfab412ba97ae4 (diff) | |
let us assume that we need to special handling for mesa anymore
Change-Id: I37c4db8ad7283486dd8bb62b22342f6b127f0b08
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index c23da5af1019..67a7080670dd 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -289,10 +289,6 @@ public: */ bool mbGLXPresent; - /** Whether Mesa is the OpenGL vendor - */ - bool mbMesa; - /** whether to generate mipmaped textures */ @@ -333,8 +329,6 @@ void OGLTransitionerImpl::impl_initializeFlags( bool const bGLXPresent ) SAL_INFO("slideshow.opengl", "GL version: " << mnGLVersion << "" ); const GLubyte* vendor = glGetString( GL_VENDOR ); - mbMesa = ( vendor && strstr( (const char *) vendor, "Mesa" ) ); - SAL_INFO("slideshow.opengl", "GL vendor: " << vendor << " identified as Mesa: " << mbMesa << "" ); /* TODO: check for version once the bug in fglrx driver is fixed */ mbBrokenTexturesATI = (vendor && strcmp( (const char *) vendor, "ATI Technologies Inc." ) == 0 ); @@ -1416,12 +1410,6 @@ public: if ( !xRes->initialize( view, leavingBitmap, enteringBitmap ) ) return uno::Reference< presentation::XTransition >(); - if( xRes->mbMesa && ( - ( transitionType == animations::TransitionType::FADE && transitionSubType == animations::TransitionSubType::CROSSFADE ) || - ( transitionType == animations::TransitionType::FADE && transitionSubType == animations::TransitionSubType::FADEOVERCOLOR ) || - ( transitionType == animations::TransitionType::IRISWIPE && transitionSubType == animations::TransitionSubType::DIAMOND ) ) ) - return uno::Reference< presentation::XTransition >(); - boost::shared_ptr<OGLTransitionImpl> pTransition; if( transitionType == animations::TransitionType::MISCSHAPEWIPE ) { |