Import patch for 1.12 (used by GNOME-3.6) to not accidentally pick a MSAA visual as default - it can seriously degrade performance and cause SIGBUS crashes; both primarily with gnome-shell

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 62 insertions, 2 deletions

diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog
index f918102818e8..e1b1900037ca 100644
--- a/media-libs/cogl/ChangeLog
+++ b/media-libs/cogl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/cogl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.33 2013/04/01 09:28:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.34 2013/05/03 05:43:15 leio Exp $
+
+*cogl-1.12.2-r1 (03 May 2013)
+
+  03 May 2013; Mart Raudsepp <leio@gentoo.org> -cogl-1.12.2.ebuild,
+  +cogl-1.12.2-r1.ebuild, +files/cogl-1.12.2-dont-use-MSAA.patch:
+  Import patch for 1.12 (used by GNOME-3.6) to not accidentally pick a MSAA
+  visual as default - it can seriously degrade performance and cause SIGBUS
+  crashes; both primarily with gnome-shell
 
   01 Apr 2013; Pacho Ramos <pacho@gentoo.org> cogl-1.14.0.ebuild:
   Fix subslot value, #463938 by Andreas Mielke.
diff --git a/media-libs/cogl/cogl-1.12.2.ebuild b/media-libs/cogl/cogl-1.12.2-r1.ebuild
index 6234f334fe51..b3d2010a08a6 100644
--- a/media-libs/cogl/cogl-1.12.2.ebuild
+++ b/media-libs/cogl/cogl-1.12.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.12.2.ebuild,v 1.6 2013/02/02 22:47:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.12.2-r1.ebuild,v 1.1 2013/05/03 05:43:15 leio Exp $
 
 EAPI="5"
 CLUTTER_LA_PUNT="yes"
@@ -68,6 +68,15 @@ src_configure() {
 		$(use_enable pango cogl-pango)
 }
 
+src_prepare() {
+	# Don't accidentally use MSAA visuals - it degrades performance and could
+	# crash gnome-shell with SIGBUS on large textures
+	# http://lists.freedesktop.org/archives/cogl/2013-April/001090.html
+	# https://bugs.freedesktop.org/show_bug.cgi?id=61182
+	epatch "${FILESDIR}/${P}-dont-use-MSAA.patch"
+	gnome2_src_prepare
+}
+
 src_test() {
 	# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
 	# NOTE: recheck if this is needed after every mesa bump
diff --git a/media-libs/cogl/files/cogl-1.12.2-dont-use-MSAA.patch b/media-libs/cogl/files/cogl-1.12.2-dont-use-MSAA.patch
new file mode 100644
index 000000000000..68570b6fe016
--- /dev/null
+++ b/media-libs/cogl/files/cogl-1.12.2-dont-use-MSAA.patch
@@ -0,0 +1,43 @@
+From 1f84b5c9b41fb053e7d96b93e3558ca03eed2ae0 Mon Sep 17 00:00:00 2001
+From: Jerome Glisse
+Date: Tue, 29 Jan 2013 18:37:41 -0500
+Subject: [PATCH] glx do not use multisample visual config for front or pixmap
+
+There is no guaranty that glXGetFBConfigs will return fbconfig ordered
+with non msaa config first. This patch make sure that non msaa config
+get choose.
+
+Signed-off-by: Jerome Glisse <jglisse@redhat.com>
+Reviewed-by: Robert Bragg <robert@linux.intel.com>
+
+(cherry picked from commit 93b7b4c850dd928bf21ee168a95641a8d631f713)
+---
+ cogl/winsys/cogl-winsys-glx.c | 31 ++++++++++++++++++++++++-------
+ 1 file changed, 24 insertions(+), 7 deletions(-)
+
+commit 8a1353a215ab that removes a hunk as unnecessary is manually removed
+from this patchfile instead of reverting in a second patch for Gentoo.
+diff --git a/cogl/winsys/cogl-winsys-glx.c b/cogl/winsys/cogl-winsys-glx.c
+index 234e9da..24aee14 100644
+--- a/cogl/winsys/cogl-winsys-glx.c
++++ b/cogl/winsys/cogl-winsys-glx.c
+@@ -2024,6 +2031,16 @@ get_fbconfig_for_depth (CoglContext *context,
+       if (value != depth && (value - alpha) != depth)
+         continue;
+ 
++      if (glx_renderer->glx_major == 1 && glx_renderer->glx_minor >= 4)
++        {
++          glx_renderer->glXGetFBConfigAttrib (dpy,
++                                              fbconfigs[i],
++                                              GLX_SAMPLES,
++                                              &value);
++          if (value > 1)
++            continue;
++        }
++
+       value = 0;
+       if (depth == 32)
+         {
+-- 
+1.8.2.1
+