From d0edf6ad30f3265caf181941055d1b578109b5e7 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 16 Jan 2000 18:35:25 +0000 Subject: use nplanes instead of bitsPerRGBValue in GET_BITS_PER_PIXEL macro --- include/GL/xmesa_xf86.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/GL/xmesa_xf86.h b/include/GL/xmesa_xf86.h index 5c1af7a641..2a30e1e082 100644 --- a/include/GL/xmesa_xf86.h +++ b/include/GL/xmesa_xf86.h @@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Authors: * Kevin E. Martin * - * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/include/GL/xmesa_xf86.h,v 1.1 1999/08/19 00:55:40 jtg Exp $ + * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/include/GL/xmesa_xf86.h,v 1.2 2000/01/16 18:35:25 brianp Exp $ */ #ifndef _XMESA_XF86_H_ @@ -179,7 +179,13 @@ typedef xColorItem XMesaColor; #define GET_REDMASK(__v) __v->visinfo->redMask #define GET_GREENMASK(__v) __v->visinfo->greenMask #define GET_BLUEMASK(__v) __v->visinfo->blueMask -#define GET_BITS_PER_PIXEL(__v) __v->visinfo->bitsPerRGBValue + +/*XXX this was wrong. However, using nplanes instead may fail when + * we have overlay planes in the future! + */ +/*#define GET_BITS_PER_PIXEL(__v) __v->visinfo->bitsPerRGBValue*/ +#define GET_BITS_PER_PIXEL(__v) __v->visinfo->nplanes + #define GET_VISUAL_CLASS(__v) __v->visinfo->class #define GET_VISUAL_DEPTH(__v) __v->visinfo->nplanes #define GET_BLACK_PIXEL(__v) __v->display->blackPixel -- cgit v1.2.3