applied_patches/0567-transogl-detect-fix.diff

   1 --- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx.old  2009-04-06 16:42:09.000000000 +0000
   2 +++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx      2009-04-06 16:42:09.000000000 +0000
   3 @@ -93,7 +93,7 @@ public:
   4      explicit OGLTransitionerImpl(OGLTransitionImpl* pOGLTransition);
   5      bool initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView, double, double);
   6      void setSlides( const uno::Reference< rendering::XBitmap >& xLeavingSlide , const uno::Reference< rendering::XBitmap >& xEnteringSlide );
   7 -    static void initialize( const uno::Reference< presentation::XSlideShowView >& xView );
   8 +    static bool initialize( const uno::Reference< presentation::XSlideShowView >& xView );
   9
  10      // XTransition
  11         virtual void SAL_CALL update( double nTime ) throw (uno::RuntimeException);
  12 @@ -179,14 +179,20 @@ public:
  13      /** Whether Mesa is the OpenGL vendor
  14       */
  15      static bool cbMesa;
  16 +
  17 +    /**
  18 +       whether the display has GLX extension
  19 +     */
  20 +    static bool cbGLXPresent;
  21  };
  22
  23  // declare the static variables as some gcc versions have problems declaring them automaticaly
  24  bool OGLTransitionerImpl::cbBrokenTexturesATI;
  25  float OGLTransitionerImpl::cnGLVersion;
  26  bool OGLTransitionerImpl::cbMesa;
  27 +bool OGLTransitionerImpl::cbGLXPresent;
  28
  29 -void OGLTransitionerImpl::initialize( const uno::Reference< presentation::XSlideShowView >& xView )
  30 +bool OGLTransitionerImpl::initialize( const uno::Reference< presentation::XSlideShowView >& xView )
  31  {
  32      // not thread safe
  33      static bool initialized = false;
  34 @@ -195,28 +201,34 @@ void OGLTransitionerImpl::initialize( co
  35          OGLTransitionerImpl *instance;
  36
  37          instance = new OGLTransitionerImpl( NULL );
  38 -        instance->initWindowFromSlideShowView( xView, 0, 0 );
  39 +        if( instance->initWindowFromSlideShowView( xView, 0, 0 ) ) {
  40
  41 -        const GLubyte* version = glGetString( GL_VERSION );
  42 -        if( version && version[0] ) {
  43 -            cnGLVersion = version[0] - '0';
  44 -            if( version[1] == '.' && version[2] )
  45 -                cnGLVersion += (version[2] - '0')/10.0;
  46 -        } else
  47 -            cnGLVersion = 1.0;
  48 -        OSL_TRACE("GL version: %s parsed: %f", version, cnGLVersion );
  49 +            const GLubyte* version = glGetString( GL_VERSION );
  50 +            if( version && version[0] ) {
  51 +                cnGLVersion = version[0] - '0';
  52 +                if( version[1] == '.' && version[2] )
  53 +                    cnGLVersion += (version[2] - '0')/10.0;
  54 +            } else
  55 +                cnGLVersion = 1.0;
  56 +            OSL_TRACE("GL version: %s parsed: %f", version, cnGLVersion );
  57 +
  58 +            const GLubyte* vendor = glGetString( GL_VENDOR );
  59 +            cbMesa = ( vendor && strstr( (const char *) vendor, "Mesa" ) );
  60 +            OSL_TRACE("GL vendor: %s identified as Mesa: %d", vendor, cbMesa );
  61
  62 -        const GLubyte* vendor = glGetString( GL_VENDOR );
  63 -        cbMesa = ( vendor && strstr( (const char *) vendor, "Mesa" ) );
  64 -        OSL_TRACE("GL vendor: %s identified as Mesa: %d", vendor, cbMesa );
  65 +            /* TODO: check for version once the bug in fglrx driver is fixed */
  66 +            cbBrokenTexturesATI = (vendor && strcmp( (const char *) vendor, "ATI Technologies Inc." ) == 0 );
  67
  68 -        /* TODO: check for version once the bug in fglrx driver is fixed */
  69 -        cbBrokenTexturesATI = (strcmp( (const char *) glGetString( GL_VENDOR ), "ATI Technologies Inc." ) == 0 );
  70 +            instance->disposing();
  71 +            cbGLXPresent = true;
  72 +        } else
  73 +            cbGLXPresent = false;
  74
  75 -        instance->disposing();
  76          delete instance;
  77          initialized = true;
  78      }
  79 +
  80 +    return cbGLXPresent;
  81  }
  82
  83  bool OGLTransitionerImpl::initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView, double, double)
  84 @@ -243,6 +255,10 @@ bool OGLTransitionerImpl::initWindowFrom
  85         GLWin.hWnd = sysData->hWnd;
  86  #elif defined( UNX )
  87      GLWin.dpy = reinterpret_cast<unx::Display*>(sysData->pDisplay);
  88 +
  89 +    if( unx::glXQueryExtension( GLWin.dpy, NULL, NULL ) == false )
  90 +        return false;
  91 +
  92      GLWin.win = sysData->aWindow;
  93      GLWin.screen = unx::XDefaultScreen(GLWin.dpy);
  94      unx::XVisualInfo* vi( NULL );
  95 @@ -770,7 +786,7 @@ void SAL_CALL OGLTransitionerImpl::updat
  96  {
  97      osl::MutexGuard const guard( m_aMutex );
  98
  99 -    if (isDisposed() || pTransition->mnRequiredGLVersion > cnGLVersion)
 100 +    if (isDisposed() || !cbGLXPresent || pTransition->mnRequiredGLVersion > cnGLVersion)
 101          return;
 102
 103      glEnable(GL_DEPTH_TEST);
 104 @@ -904,7 +920,7 @@ public:
 105          if( !hasTransition( transitionType, transitionSubType ) )
 106              return uno::Reference< presentation::XTransition >();
 107
 108 -        OGLTransitionerImpl::initialize( view );
 109 +        bool bGLXPresent = OGLTransitionerImpl::initialize( view );
 110
 111          if( OGLTransitionerImpl::cbMesa && (
 112              ( transitionType == animations::TransitionType::FADE && transitionSubType == animations::TransitionSubType::CROSSFADE ) ||
 113 @@ -974,9 +990,11 @@ public:
 114
 115          rtl::Reference<OGLTransitionerImpl> xRes(
 116              new OGLTransitionerImpl(pTransition) );
 117 -        if(!xRes->initWindowFromSlideShowView(view,slideOffset.X,slideOffset.Y))
 118 -            return uno::Reference< presentation::XTransition >();
 119 -        xRes->setSlides(leavingBitmap,enteringBitmap);
 120 +        if( bGLXPresent ) {
 121 +            if( !xRes->initWindowFromSlideShowView(view,slideOffset.X,slideOffset.Y))
 122 +                return uno::Reference< presentation::XTransition >();
 123 +            xRes->setSlides(leavingBitmap,enteringBitmap);
 124 +        }
 125
 126          return uno::Reference<presentation::XTransition>(xRes.get());
 127      }