Index: xc/extras/Mesa/src/mesa/drivers/x11/xm_api.c
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/mesa/drivers/x11/xm_api.c,v
retrieving revision 1.1.1.1
diff -u -2 -0 -r1.1.1.1 xm_api.c
--- xc/extras/Mesa/src/mesa/drivers/x11/xm_api.c	16 Jun 2004 09:19:01 -0000	1.1.1.1
+++ xc/extras/Mesa/src/mesa/drivers/x11/xm_api.c	31 Mar 2005 13:08:09 -0000
@@ -1734,48 +1734,53 @@
 #ifdef FX
    char *fxEnvVar;
 #endif
    int client = 0;
 
    XMesaBuffer b = alloc_xmesa_buffer();
    if (!b) {
       return NULL;
    }
 
    (void) c;
 
 #ifdef XFree86Server
    client = CLIENT_ID(((XMesaDrawable)w)->id);
 #endif
 
    assert(v);
 
 #ifdef XFree86Server
    if (GET_VISUAL_DEPTH(v) != ((XMesaDrawable)w)->depth) {
+      _mesa_warning(NULL, "XMesaCreateWindowBuffer: depth mismatch between visual (%d) and window (%d)!\n",
+                    (int)GET_VISUAL_DEPTH(v), (int)((XMesaDrawable)w)->depth);
+      return NULL;
+   }
 #else
    XGetWindowAttributes( v->display, w, &attr );
 
    if (GET_VISUAL_DEPTH(v) != attr.depth) {
-#endif
-      _mesa_warning(NULL, "XMesaCreateWindowBuffer: depth mismatch between visual and window!\n");
+      _mesa_warning(NULL, "XMesaCreateWindowBuffer: depth mismatch between visual (%d) and window (%d)!\n",
+                    (int)GET_VISUAL_DEPTH(v), (int)attr.depth);
       return NULL;
    }
+#endif
 
    b->xm_visual = v;
    b->type = WINDOW;
    b->display = v->display;
 #ifdef XFree86Server
    b->cmap = (ColormapPtr)LookupIDByType(wColormap(w), RT_COLORMAP);
 #else
    if (attr.colormap) {
       b->cmap = attr.colormap;
    }
    else {
       _mesa_warning(NULL, "Window %u has no colormap!\n", (unsigned int) w);
       /* this is weird, a window w/out a colormap!? */
       /* OK, let's just allocate a new one and hope for the best */
       b->cmap = XCreateColormap(v->display, w, attr.visual, AllocNone);
    }
 #endif
 
    /* determine back buffer implementation */
    if (v->mesa_visual.doubleBufferMode) {