diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2008-05-23 22:38:36 +0300 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2008-05-23 22:40:26 +0300 |
| commit | 877e6c35ff1f0f110627590ac0f12fddf47de506 (patch) | |
| tree | 589f344f28fc6da704e9c3ab32504ab27191afc6 | |
| parent | 1345c93ad4be875951256dae87bc4fd9a1b5e08a (diff) | |
glx: missing swrast is fatal
| -rw-r--r-- | glx/glxdriswrast.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/glxmodule.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c index 50dee5111..9d987c238 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; } diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c index 026a93692..35ba74b25 100644 --- a/hw/xfree86/dixmods/glxmodule.c +++ b/hw/xfree86/dixmods/glxmodule.c @@ -86,8 +86,9 @@ glxSetup(pointer module, pointer opts, int *errmaj, int *errmin) setupDone = TRUE; provider = LoaderSymbol("__glXDRIswrastProvider"); - if (provider) - GlxPushProvider(provider); + if (provider == NULL) + return NULL; + GlxPushProvider(provider); xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n", xf86Info.aiglx ? "enabled" : "disabled"); |