diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-07 23:28:41 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-07 23:28:41 +0000 |
| commit | 692147ebf7f09d56a7de1659de2449478da4d1ba (patch) | |
| tree | 66ea84bc75d49ba40a056604bf229354a2fcd659 /src/mesa/drivers/x11/xmesaP.h | |
| parent | 526242614fd5200def246e1bbb9dca78020abc32 (diff) | |
some clean-up and re-org for renderbuffers
Diffstat (limited to 'src/mesa/drivers/x11/xmesaP.h')
| -rw-r--r-- | src/mesa/drivers/x11/xmesaP.h | 22 |
1 files changed, 10 insertions, 12 deletions
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,19 +204,17 @@ 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 */ XMesaPixmap stipple_pixmap; /* For polygon stippling */ @@ -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, |