xserver: Branch 'master'
Daniel Stone
daniels at kemper.freedesktop.org
Thu May 8 14:26:52 PDT 2008
GL/glx/glxext.c | 2 +-
GL/glx/glxglcore.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1c54c148895225e4ab3c781fe57d09e5f64353aa
Author: Daniel Stone <daniel at fooishbar.org>
Date: Fri May 9 00:26:16 2008 +0300
Revert "GL: Make errors non-fatal"
Turns out this just caused segfaults further down the line. Oops.
This reverts commit 268d61e00cf4bc52c05f19eda7ab4f6accce12c8.
diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index 1cbc279..85d8deb 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -288,7 +288,7 @@ void GlxExtensionInit(void)
__glXDispatch, ResetExtension,
StandardMinorOpcode);
if (!extEntry) {
- ErrorF("__glXExtensionInit: AddExtensions failed\n");
+ FatalError("__glXExtensionInit: AddExtensions failed\n");
return;
}
if (!AddExtensionAlias(GLX_EXTENSION_ALIAS, extEntry)) {
diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c
index 00279b7..dafa9bc 100644
--- a/GL/glx/glxglcore.c
+++ b/GL/glx/glxglcore.c
@@ -510,7 +510,7 @@ handle_error:
xfree(screen);
- ErrorF("GLX: could not load software renderer\n");
+ FatalError("GLX: could not load software renderer\n");
return NULL;
}
More information about the xorg-commit
mailing list