summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/x11/xm_dd.c
diff options
context:
space:
mode:
authorGeorge Sapountzis <[email protected]>2006-12-06 06:49:28 +0200
committerGeorge Sapountzis <[email protected]>2007-03-30 19:19:00 +0300
commit7439a36785b6a2783e80a40a96c09db8f56dc2bc (patch)
tree8a433683be04b1fa2fd852667d3d73965da624c6 /src/mesa/drivers/x11/xm_dd.c
parent7eba12edce871c3db835decbf1a0271acfd3eb68 (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/xm_dd.c')
-rw-r--r--src/mesa/drivers/x11/xm_dd.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index dbac3b8cdb6..543ff69c411 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -53,10 +53,6 @@
#include "tnl/tnl.h"
#include "tnl/t_context.h"
-#ifdef XFree86Server
-#include <GL/glxtokens.h>
-#endif
-
/*