Refactored several variables out of XMesaVisual in favor of identical

fields in __GLcontextModes (the base type).  Removed the need to keep
the XMesaVisualInfo pointer when building inside the X-server.

1 files changed, 5 insertions, 10 deletions

diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index ee1f4add1a4..4a1f49799a0 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -86,17 +86,15 @@ enum pixel_format {
 struct xmesa_visual {
    GLvisual mesa_visual;	/* Device independent visual parameters */
    XMesaDisplay *display;	/* The X11 display */
-#ifdef XFree86Server
-   GLint screen_depth;		/* The depth of the screen */
-#else
+#ifndef XFree86Server
    XVisualInfo *vishandle;	/* Only used in fakeglx.c */
-#endif
    XMesaVisualInfo visinfo;	/* X's visual info (pointer to private copy) */
+#else
+   GLint ColormapEntries;
+   GLint nplanes;
+#endif
    GLint BitsPerPixel;		/* True bits per pixel for XImages */
 
-   GLint level;			/* 0=normal, 1=overlay, etc */
-   GLint VisualCaveat;          /* for GLX_EXT_visual_rating extension */
-
    GLboolean ximage_flag;	/* Use XImage for back buffer (not pixmap)? */
 
    enum pixel_format dithered_pf;  /* Pixel format when dithering */
@@ -106,9 +104,6 @@ struct xmesa_visual {
    GLfloat GreenGamma;
    GLfloat BlueGamma;
 
-   GLint rmult, gmult, bmult;	/* Range of color values */
-   GLint index_bits;		/* Bits per pixel in CI mode */
-
    /* For PF_TRUECOLOR */
    GLint rshift, gshift, bshift;/* Pixel color component shifts */
    GLubyte Kernel[16];		/* Dither kernel */