From 01aa209f2056ef04e3f2735756a0f8b4a67a3d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 14 Mar 2006 19:32:27 +0000 Subject: [PATCH] Bail out early if screen doesn't support DRI. --- ChangeLog | 5 +++++ GL/glx/glxdri.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 41526a2b6..834513ca7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-14 Kristian Høgsberg + + * GL/glx/glxdri.c (__glXDRIscreenProbe): Bail out early if screen + doesn't support DRI. + 2006-3-13 Deron Johnson * composite/compalloc.c diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c index a78af1b06..d757463bd 100644 --- a/GL/glx/glxdri.c +++ b/GL/glx/glxdri.c @@ -723,6 +723,13 @@ __glXDRIscreenProbe(ScreenPtr pScreen) __GLXDRIscreen *screen; void *dev_priv = NULL; char filename[128]; + Bool isCapable; + + if (!DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) { + LogMessage(X_ERROR, + "AIGLX: Screen %d is not DRI capable\n", pScreen->myNum); + return NULL; + } screen = __glXMalloc(sizeof *screen); if (screen == NULL) @@ -914,7 +921,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) else LogMessage(X_ERROR, "AIGLX error: %s failed\n", err_msg); - ErrorF("GLX-DRI: reverting to software rendering\n"); + LogMessage(X_ERROR, "GLX-DRI: reverting to software rendering\n"); return NULL; }