From 9a6cf6f13624ec25fa724a87d64ee53b20e81448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sat, 30 Apr 2011 10:29:09 +0200 Subject: [PATCH] No OpenGL/GLX compositing on Gallium softpipe BUG: 271166 FIXED-IN: 4.7.0 --- scene_opengl_glx.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scene_opengl_glx.cpp b/scene_opengl_glx.cpp index 6adb0ba7bc..221ba20fbe 100644 --- a/scene_opengl_glx.cpp +++ b/scene_opengl_glx.cpp @@ -60,7 +60,8 @@ SceneOpenGL::SceneOpenGL(Workspace* ws) return; // error // Initialize OpenGL 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."; QTimer::singleShot(0, Workspace::self(), SLOT(fallbackToXRenderCompositing())); return; @@ -70,7 +71,7 @@ SceneOpenGL::SceneOpenGL(Workspace* ws) kError(1212) << "GL_ARB_texture_non_power_of_two and GL_ARB_texture_rectangle missing"; 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."; return; }