From 12e375f22b534e7cf0bbc0090a25c34d7797d5b1 Mon Sep 17 00:00:00 2001 From: drago01 Date: Sun, 5 Apr 2009 11:13:26 +0000 Subject: [PATCH] Direct rendering does not mean that we have hw 3D, so fix that check --- compiz-gtk | 5 +++-- compiz.spec | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/compiz-gtk b/compiz-gtk index c4eeafa..c5ba9f5 100644 --- a/compiz-gtk +++ b/compiz-gtk @@ -5,7 +5,8 @@ function runCompiz() { exec compiz --ignore-desktop-hints glib gconf $@ } -HAVE3D=`glxinfo | grep "direct rendering: " | head -n 1 | cut -d " " -f 3` +DIRECT=`glxinfo | grep "direct rendering: " | head -n 1 | cut -d " " -f 3` +ISSW=`glxinfo | grep "Software Rasterizer" -c` # Disabled for now, does not work as expected #HAVETFP=`glxinfo | grep texture_from_pixmap -c` @@ -19,7 +20,7 @@ export LIBGL_ALWAYS_INDIRECT=1 HAVETFP=`glxinfo | grep texture_from_pixmap -c` -if ( [ $HAVE3D == "Yes" ] && [ $HAVETFP -gt 2 ] ); then +if ( [ $DIRECT == "Yes" ] && [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then runCompiz $@ fi diff --git a/compiz.spec b/compiz.spec index b105f15..ed30046 100644 --- a/compiz.spec +++ b/compiz.spec @@ -14,7 +14,7 @@ URL: http://www.go-compiz.org License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops Version: 0.7.8 -Release: 17%{?dist} +Release: 18%{?dist} Summary: OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -388,6 +388,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Apr 05 2009 Adel Gadllah - 0.7.8-18 +- Direct rendering does not mean that we have hw 3D + * Mon Mar 16 2009 Adel Gadllah - 0.7.8-17 - Fix compiz-gtk script RH #490383