3 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index dac1668cfe..984caa4f0a 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1397,14 +1397,14 @@ XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
    v->mesa_visual.redMask = visinfo->redMask;
    v->mesa_visual.greenMask = visinfo->greenMask;
    v->mesa_visual.blueMask = visinfo->blueMask;
-   v->mesa_visual.visualID = visinfo->vid;
-   v->mesa_visual.screen = 0; /* FIXME: What should be done here? */
+   v->visualID = visinfo->vid;
+   v->screen = 0; /* FIXME: What should be done here? */
 #else
    v->mesa_visual.redMask = visinfo->red_mask;
    v->mesa_visual.greenMask = visinfo->green_mask;
    v->mesa_visual.blueMask = visinfo->blue_mask;
-   v->mesa_visual.visualID = visinfo->visualid;
-   v->mesa_visual.screen = visinfo->screen;
+   v->visualID = visinfo->visualid;
+   v->screen = visinfo->screen;
 #endif
 
 #if defined(XFree86Server) || !(defined(__cplusplus) || defined(c_plusplus))
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index e0a6908228..939b7a7c50 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -86,6 +86,7 @@ enum pixel_format {
 struct xmesa_visual {
    GLvisual mesa_visual;	/* Device independent visual parameters */
    XMesaDisplay *display;	/* The X11 display */
+   int screen, visualID;
 #ifdef XFree86Server
    GLint ColormapEntries;
    GLint nplanes;
diff --git a/src/mesa/drivers/x11/xmesa_x.h b/src/mesa/drivers/x11/xmesa_x.h
index 865bab4313..ea6cb3f24e 100644
--- a/src/mesa/drivers/x11/xmesa_x.h
+++ b/src/mesa/drivers/x11/xmesa_x.h
@@ -79,7 +79,7 @@ typedef XColor       XMesaColor;
 #define GET_GREENMASK(__v)      __v->mesa_visual.greenMask
 #define GET_BLUEMASK(__v)       __v->mesa_visual.blueMask
 #define GET_VISUAL_DEPTH(__v)   __v->visinfo->depth
-#define GET_BLACK_PIXEL(__v)    BlackPixel(__v->display, __v->mesa_visual.screen)
+#define GET_BLACK_PIXEL(__v)    BlackPixel(__v->display, __v->screen)
 #define CHECK_BYTE_ORDER(__v)   host_byte_order()==ImageByteOrder(__v->display)
 #define CHECK_FOR_HPCR(__v)     XInternAtom(__v->display, "_HP_RGB_SMOOTH_MAP_LIST", True)