summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2008-05-07 22:28:45 +0300
committerDaniel Stone <daniel@fooishbar.org>2008-05-07 22:28:45 +0300
commit268d61e00cf4bc52c05f19eda7ab4f6accce12c8 (patch)
treecef463bac8c18e7170089c2f04d294f2fbb9bd2e
parentb6a0c6d4864f73a18beb841b16e9be56f2fcd77e (diff)
GL: Make errors non-fatal
GLX, there's more to the world than just you. If you fail to load the software renderer, don't bring the entire server down. The error path probably needs better testing on this one, but it seems mostly okay to me.
-rw-r--r--GL/glx/glxext.c2
-rw-r--r--GL/glx/glxglcore.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index 85d8debd4..1cbc27953 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -288,7 +288,7 @@ void GlxExtensionInit(void)
__glXDispatch, ResetExtension,
StandardMinorOpcode);
if (!extEntry) {
- FatalError("__glXExtensionInit: AddExtensions failed\n");
+ ErrorF("__glXExtensionInit: AddExtensions failed\n");
return;
}
if (!AddExtensionAlias(GLX_EXTENSION_ALIAS, extEntry)) {
diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c
index dafa9bca7..00279b73a 100644
--- a/GL/glx/glxglcore.c
+++ b/GL/glx/glxglcore.c
@@ -510,7 +510,7 @@ handle_error:
xfree(screen);
- FatalError("GLX: could not load software renderer\n");
+ ErrorF("GLX: could not load software renderer\n");
return NULL;
}