[gentoo-commits] gentoo-x86 commit in kde-base/kwin/files: kwin-4.6.5-mesadri.patch

[gentoo-commits] gentoo-x86 commit in kde-base/kwin/files: kwin-4.6.5-mesadri.patch

[Andreas HAttel (dilfridge)]

dilfridge    11/09/05 22:18:32

  Added:                kwin-4.6.5-mesadri.patch
  Log:
  Backport fix for Intel DRI mis-detection, bug 380737
  
  (Portage version: 2.1.10.13/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  kde-base/kwin/files/kwin-4.6.5-mesadri.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/files/kwin-4.6.5-mesadri.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kwin/files/kwin-4.6.5-mesadri.patch?rev=1.1&content-type=text/plain

Index: kwin-4.6.5-mesadri.patch
===================================================================
commit afe966579d56f85444c432a3a6adf026d2941bd5
Author: Martin Gräßlin <mgraesslin@kde.org>
Date:   Sun May 1 11:49:26 2011 +0200

    Enable direct rendering for all Mesa drivers
    
    As KWin requires at least Mesa 7.10 for OpenGL we can be sure
    that all Mesa drivers support DRI2 and can enable direct rendering
    for it.
    
    Parsing the version string to identify if it is a mesa driver.
    This can cause breakage again in future versions of Mesa.
    Unfortunately version, vendor and renderer are the only information
    queryable just with OpenGL API.
    BUG: 270942
    FIXED-IN: 4.7.0

diff --git a/kwin/opengltest/opengltest.cpp b/kwin/opengltest/opengltest.cpp
index d2d8f70..eda7b51 100644
--- a/kwin/opengltest/opengltest.cpp
+++ b/kwin/opengltest/opengltest.cpp
@@ -81,16 +81,9 @@ int main(int argc, char *argv[])
     if ((major == 1 && minor < 3) && !strstr(glxExtensions, "GLX_EXT_texture_from_pixmap"))
         return 1;
 
-    // Assume that direct rendering works with DRI2 drivers
-    const GLubyte *renderer = glGetString(GL_RENDERER);
-    if (strstr((const char *)renderer, "DRI2"))
-        return 0;
-
-    // The Intel driver doesn't have DRI2 in the renderer string
-    if (strstr((const char *)renderer, "GEM"))
-        return 0;
-
-    if (strstr((const char *)renderer, "Gallium"))
+    // Assume that all Mesa drivers support direct rendering
+    const GLubyte *version = glGetString(GL_VERSION);
+    if (strstr((const char *)version, "Mesa"))
         return 0;
 
     // Direct contexts also work with the NVidia driver