This is a remnant from the libcwrapper days that can be removed now. It is the
last XFree86 glitch in Mesa core.
Reverts the following commit (thanks to Brian Paul for pointing to it):
commit 8b1dc68662
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue Jan 24 21:40:53 2006 +0000
pull in fix from 6.4 branch for XFree86Server definition
commit cc7b6810e2fe6ab485fd96d5f17bf5d9329bd153
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Oct 21 18:09:24 2005 +0000
Make execmem.c compile in the server (libGLcore). Since xf86mmap
doesn't know about MAP_ANONYMOUS, this is the only viable fix. This
issue will likely have to be revisited at some point.
Keep external includes to glxheader.h and xmesa includes to xmesaP.h.
Drop the following from xm_image.h:
- dix-config.h (comes from glheader.h)
- xfree86 includes (come from GL/xmesa_xf86.h)
- ifdef __CYGWIN__ (leftover ? xm_api.c has something similar)
_mesa_update_state doesn't always reset VertexProgram._Current to NULL.
This caused us to skip a necessary update of the fixed function vertex
program sometimes.
Change the logic such that we check for updates whenever the _Current
program is either NULL or the program generated by t_vp_build.
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.
Michel Dänzer