From 3f02f90f943a996d88abc20f74503afbb56a4c98 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 24 Nov 1999 18:48:30 +0000 Subject: added support for separate read/draw buffers per context --- src/mesa/drivers/x11/xmesaP.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h index 4dc8425c10..491e2fdc98 100644 --- a/src/mesa/drivers/x11/xmesaP.h +++ b/src/mesa/drivers/x11/xmesaP.h @@ -1,8 +1,8 @@ -/* $Id: xmesaP.h,v 1.2 1999/10/08 09:27:12 keithw Exp $ */ +/* $Id: xmesaP.h,v 1.3 1999/11/24 18:49:44 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.1 + * Version: 3.3 * * Copyright (C) 1999 Brian Paul All Rights Reserved. * @@ -23,9 +23,6 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/src/X/xmesaP.h,v 1.5 1999/07/06 14:51:28 dawes Exp $ */ - - #ifndef XMESAP_H @@ -39,7 +36,7 @@ # ifdef GLX_DIRECT_RENDERING # include "dri_mesa.h" # endif -# ifdef SHM +# ifdef USE_XSHM # include # endif #endif @@ -127,6 +124,7 @@ struct xmesa_context { GLcontext *gl_ctx; /* the core library context */ XMesaVisual xm_visual; /* Describes the buffers */ XMesaBuffer xm_buffer; /* current framebuffer */ + XMesaBuffer xm_read_buffer; /* current framebuffer */ XMesaDisplay *display; /* == xm_visual->display */ GLboolean swapbytes; /* Host byte order != display byte order? */ @@ -179,7 +177,7 @@ struct xmesa_buffer { /* 0 = not available */ /* 1 = XImage support available */ /* 2 = Pixmap support available too */ -#ifdef SHM +#ifdef USE_XSHM XShmSegmentInfo shminfo; #endif #endif -- cgit v1.2.3