Kaydet (Commit) d72c4d4b authored tarafından Markus Mohrhard's avatar Markus Mohrhard

let us assume that we need to special handling for mesa anymore

Change-Id: I37c4db8ad7283486dd8bb62b22342f6b127f0b08
üst d409d581
......@@ -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 ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment