Don't run the shell on softpipe

This commit is contained in:
Matthias Clasen 2011-01-14 07:37:28 -05:00
parent 312ec7912b
commit 7bc501f69a
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From 2bd1975803f1d7e03a7f98881e8332a2330c4146 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Fri, 14 Jan 2011 08:44:52 +0100
Subject: [PATCH] tools: Do not consider Gallium's softpipe and llvmpipe as accelerated
Those are software renderers too. It might be that llvmpipe gets good
enough in the future, but it's not the case at the moment.
Based on patch from Matthias Clasen <mclasen@redhat.com>.
https://bugzilla.gnome.org/show_bug.cgi?id=639490
---
tools/gnome-session-is-accelerated.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/gnome-session-is-accelerated.c b/tools/gnome-session-is-accelerated.c
index 6b8b1a4..0729c14 100644
--- a/tools/gnome-session-is-accelerated.c
+++ b/tools/gnome-session-is-accelerated.c
@@ -144,8 +144,11 @@ _has_hardware_gl (Display *display)
renderer = (const char *) glGetString (GL_RENDERER);
/* The current Mesa software GL renderer string is
- * "Software Rasterizer" */
- if (strcasestr (renderer, "software rasterizer") != NULL)
+ * "Software Rasterizer".
+ * Gallium has softpipe and llvmpipe. */
+ if (strcasestr (renderer, "software rasterizer") != NULL ||
+ strcasestr (renderer, "softpipe") != NULL ||
+ strcasestr (renderer, "llvmpipe") != NULL)
goto out;
/* we need to get the max texture size while we have a context,
--
1.7.3.4

View File

@ -5,11 +5,13 @@
Summary: GNOME session manager Summary: GNOME session manager
Name: gnome-session Name: gnome-session
Version: 2.91.4 Version: 2.91.4
Release: 1%{?dist} Release: 2%{?dist}
URL: http://www.gnome.org URL: http://www.gnome.org
#VCS: git:git://git.gnome.org/gnome-session #VCS: git:git://git.gnome.org/gnome-session
Source0: http://download.gnome.org/sources/gnome-session/2.91/%{name}-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/gnome-session/2.91/%{name}-%{version}.tar.bz2
Source2: gnome.desktop Source2: gnome.desktop
# upstream fix
Patch0: 0001-tools-Do-not-consider-Gallium-s-softpipe-and-llvmpip.patch
License: GPLv2+ License: GPLv2+
Group: User Interface/Desktops Group: User Interface/Desktops
@ -90,6 +92,8 @@ Desktop file to add GNOME to display manager session menu.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .softpipe
# %patch3 -p1 -b .max-idle # %patch3 -p1 -b .max-idle
# %patch4 -p1 -b .nag-root-user # %patch4 -p1 -b .nag-root-user
# %patch7 -p1 -b .cflags # %patch7 -p1 -b .cflags
@ -178,6 +182,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog %changelog
* Fri Dec 14 2011 Matthias Clasen <mclasen@redhat.com> 2.91.4-2
- Don't run the shell on softpipe
* Sun Jan 9 2011 Matthias Clasen <mclasen@redhat.com> 2.91.4-1 * Sun Jan 9 2011 Matthias Clasen <mclasen@redhat.com> 2.91.4-1
- Update to 2.91.4 - Update to 2.91.4