No OpenGL/GLX compositing on Gallium softpipe

BUG: 271166
FIXED-IN: 4.7.0
This commit is contained in:
Martin Gräßlin 2011-04-30 10:29:09 +02:00
parent 31218c820c
commit 9a6cf6f136

View file

@ -60,7 +60,8 @@ SceneOpenGL::SceneOpenGL(Workspace* ws)
return; // error return; // error
// Initialize OpenGL // Initialize OpenGL
initGL(); initGL();
if (QString((const char*)glGetString(GL_RENDERER)) == "Software Rasterizer") { GLPlatform *glPlatform = GLPlatform::instance();
if (glPlatform->driver() == Driver_Swrast || glPlatform->driver() == Driver_Softpipe) {
kError(1212) << "OpenGL Software Rasterizer detected. Falling back to XRender."; kError(1212) << "OpenGL Software Rasterizer detected. Falling back to XRender.";
QTimer::singleShot(0, Workspace::self(), SLOT(fallbackToXRenderCompositing())); QTimer::singleShot(0, Workspace::self(), SLOT(fallbackToXRenderCompositing()));
return; return;
@ -70,7 +71,7 @@ SceneOpenGL::SceneOpenGL(Workspace* ws)
kError(1212) << "GL_ARB_texture_non_power_of_two and GL_ARB_texture_rectangle missing"; kError(1212) << "GL_ARB_texture_non_power_of_two and GL_ARB_texture_rectangle missing";
return; // error return; // error
} }
if (GLPlatform::instance()->isMesaDriver() && GLPlatform::instance()->mesaVersion() < kVersionNumber(7, 10)) { if (glPlatform->isMesaDriver() && glPlatform->mesaVersion() < kVersionNumber(7, 10)) {
kError(1212) << "KWin requires at least Mesa 7.10 for OpenGL compositing."; kError(1212) << "KWin requires at least Mesa 7.10 for OpenGL compositing.";
return; return;
} }