From 1b70279664d1734961f49c6e2f418f11c0637df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <kde@martin-graesslin.com>
Date: Sat, 29 Jan 2011 15:21:35 +0100
Subject: [PATCH] Removing Xgl support from KWin.

Xgl has been removed from the X tree in 2008. It does not make sense
to still support it in KWin.
---
 compositingprefs.cpp | 14 +-------------
 compositingprefs.h   |  5 -----
 scene_opengl_glx.cpp | 12 ------------
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/compositingprefs.cpp b/compositingprefs.cpp
index 04197b8bd6..9f9308a880 100644
--- a/compositingprefs.cpp
+++ b/compositingprefs.cpp
@@ -36,8 +36,7 @@ namespace KWin
 {
 
 CompositingPrefs::CompositingPrefs()
-    : mXgl( false )
-    , mRecommendCompositing( false )
+    : mRecommendCompositing( false )
     , mEnableVSync( true )
     , mEnableDirectRendering( true )
     , mStrictBinding( true )
@@ -348,11 +347,6 @@ void CompositingPrefs::detectDriverAndVersion()
     GLPlatform *gl = GLPlatform::instance();
     gl->detect();
     gl->printResults();
-
-    mXgl = detectXgl();
-
-    if( mXgl )
-        kWarning( 1212 ) << "Using XGL";
 #endif
     }
 
@@ -370,11 +364,5 @@ void CompositingPrefs::applyDriverSpecificOptions()
 #endif
     }
 
-
-bool CompositingPrefs::detectXgl()
-    { // Xgl apparently uses only this specific X version
-    return VendorRelease(display()) == 70000001;
-    }
-
 } // namespace
 
diff --git a/compositingprefs.h b/compositingprefs.h
index d8a84e30ba..73f1c3e1f6 100644
--- a/compositingprefs.h
+++ b/compositingprefs.h
@@ -46,13 +46,10 @@ public:
 
     void detect();
 
-    bool xgl() const { return mXgl; }
-
 protected:
 
     void detectDriverAndVersion();
     void applyDriverSpecificOptions();
-    static bool detectXgl();
 
     bool initGLXContext();
     void deleteGLXContext();
@@ -61,8 +58,6 @@ protected:
 
 
 private:
-    bool mXgl;
-
     bool mRecommendCompositing;
     bool mEnableVSync;
     bool mEnableDirectRendering;
diff --git a/scene_opengl_glx.cpp b/scene_opengl_glx.cpp
index 0fff2961e2..38cb7beeff 100644
--- a/scene_opengl_glx.cpp
+++ b/scene_opengl_glx.cpp
@@ -726,18 +726,6 @@ void SceneOpenGL::Texture::findTarget()
     unsigned int new_target = 0;
     if( tfp_mode && glXQueryDrawable && glxpixmap != None )
         glXQueryDrawable( display(), glxpixmap, GLX_TEXTURE_TARGET_EXT, &new_target );
-    // Hack for XGL - this should not be a fallback for glXQueryDrawable() but instead the case
-    // when glXQueryDrawable is not available. However this call fails with XGL, unless KWin
-    // is compiled statically with the libGL that Compiz is built against (without which neither
-    // Compiz works with XGL). Falling back to doing this manually makes this work.
-    if( new_target == 0 )
-        {
-        if( NPOTTextureSupported() ||
-            ( isPowerOfTwo( mSize.width()) && isPowerOfTwo( mSize.height())))
-            new_target = GLX_TEXTURE_2D_EXT;
-        else
-            new_target = GLX_TEXTURE_RECTANGLE_EXT;
-        }
     switch( new_target )
         {
         case GLX_TEXTURE_2D_EXT: