diff options
| author | Ian Romanick <[email protected]> | 2004-02-19 00:57:04 +0000 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2004-02-19 00:57:04 +0000 |
| commit | 304d3aa9cb727eb4cd4797c33f8e13e5ac4285a9 (patch) | |
| tree | dbd971e7bfa0355e40db0ccd4efceebd2dcb68b1 /src/mesa/drivers/x11/xm_dd.c | |
| parent | e01370271eebb6cf86d8119c3c37b3f6f9db1d8b (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 'src/mesa/drivers/x11/xm_dd.c')
| -rw-r--r-- | src/mesa/drivers/x11/xm_dd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index 9f4302b188f..68e56029d24 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -48,6 +48,9 @@ #include "tnl/tnl.h" #include "tnl/t_context.h" +#ifdef XFree86Server +#include <GL/glxtokens.h> +#endif /* * Return the size (width, height) of the X window for the given GLframebuffer. @@ -214,10 +217,10 @@ color_mask(GLcontext *ctx, GLboolean rmask, GLboolean gmask, GLboolean bmask, GLboolean amask) { const XMesaContext xmesa = XMESA_CONTEXT(ctx); - int xclass = GET_VISUAL_CLASS(xmesa->xm_visual); + const int xclass = xmesa->xm_visual->mesa_visual.visualType; (void) amask; - if (xclass == TrueColor || xclass == DirectColor) { + if (xclass == GLX_TRUE_COLOR || xclass == GLX_DIRECT_COLOR) { unsigned long m; if (rmask && gmask && bmask) { m = ((unsigned long)~0L); |