rpms/compiz/devel compiz-gtk,1.5,1.6 compiz.spec,1.157,1.158

[Adel Gadllah]

Author: drago01

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

Modified Files:
	compiz-gtk compiz.spec 
Log Message:
Use direct rendering if the driver supports it (DRI2)


Index: compiz-gtk
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz-gtk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- compiz-gtk	8 Dec 2008 12:00:01 -0000	1.5
+++ compiz-gtk	15 Mar 2009 10:32:46 -0000	1.6
@@ -1,11 +1,25 @@
-#!/bin/sh
-export LIBGL_ALWAYS_INDIRECT=1
-
-/usr/bin/glx_tfp_test
+#!/bin/bash
 
-if [ $? -eq 0 ]; then
+function runCompiz() {
 	gtk-window-decorator &
 	exec compiz --ignore-desktop-hints glib gconf $@
-else
-	exec metacity $@
+}
+
+HAVE3D=`glxinfo | grep "direct rendering: " | head -n 1 | cut -d " " -f 3`
+HAVETFP=`glxinfo | grep texture_from_pixmap -c`
+
+if ( [ $HAVE3D == "Yes" ] && [ $HAVETFP -gt 2 ] ); then 
+	runCompiz
+fi
+
+# Try again with indirect rendering
+export LIBGL_ALWAYS_INDIRECT=1
+
+HAVETFP=`glxinfo | grep texture_from_pixmap -c`
+
+if ( [ $HAVE3D == "Yes" ] && [ $HAVETFP -gt 2 ] ); then 
+	runCompiz
 fi
+
+# Fall back to metacity
+exec metacity $@


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- compiz.spec	28 Feb 2009 20:22:42 -0000	1.157
+++ compiz.spec	15 Mar 2009 10:32:47 -0000	1.158
@@ -14,7 +14,7 @@
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.7.8
-Release:        14%{?dist}
+Release:        15%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,7 +24,8 @@
 
 Conflicts:	xorg-x11-server-Xorg < 1.3.0.0-19.fc8
 Requires:	mesa-libGL >= 7.0.1-2.fc8
-Requires:       system-logos
+Requires:	system-logos
+Requires: 	glx-utils
 Requires(post): desktop-file-utils
 
 BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
@@ -48,7 +49,6 @@
 Source2:	kde-desktop-effects-%{kde_dialogversion}.tar.bz2
 Source3:        compiz-gtk
 Source4:        compiz-gtk.desktop
-Source5:	glx_tfp_test.c
 
 # Make sure that former beryl users still have bling
 Obsoletes: beryl-core
@@ -204,9 +204,6 @@
 
 make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
 
-# glx_tfp_test
-gcc %{SOURCE5} -lX11 -lGLU $RPM_OPT_FLAGS -o glx_tfp_test
-
 # desktop-effects
 cd ../desktop-effects-%{dialogversion}
 %configure
@@ -352,7 +349,6 @@
 %files gnome -f gnome-files.txt
 %defattr(-, root, root)
 %{_bindir}/compiz-gtk
-%{_bindir}/glx_tfp_test
 %{_bindir}/gtk-window-decorator
 %{_bindir}/desktop-effects
 %{_libdir}/window-manager-settings/libcompiz.so
@@ -393,6 +389,10 @@
 
 
 %changelog
+* Sun Mar 15 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-15
+- Improved tfp check, fixes "white screen of death"
+- Use direct rendering if the driver supports it (DRI2)
+
 * Sat Feb 28 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-14
 - Backport gwd fix from upstream, should fix RH #484056