rpms/compiz/devel compiz-gtk,1.8,1.9 compiz.spec,1.161,1.162

[Adel Gadllah]

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22823

Modified Files:
	compiz-gtk compiz.spec 
Log Message:
Direct rendering does not mean that we have hw 3D, so fix that check


Index: compiz-gtk
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz-gtk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- compiz-gtk	16 Mar 2009 14:05:01 -0000	1.8
+++ compiz-gtk	5 Apr 2009 11:13:26 -0000	1.9
@@ -5,7 +5,8 @@
 	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 @@
 
 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
 


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- compiz.spec	16 Mar 2009 14:05:01 -0000	1.161
+++ compiz.spec	5 Apr 2009 11:13:26 -0000	1.162
@@ -14,7 +14,7 @@
 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 @@
 
 
 %changelog
+* Sun Apr 05 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-18
+- Direct rendering does not mean that we have hw 3D
+
 * Mon Mar 16 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-17
 - Fix compiz-gtk script RH #490383