debian/compiz.wrapper |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 60956f2f7f1c9cd4dbf6c82d81574bc509a20875
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Fri Jan 5 13:55:59 2007 +0100

    Reverse logic of forced indirect check. Do redirection at execution time. 
Duh!

diff --git a/debian/compiz.wrapper b/debian/compiz.wrapper
index 6db0085..ae4bf40 100644
--- a/debian/compiz.wrapper
+++ b/debian/compiz.wrapper
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-GLXINFO='/usr/bin/glxinfo 2> /dev/null'
+GLXINFO='/usr/bin/glxinfo'
 EXT_TFP='GLX_EXT_texture_from_pixmap'
 
 COMPIZ_OPTIONS="--no-fbo"
@@ -8,16 +8,16 @@ COMPIZ_OPTIONS="--no-fbo"
 # Check whether the GLX_EXT_texture_from_pixmap extension is available in
 # direct or indirect rendering contexts. If it is available only in indirect
 # rendering contexts, force compiz to use indirect rendering.
-if test `$GLXINFO | grep -c $EXT_TFP` -lt 3; then
+if test `$GLXINFO 2> /dev/null | grep -c $EXT_TFP` -lt 3; then
        echo "$EXT_TFP is not available with direct rendering."
 
        export LIBGL_ALWAYS_INDIRECT=1
-       if test `$GLXINFO | grep -c $EXT_TFP` -lt 3; then
-               echo "$EXT_TFP is available with indirect rendering."
-       else
+       if test `$GLXINFO 2> /dev/null | grep -c $EXT_TFP` -lt 3; then
                echo "$EXT_TFP is not available with indirect rendering. 
Aborting!"
                unset LIBGL_ALWAYS_INDIRECT
                exit 1
+       else
+               echo "$EXT_TFP is available with indirect rendering."
        fi
 else
        echo "$EXT_TFP is available with direct rendering."


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to