xserver: Branch 'master'

[Adam Jackson]

 GL/glx/glxdri.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

New commits:
diff-tree 21e8f4eb02842f877336db08c332d8ee4a381ee0 (from 0e1384d8318637f75d04d3d1b7600f7cad40117e)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Sat Jun 2 16:13:01 2007 -0400

    Don't print lack of DRI support as an error in AIGLX init.

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index d93d460..156e846 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -1001,13 +1001,10 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     size_t buffer_size;
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 
-    if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable")) {
-	LogMessage(X_ERROR, "AIGLX: DRI module not loaded\n");
-	return NULL;
-    }
-
-    if (!DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) {
-	LogMessage(X_ERROR,
+    if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
+	!DRIQueryDirectRenderingCapable(pScreen, &isCapable) ||
+	!isCapable) {
+	LogMessage(X_INFO,
 		   "AIGLX: Screen %d is not DRI capable\n", pScreen->myNum);
 	return NULL;
     }