diff options
| author | Brian Paul <[email protected]> | 2000-01-13 17:40:12 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2000-01-13 17:40:12 +0000 |
| commit | 4049cd35d89ad5eb29de15705ddc4190df5e8946 (patch) | |
| tree | f309e97a3fca538824650273899c44d01061487c | |
| parent | 7c1f6e4110805ef3d9b40847e13275891f7f94d7 (diff) | |
applied Daryll's patches for GLX_DIRECT_RENDERING
| -rw-r--r-- | include/GL/xmesa.h | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/include/GL/xmesa.h b/include/GL/xmesa.h index 313aa23c94c..a61258d1c7b 100644 --- a/include/GL/xmesa.h +++ b/include/GL/xmesa.h @@ -1,10 +1,10 @@ -/* $Id: xmesa.h,v 1.3 1999/11/24 18:45:44 brianp Exp $ */ +/* $Id: xmesa.h,v 1.4 2000/01/13 17:40:12 brianp Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 * - * Copyright (C) 1999 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -79,6 +79,9 @@ extern "C" { #include <X11/Xlib.h> #include <X11/Xutil.h> #include "xmesa_x.h" +#ifdef GLX_DIRECT_RENDERING +#include "dri_mesa.h" +#endif #endif #include "GL/gl.h" @@ -114,6 +117,17 @@ typedef struct xmesa_visual *XMesaVisual; typedef struct xmesa_buffer *XMesaBuffer; +#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) +/* + * Initialize the XMesa driver. + */ +extern GLboolean XMesaInitDriver( __DRIscreenPrivate *driScrnPriv ); + +/* + * Reset the XMesa driver when the X server resets. + */ +extern void XMesaResetDriver( __DRIscreenPrivate *driScrnPriv ); +#endif @@ -162,7 +176,11 @@ extern void XMesaDestroyVisual( XMesaVisual v ); * Return: an XMesaContext or NULL if error. */ extern XMesaContext XMesaCreateContext( XMesaVisual v, - XMesaContext share_list ); + XMesaContext share_list +#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) + , __DRIcontextPrivate *driContextPriv +#endif + ); /* @@ -175,7 +193,11 @@ extern void XMesaDestroyContext( XMesaContext c ); * Create an XMesaBuffer from an X window. */ extern XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v, - XMesaWindow w ); + XMesaWindow w +#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) + , __DRIdrawablePrivate *driDrawPriv +#endif + ); /* @@ -183,7 +205,11 @@ extern XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v, */ extern XMesaBuffer XMesaCreatePixmapBuffer( XMesaVisual v, XMesaPixmap p, - XMesaColormap cmap ); + XMesaColormap cmap +#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) + , __DRIdrawablePrivate *driDrawPriv +#endif + ); /* |