xserver: Branch 'master' - 5 commits

[Daniel Stone]

On Fri, May 23, 2008 at 12:42:10PM -0700, George Sapountzis wrote:
> commit 877e6c35ff1f0f110627590ac0f12fddf47de506
> Author: George Sapountzis <gsap7 at yahoo.gr>
> Date:   Fri May 23 22:38:36 2008 +0300
> 
>     glx: missing swrast is fatal
> 
> diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
> index 50dee51..9d987c2 100644
> --- a/glx/glxdriswrast.c
> +++ b/glx/glxdriswrast.c
> @@ -532,7 +532,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
>  
>      xfree(screen);
>  
> -    LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
> +    FatalError("GLX: could not load software renderer\n");
>  
>      return NULL;
>  }

Hopefully we all agree it would be nice for the error to not be fatal,
but instead GLX just be disabled or so? Apologies for pushing the broken
patch in the first place: I could've sworn I tested it with GL apps.

Cheers,
Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg/attachments/20080524/e13a66c9/attachment.pgp>