yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing Xgl support from KWin.

Browse source 
Xgl has been removed from the X tree in 2008. It does not make sense
to still support it in KWin.
This commit is contained in:
Martin Gräßlin 2011-01-29 15:21:35 +01:00
parent 713fe54e3c
commit 1b70279664
3 changed files with 1 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
compositingprefs.cpp
View file

@ -36,8 +36,7 @@ namespace KWin
{ {
CompositingPrefs::CompositingPrefs() CompositingPrefs::CompositingPrefs()
: mXgl( false ) : mRecommendCompositing( false )
, mRecommendCompositing( false )
, mEnableVSync( true ) , mEnableVSync( true )
, mEnableDirectRendering( true ) , mEnableDirectRendering( true )
, mStrictBinding( true ) , mStrictBinding( true )
@ -348,11 +347,6 @@ void CompositingPrefs::detectDriverAndVersion()
GLPlatform *gl = GLPlatform::instance(); GLPlatform *gl = GLPlatform::instance();
gl->detect(); gl->detect();
gl->printResults(); gl->printResults();
mXgl = detectXgl();
if( mXgl )
kWarning( 1212 ) << "Using XGL";
#endif #endif
} }
@ -370,11 +364,5 @@ void CompositingPrefs::applyDriverSpecificOptions()
#endif #endif
} }
bool CompositingPrefs::detectXgl()
{ // Xgl apparently uses only this specific X version
return VendorRelease(display()) == 70000001;
}
} // namespace } // namespace

5
compositingprefs.h
View file

@ -46,13 +46,10 @@ public:
void detect(); void detect();
bool xgl() const { return mXgl; }
protected: protected:
void detectDriverAndVersion(); void detectDriverAndVersion();
void applyDriverSpecificOptions(); void applyDriverSpecificOptions();
static bool detectXgl();
bool initGLXContext(); bool initGLXContext();
void deleteGLXContext(); void deleteGLXContext();
@ -61,8 +58,6 @@ protected:
private: private:
bool mXgl;
bool mRecommendCompositing; bool mRecommendCompositing;
bool mEnableVSync; bool mEnableVSync;
bool mEnableDirectRendering; bool mEnableDirectRendering;

12
scene_opengl_glx.cpp
View file

@ -726,18 +726,6 @@ void SceneOpenGL::Texture::findTarget()
unsigned int new_target = 0; unsigned int new_target = 0;
if( tfp_mode && glXQueryDrawable && glxpixmap != None ) if( tfp_mode && glXQueryDrawable && glxpixmap != None )
glXQueryDrawable( display(), glxpixmap, GLX_TEXTURE_TARGET_EXT, &new_target ); 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 ) switch( new_target )
{ {
case GLX_TEXTURE_2D_EXT: case GLX_TEXTURE_2D_EXT: