diff options
| author | George Sapountzis <[email protected]> | 2006-12-06 06:49:28 +0200 |
|---|---|---|
| committer | George Sapountzis <[email protected]> | 2007-03-30 19:19:00 +0300 |
| commit | 7439a36785b6a2783e80a40a96c09db8f56dc2bc (patch) | |
| tree | 8a433683be04b1fa2fd852667d3d73965da624c6 /src/mesa/drivers/x11/xmesaP.h | |
| parent | 7eba12edce871c3db835decbf1a0271acfd3eb68 (diff) | |
Clean and update XMesa/XFree86 interface.
Drop XMesaSetVisualDisplay(), XMesaReset(), no longer used.
Add XMesaCopyContext() and move the GlxSetRenderTables() call for XGL within
XMesaForceCurrent(). This is to make xserver/GL/mesa/X/xf86glx.c unaware of
Mesa internals.
Also, clean some ifdef's to make it clear that USE_XSHM and XFree86Server are
mutually exclusive.
Lastly,
- move gcstruct.h from glxheader.h up to xmesa_xf86.h since it calls *gc->ops
- drop GL/glxtokens.h from xm_api|dd.c, GLX tokens come from glcore.h and are
used irrelevant of XFree86.
Diffstat (limited to 'src/mesa/drivers/x11/xmesaP.h')
| -rw-r--r-- | src/mesa/drivers/x11/xmesaP.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h index 85cb6b66363..aab138f81c3 100644 --- a/src/mesa/drivers/x11/xmesaP.h +++ b/src/mesa/drivers/x11/xmesaP.h @@ -579,10 +579,11 @@ extern XMesaBuffer XMesaCreateWindowBuffer2( XMesaVisual v, * These are the extra routines required for integration with XFree86. * None of these routines should be user visible. -KEM */ -extern void XMesaSetVisualDisplay( XMesaDisplay *dpy, XMesaVisual v ); extern GLboolean XMesaForceCurrent(XMesaContext c); extern GLboolean XMesaLoseCurrent(XMesaContext c); -extern void XMesaReset( void ); +extern GLboolean XMesaCopyContext( XMesaContext src, + XMesaContext dst, + GLuint mask ); #define ENABLE_EXT_texure_compression_s3tc 0 /* SW texture compression */ |