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

Merge branch 'KDE/4.10'

Browse source 
Conflicts:
	plasma/generic/applets/batterymonitor/metadata.desktop
	plasma/generic/applets/lock_logout/metadata.desktop
This commit is contained in:
Martin Gräßlin 2013-02-28 16:09:09 +01:00
commit dfdc6211a2
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lanczosfilter.cpp
View file

@ -67,6 +67,9 @@ void LanczosFilter::init()
GLPlatform *gl = GLPlatform::instance(); GLPlatform *gl = GLPlatform::instance();
if (!force && gl->driver() == Driver_Intel && gl->chipClass() < SandyBridge) if (!force && gl->driver() == Driver_Intel && gl->chipClass() < SandyBridge)
return; return;
// Broken on IvyBridge with Mesa 9.1 - BUG 313613
if (!force && gl->driver() == Driver_Intel && gl->chipClass() == IvyBridge && gl->mesaVersion() >= kVersionNumber(9, 1))
return;
// With fglrx the ARB Shader crashes KWin (see Bug #270818 and #286795) // With fglrx the ARB Shader crashes KWin (see Bug #270818 and #286795)
if (!force && gl->driver() == Driver_Catalyst && effects->compositingType() == OpenGL1Compositing) { if (!force && gl->driver() == Driver_Catalyst && effects->compositingType() == OpenGL1Compositing) {
return; return;