Hi All,
This fix (from J?rgen Keil) checks whether the software rasterizer
(mesa) is enabled
for OpenGL support, if so it defaults to metacity as software
rasterization is too slow
for compiz.
I've also removed references to xorg.conf tests as this file should
not have been considered
a stable interface in the first place.
Thanks,
Erwann
Index: version
===================================================================
--- version (revision 30)
+++ version (working copy)
@@ -1 +1 @@
-7.0
+7.1
Index: compiz-by-default
===================================================================
--- compiz-by-default (revision 30)
+++ compiz-by-default (working copy)
@@ -36,7 +36,6 @@
PKGINFO="/usr/bin/pkginfo"
PKG="/usr/bin/pkg"
GLXINFO="/usr/X11/bin/glxinfo"
-XORG_CONF="/etc/X11/xorg.conf"
COMPIZ_BIN="/usr/bin/compiz-bin"
COMPIZ_SCRIPT="/usr/bin/compiz"
COMPOSITE_INCLUDE="/usr/include/X11/extensions/composite.h"
@@ -878,16 +877,6 @@
return 0
}
-# Check xorg.conf settings
-check_xorg_conf()
-{
- # Cannot assume xorg.conf is going to exist.
- if [ -f $XORG_CONF ]; then
- verbose "Check xorg.conf for specific settings."
- fi
- return 0
-}
-
# OpenGL / GLX Tests
check_opengl_glx()
{
@@ -911,6 +900,16 @@
# Get glxinfo -i (use indirect rendering connection only) information)
glxinfo_output=`$GLXINFO -i`
+ verbose "Check OpenGL renderer : "
+ if echo $glxinfo_output | $GREP -q "OpenGL renderer string:
Software Rasterizer"; then
+ verbose " Software Rasterizer.\n"
+ FAILURE_REASON="Mesa OpenGL Software Rasterizer: too slow for
compiz."
+ FAILURE_LEVEL=1
+ return 1
+ else
+ verbose " Not using the software rasterizer.\n"
+ fi
+
verbose "Check for OpenGL Extensions : "
if echo $glxinfo_output | $GREP -q "GLX_EXT_texture_from_pixmap"; then
verbose " GLX_EXT_texture_from_pixmap Exists."
@@ -1158,12 +1157,6 @@
abort_with_metacity
fi
-# Xorg Config Tests
-check_xorg_conf
-if [ $? -eq 1 ]; then
- abort_with_metacity
-fi
-
# OpenGL / GLX Tests
check_opengl_glx
if [ $? -eq 1 ]; then
--
Erwann Ch?ned?,
Desktop Group, Sun Microsystems, Grenoble
