From 9f9de170f22f4bc7fc6a31406842fa32b4a92ade Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 25 Feb 2000 20:31:11 +0000
Subject: [PATCH] removed the GET_BITS_PER_PIXEL macro

---
 include/GL/xmesa_x.h    | 3 +--
 include/GL/xmesa_xf86.h | 9 +--------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/include/GL/xmesa_x.h b/include/GL/xmesa_x.h
index c9bb17a53f7..d5fb399b446 100644
--- a/include/GL/xmesa_x.h
+++ b/include/GL/xmesa_x.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_x.h,v 1.1 1999/08/19 00:55:40 jtg Exp $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/include/GL/xmesa_x.h,v 1.2 2000/02/25 20:31:11 brianp Exp $
  */
 
 #ifndef _XMESA_X_H_
@@ -78,7 +78,6 @@ typedef XColor       XMesaColor;
 #define GET_REDMASK(__v)        __v->visinfo->red_mask
 #define GET_GREENMASK(__v)      __v->visinfo->green_mask
 #define GET_BLUEMASK(__v)       __v->visinfo->blue_mask
-#define GET_BITS_PER_PIXEL(__v) bits_per_pixel(__v->display, __v->visinfo)
 #if defined(__cplusplus) || defined(c_plusplus)
 #define GET_VISUAL_CLASS(__v)   __v->visinfo->c_class
 #else
diff --git a/include/GL/xmesa_xf86.h b/include/GL/xmesa_xf86.h
index c52de765357..2be3efe78d1 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 <kevin@precisioninsight.com>
  *
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/include/GL/xmesa_xf86.h,v 1.3 2000/01/17 23:22:57 brianp Exp $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/include/GL/xmesa_xf86.h,v 1.4 2000/02/25 20:31:11 brianp Exp $
  */
 
 #ifndef _XMESA_XF86_H_
@@ -179,13 +179,6 @@ do { \
 #define GET_REDMASK(__v)        __v->visinfo->redMask
 #define GET_GREENMASK(__v)      __v->visinfo->greenMask
 #define GET_BLUEMASK(__v)       __v->visinfo->blueMask
-
-/*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