Added XMesaDrawable to xmesa_renderbuffer. Use it in a few places instead

of the XMesaPixmap field to avoid some X server-side issues with casting.

1 files changed, 13 insertions, 3 deletions

diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index 5f4e3d4cf29..efe88a00442 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -161,13 +161,23 @@ typedef enum {
 #define BACK_XIMAGE	2
 
 
+/**
+ * An xmesa_renderbuffer represents the back or front color buffer.
+ * For the front color buffer:
+ *    <drawable> is the X window
+ * For the back color buffer:
+ *    Either <ximage> or <pixmap> will be used, never both.
+ * In any case, <drawable> always equals <pixmap>.
+ * For stand-alone Mesa, we could merge <drawable> and <pixmap> into one
+ * field.  We don't do that for the server-side GLcore module because
+ * pixmaps and drawables are different and we'd need a bunch of casts.
+ */
 struct xmesa_renderbuffer
 {
    struct gl_renderbuffer Base;  /* Base class */
 
-   XMesaDrawable pixmap;	/* Either an X Window ID (front color buf) */
-                                /* or X Pixmap ID (back color buf) */
-
+   XMesaDrawable drawable;	/* Usually the X window ID */
+   XMesaPixmap pixmap;	/* Back color buffer */
    XMesaImage *ximage;	/* The back buffer, if not using a Pixmap */
 
    GLubyte *origin1;	/* used for PIXEL_ADDR1 macro */