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

Drop the driver blacklist

Browse source 
Let's face it: it was a bad idea and the blacklist never got updated.
This commit is contained in:
Martin Gräßlin 2011-03-15 20:11:11 +01:00
parent f213b7da70
commit 82b8f8d2fc
4 changed files with 0 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
effects/blur/blur.cpp
View file

@ -131,16 +131,6 @@ bool BlurEffect::supported()
if (displayWidth() > maxTexSize || displayHeight() > maxTexSize)
supported = false;
}
if (supported) {
// check the blacklist
KSharedConfigPtr config = KSharedConfig::openConfig("kwinrc");
KConfigGroup blacklist = config->group("Blacklist").group("Blur");
if (effects->checkDriverBlacklist(blacklist)) {
kDebug() << "Blur effect disabled by driver blacklist";
supported = false;
}
}
return supported;
}

7
lanczosfilter.cpp
View file

@ -67,13 +67,6 @@ void LanczosFilter::init()
if (config->group("Compositing").readEntry("GLTextureFilter", 2) != 2)
return; // disabled by config
// check the blacklist
KConfigGroup blacklist = config->group("Blacklist").group("Lanczos");
if (effects->checkDriverBlacklist(blacklist)) {
kDebug() << "Lanczos Filter disabled by driver blacklist";
return;
}
// The lanczos filter is reported to be broken with the Intel driver and Mesa 7.10
GLPlatform *gl = GLPlatform::instance();
if (gl->driver() == Driver_Intel && gl->mesaVersion() >= kVersionNumber(7, 10))

34
libkwineffects/kwineffects.cpp
View file

@ -305,40 +305,6 @@ KConfigGroup EffectsHandler::effectConfig(const QString& effectname)
return kwinconfig->group("Effect-" + effectname);
}
bool EffectsHandler::checkDriverBlacklist(const KConfigGroup& blacklist)
{
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
if (effects->compositingType() == OpenGLCompositing) {
QString vendor = QString((const char*)glGetString(GL_VENDOR));
QString renderer = QString((const char*)glGetString(GL_RENDERER));
QString version = QString((const char*)glGetString(GL_VERSION));
foreach (const QString & key, blacklist.keyList()) {
// the key is a word in the renderer string or vendor referrencing the vendor in case of mesa
// e.g. "Intel" or "Ati"
if (renderer.contains(key, Qt::CaseInsensitive) || vendor.contains(key, Qt::CaseInsensitive)) {
// the value for current key contains a string list of driver versions which have to be blacklisted
QStringList versions = blacklist.readEntry< QStringList >(key, QStringList());
foreach (const QString & entry, versions) {
QStringList parts = entry.split(":-:");
if (parts.size() != 2) {
continue;
}
if (renderer.contains(parts[0], Qt::CaseInsensitive) &&
version.contains(parts[1], Qt::CaseInsensitive)) {
// the version matches the renderer string - this driver is blacklisted, return
return true;
}
}
}
}
}
return false;
#else
return false;
#endif
}
EffectsHandler* effects = 0;

11
libkwineffects/kwineffects.h
View file

@ -741,17 +741,6 @@ public:
*/
virtual bool decorationSupportsBlurBehind() const = 0;
/**
* Checks if the driver is on given blacklist.
* The format of the blacklist is driver identifier as key (e.g. Intel) with a list of
* concrete driver render strings as the values. The renderer string consists of GL_RENDERER
* and GL_VERSION separated by colon dash colon. E.g.: GeForce 9400M/PCI/SSE2:-:3.2.0 NVIDIA 195.36.24
* This method is only used for OpenGL compositing. If not using OpenGL it will return false.
* @returns true if the driver is blacklisted, false otherwise
* @since 4.5
*/
bool checkDriverBlacklist(const KConfigGroup& blacklist);
/**
* Creates a new frame object. If the frame does not have a static size
* then it will be located at @a position with @a alignment. A