Merge branch 'KDE/4.11'

This commit is contained in:
Jekyll Wu 2013-07-19 15:18:38 +08:00
commit b0029cf609

View file

@ -77,8 +77,8 @@ void LanczosFilter::init()
// The lanczos filter is reported to be broken with the Intel driver prior SandyBridge
if (gl->driver() == Driver_Intel && gl->chipClass() < SandyBridge)
return;
// Broken on IvyBridge with Mesa 9.1 - BUG 313613
if (gl->driver() == Driver_Intel && gl->chipClass() == IvyBridge && gl->mesaVersion() >= kVersionNumber(9, 1) && gl->mesaVersion() < kVersionNumber(9, 2))
// Broken on Intel chips with Mesa 9.1 - BUG 313613
if (gl->driver() == Driver_Intel && gl->mesaVersion() >= kVersionNumber(9, 1) && gl->mesaVersion() < kVersionNumber(9, 2))
return;
// also radeon before R600 has trouble
if (gl->isRadeon() && gl->chipClass() < R600)