summaryrefslogtreecommitdiff
path: root/include/GL
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2004-02-19 00:57:04 +0000
committerIan Romanick <idr@us.ibm.com>2004-02-19 00:57:04 +0000
commit304d3aa9cb727eb4cd4797c33f8e13e5ac4285a9 (patch)
treedbd971e7bfa0355e40db0ccd4efceebd2dcb68b1 /include/GL
parente01370271eebb6cf86d8119c3c37b3f6f9db1d8b (diff)
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.
Diffstat (limited to 'include/GL')
-rw-r--r--include/GL/xmesa_x.h13
-rw-r--r--include/GL/xmesa_xf86.h11
2 files changed, 9 insertions, 15 deletions
diff --git a/include/GL/xmesa_x.h b/include/GL/xmesa_x.h
index def0447195..8c4e41e545 100644
--- a/include/GL/xmesa_x.h
+++ b/include/GL/xmesa_x.h
@@ -74,16 +74,11 @@ typedef XColor XMesaColor;
#define XMesaFreeGC XFreeGC
#define GET_COLORMAP_SIZE(__v) __v->visinfo->colormap_size
-#define GET_REDMASK(__v) __v->visinfo->red_mask
-#define GET_GREENMASK(__v) __v->visinfo->green_mask
-#define GET_BLUEMASK(__v) __v->visinfo->blue_mask
-#if defined(__cplusplus) || defined(c_plusplus)
-#define GET_VISUAL_CLASS(__v) __v->visinfo->c_class
-#else
-#define GET_VISUAL_CLASS(__v) __v->visinfo->class
-#endif
+#define GET_REDMASK(__v) __v->mesa_visual.redMask
+#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->visinfo->screen)
+#define GET_BLACK_PIXEL(__v) BlackPixel(__v->display, __v->mesa_visual.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)
diff --git a/include/GL/xmesa_xf86.h b/include/GL/xmesa_xf86.h
index 983f234ddd..88a94dcd76 100644
--- a/include/GL/xmesa_xf86.h
+++ b/include/GL/xmesa_xf86.h
@@ -174,12 +174,11 @@ do { \
FreeScratchGC(__gc); \
} while (0)
-#define GET_COLORMAP_SIZE(__v) __v->visinfo->ColormapEntries
-#define GET_REDMASK(__v) __v->visinfo->redMask
-#define GET_GREENMASK(__v) __v->visinfo->greenMask
-#define GET_BLUEMASK(__v) __v->visinfo->blueMask
-#define GET_VISUAL_CLASS(__v) __v->visinfo->class
-#define GET_VISUAL_DEPTH(__v) __v->visinfo->nplanes
+#define GET_COLORMAP_SIZE(__v) __v->ColormapEntries
+#define GET_REDMASK(__v) __v->mesa_visual.redMask
+#define GET_GREENMASK(__v) __v->mesa_visual.greenMask
+#define GET_BLUEMASK(__v) __v->mesa_visual.blueMask
+#define GET_VISUAL_DEPTH(__v) __v->nplanes
#define GET_BLACK_PIXEL(__v) __v->display->blackPixel
#define CHECK_BYTE_ORDER(__v) GL_TRUE
#define CHECK_FOR_HPCR(__v) GL_FALSE