I think we can now drop checks for minor of 1 when current is 11

3 files changed, 8 insertions, 38 deletions

diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 2b2612025a68..bac2f1b78f76 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -790,10 +790,6 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
     if( rTR.mnDestHeight!= rTR.mnSrcHeight )
         return false;
 
-    XRenderPeer& rPeer = XRenderPeer::GetInstance();
-    if( rPeer.GetVersion() < 0x02 )
-        return false;
-
     // create destination picture
     Picture aDstPic = GetXRenderPicture();
     if( !aDstPic )
@@ -824,6 +820,7 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
     // create source picture
     // TODO: use scoped picture
     Visual* pSrcXVisual = rSalVis.GetVisual();
+    XRenderPeer& rPeer = XRenderPeer::GetInstance();
     XRenderPictFormat* pSrcVisFmt = rPeer.FindVisualFormat( pSrcXVisual );
     if( !pSrcVisFmt )
         return false;
@@ -917,10 +914,6 @@ bool X11SalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
     if( m_pVDev && m_pVDev->GetDepth() < 8 )
         return false;
 
-    XRenderPeer& rPeer = XRenderPeer::GetInstance();
-    if( rPeer.GetVersion() < 0x02 ) // TODO: replace with better test
-        return false;
-
     Picture aDstPic = GetXRenderPicture();
     if( !aDstPic )
         return false;
@@ -928,6 +921,7 @@ bool X11SalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
     const double fTransparency = (100 - nTransparency) * (1.0/100);
     const XRenderColor aRenderColor = GetXRenderColor( nBrushColor_ , fTransparency);
 
+    XRenderPeer& rPeer = XRenderPeer::GetInstance();
     rPeer.FillRectangle( PictOpOver,
                          aDstPic,
                          &aRenderColor,
@@ -1131,16 +1125,13 @@ bool X11SalGraphics::supportsOperation( OutDevSupportType eType ) const
     case OutDevSupport_B2DDraw:
         {
             XRenderPeer& rPeer = XRenderPeer::GetInstance();
-            if( rPeer.GetVersion() >= 0x02 )
-            {
-                const SalDisplay* pSalDisp = GetDisplay();
-                const SalVisual& rSalVis = pSalDisp->GetVisual( m_nScreen );
+            const SalDisplay* pSalDisp = GetDisplay();
+            const SalVisual& rSalVis = pSalDisp->GetVisual( m_nScreen );
 
-                Visual* pDstXVisual = rSalVis.GetVisual();
-                XRenderPictFormat* pDstVisFmt = rPeer.FindVisualFormat( pDstXVisual );
-                if( pDstVisFmt )
-                    bRet = true;
-            }
+            Visual* pDstXVisual = rSalVis.GetVisual();
+            XRenderPictFormat* pDstVisFmt = rPeer.FindVisualFormat( pDstXVisual );
+            if( pDstVisFmt )
+                bRet = true;
         }
         break;
     default: break;
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx
index a46b4441d16c..3b00dfae52af 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -49,7 +49,6 @@ using namespace rtl;
 XRenderPeer::XRenderPeer()
     : mpDisplay( GetGenericData()->GetSalDisplay()->GetDisplay() )
     , mpStandardFormatA8( NULL )
-    , mnRenderVersion( 0 )
 {
     InitRenderLib();
 }
@@ -70,10 +69,6 @@ void XRenderPeer::InitRenderLib()
     // needed to initialize libXrender internals
     XRenderQueryExtension( mpDisplay, &nDummy, &nDummy );
 
-    int nMajor, nMinor;
-    XRenderQueryVersion( mpDisplay, &nMajor, &nMinor );
-    mnRenderVersion = 16*nMajor + nMinor;
-
     // the 8bit alpha mask format must be there
     XRenderPictFormat aPictFormat={0,0,8,{0,0,0,0,0,0,0,0xFF},0};
     mpStandardFormatA8 = FindPictureFormat( PictFormatAlphaMask|PictFormatDepth, aPictFormat );
@@ -84,15 +79,6 @@ void XRenderPeer::InitRenderLib()
 // return mask of screens capable of XRENDER text
 sal_uInt32 XRenderPeer::InitRenderText()
 {
-    if( mnRenderVersion < 0x01 )
-        return 0;
-
-    // #93033# disable XRENDER for old RENDER versions if XINERAMA is present
-    int nDummy;
-    if( XQueryExtension( mpDisplay, "XINERAMA", &nDummy, &nDummy, &nDummy ) )
-        if( mnRenderVersion < 0x02 )
-            return 0;
-
     if( !mpStandardFormatA8 )
         return 0;
 
diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index be45feebbf6e..2c095da6ab23 100644
--- a/vcl/unx/generic/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
@@ -41,7 +41,6 @@ class XRenderPeer
 {
 public:
     static XRenderPeer& GetInstance();
-    int                 GetVersion() const;
 
     sal_uInt32          InitRenderText();
 
@@ -51,7 +50,6 @@ protected:
 
     Display*            mpDisplay;
     XRenderPictFormat*  mpStandardFormatA8;
-    int                 mnRenderVersion;
 
 public:
     XRenderPictFormat* GetStandardFormatA8() const;
@@ -107,11 +105,6 @@ private: // prevent copy and assignmet
 
 //=====================================================================
 
-inline int XRenderPeer::GetVersion() const
-{
-    return mnRenderVersion;
-}
-
 inline XRenderPictFormat* XRenderPeer::GetStandardFormatA8() const
 {
     return mpStandardFormatA8;