From 692147ebf7f09d56a7de1659de2449478da4d1ba Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 7 Sep 2005 23:28:41 +0000
Subject: some clean-up and re-org for renderbuffers

---
 src/mesa/drivers/x11/xmesaP.h | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'src/mesa/drivers/x11/xmesaP.h')

diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index 7030afaa11..5f4e3d4cf2 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -156,6 +156,11 @@ typedef enum {
 } BufferType;
 
 
+/* Values for db_mode: */
+#define BACK_PIXMAP	1
+#define BACK_XIMAGE	2
+
+
 struct xmesa_renderbuffer
 {
    struct gl_renderbuffer Base;  /* Base class */
@@ -174,7 +179,7 @@ struct xmesa_renderbuffer
    GLuint *origin4;	/* used for PIXEL_ADDR4 macro */
    GLint width4;
 
-   GLint bottom;	/* used for FLIP macro */
+   GLint bottom;	/* used for FLIP macro, equals height - 1 */
 
    ClearFunc clearFunc;
 };
@@ -199,18 +204,16 @@ struct xmesa_buffer {
 
    unsigned long selectedEvents;/* for pbuffers only */
 
-   GLint db_state;		/* 0 = single buffered */
+   GLint db_mode;		/* 0 = single buffered */
 				/* BACK_PIXMAP = use Pixmap for back buffer */
 				/* BACK_XIMAGE = use XImage for back buffer */
 
-#ifndef XFree86Server
    GLuint shm;			/* X Shared Memory extension status:	*/
 				/*    0 = not available			*/
 				/*    1 = XImage support available	*/
 				/*    2 = Pixmap support available too	*/
-#ifdef USE_XSHM
+#if defined(USE_XSHM) && !defined(XFree86Server)
    XShmSegmentInfo shminfo;
-#endif
 #endif
 
    XMesaImage *rowimage;	/* Used for optimized span writing */
@@ -252,12 +255,6 @@ struct xmesa_buffer {
 };
 
 
-/* Values for xmesa->db_state: */
-#define FRONT_PIXMAP	1
-#define BACK_PIXMAP	2
-#define BACK_XIMAGE	4
-
-
 /*
  * If pixelformat==PF_TRUECOLOR:
  */
@@ -489,7 +486,8 @@ extern const int xmesa_kernel1[16];
  */
 
 extern struct xmesa_renderbuffer *
-xmesa_new_renderbuffer(GLcontext *ctx, GLuint name, GLboolean rgbMode);
+xmesa_new_renderbuffer(GLcontext *ctx, GLuint name, GLboolean rgbMode,
+                       GLboolean backBuffer);
 
 extern unsigned long
 xmesa_color_to_pixel( GLcontext *ctx,
-- 
cgit v1.2.3