use nplanes instead of bitsPerRGBValue in GET_BITS_PER_PIXEL macro

diff --git a/include/GL/xmesa_xf86.h b/include/GL/xmesa_xf86.h
index 5c1af7a641f0465d8c65b349cdc9e9096c7119d8..2a30e1e082b6e6c0774db95aba44c0e09e9a77ca 100644 (file)
--- 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 <kevin@precisioninsight.com>
  *
- * $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