import r300_driver

2004-09-28 10:59:23 +00:00
939 changed files with 55521 additions and 149392 deletions
--- a/39
+++ b/39
@@ -25,19 +25,11 @@ realclean:
 	$(MAKE) clean
 	-rm -rf lib*
 	-rm -f $(TOP)/configs/current
-	-rm -f `find . -name \*.o`
-	-rm -f `find . -name \*.a`
-	-rm -f `find . -name \*.so`
-


 install:
 	@echo "Installing"
-	$(TOP)/bin/installmesa $(DESTDIR)
-
-# DirectFBGL module installation
-linux-directfb-install:
-	cd src/mesa/drivers/directfb && $(MAKE) install
+	$(TOP)/bin/installmesa 

 # If there's no current configuration file
 $(TOP)/configs/current:
@@ -53,22 +45,17 @@ $(TOP)/configs/current:

 # Rules to set/install a specific build configuration
 aix \
-aix-64 \
 aix-gcc \
 aix-static \
 beos \
 darwin \
 darwin-static \
 freebsd \
-freebsd-dri \
-freebsd-dri-x86 \
 hpux10 \
 hpux10-gcc \
 hpux10-static \
-hpux11-32 \
 hpux11-32-static \
 hpux11-32-static-nothreads \
-hpux11-64 \
 hpux11-64-static \
 hpux9 \
 hpux9-gcc \
@@ -82,11 +69,9 @@ linux \
 linux-alpha \
 linux-alpha-static \
 linux-debug \
-linux-directfb \
 linux-dri \
 linux-dri-x86 \
 linux-dri-x86-64 \
-linux-dri-ppc \
 linux-glide \
 linux-icc \
 linux-icc-static \
@@ -105,7 +90,6 @@ linux-ultrasparc \
 linux-tcc \
 linux-x86 \
 linux-x86-debug \
-linux-x86-32 \
 linux-x86-64 \
 linux-x86-64-static \
 linux-x86-glide \
@@ -128,9 +112,9 @@ ultrix-gcc:

 # Rules for making release tarballs

-DIRECTORY = Mesa-6.3
-LIB_NAME = MesaLib-6.3
-DEMO_NAME = MesaDemos-6.3
+DIRECTORY = Mesa-6.2
+LIB_NAME = MesaLib-6.2
+DEMO_NAME = MesaDemos-6.2

 LIB_FILES =	\
 	$(DIRECTORY)/Makefile*						\
@@ -207,8 +191,6 @@ LIB_FILES =	\
 	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
-	$(DIRECTORY)/src/mesa/drivers/directfb/*.[ch]		\
-	$(DIRECTORY)/src/mesa/drivers/directfb/Makefile		\
 	$(DIRECTORY)/src/mesa/drivers/dos/*.[chS]			\
 	$(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\
@@ -278,7 +260,7 @@ LIB_FILES =	\
 	$(DIRECTORY)/vms/xlib_share.opt


-GLUT_FILES = \
+DEMO_FILES =	\
 	$(DIRECTORY)/include/GL/glut.h			\
 	$(DIRECTORY)/include/GL/glutf90.h		\
 	$(DIRECTORY)/src/glut/glx/Makefile*		\
@@ -295,10 +277,7 @@ GLUT_FILES = \
 	$(DIRECTORY)/src/glut/dos/Makefile.DJ		\
 	$(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]		\
 	$(DIRECTORY)/src/glut/ggi/*.[ch]		\
-	$(DIRECTORY)/src/glut/ggi/Makefile
-
-
-DEMO_FILES = \
+	$(DIRECTORY)/src/glut/ggi/Makefile		\
 	$(DIRECTORY)/progs/beos/*.cpp			\
 	$(DIRECTORY)/progs/beos/Makefile		\
 	$(DIRECTORY)/progs/images/*.rgb			\
@@ -355,7 +334,7 @@ lib_gz:

 demo_gz:
 	cd .. ; \
-	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) $(GLUT_FILES) ; \
+	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
 	gzip $(DEMO_NAME).tar ; \
 	mv $(DEMO_NAME).tar.gz $(DIRECTORY)

@@ -368,7 +347,7 @@ lib_bz2:

 demo_bz2:
 	cd .. ; \
-	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) $(GLUT_FILES) ; \
+	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
 	bzip2 $(DEMO_NAME).tar ; \
 	mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)

@@ -382,7 +361,7 @@ lib_zip:
 demo_zip:
 	-rm $(DEMO_NAME).zip ; \
 	cd .. ; \
-	zip -r $(DEMO_NAME).zip $(DEMO_FILES) $(GLUT_FILES) ; \
+	zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
 	mv $(DEMO_NAME).zip $(DIRECTORY)

 md5:
--- a/Makefile.DJ
+++ b/Makefile.DJ
@@ -20,9 +20,9 @@
 # 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.

-# DOS/DJGPP makefile v1.6 for Mesa
+# DOS/DJGPP makefile v1.5 for Mesa
 #
-#  Copyright (C) 2002 - Daniel Borca
+#  Copyright (C) 2002 - Borca Daniel
 #  Email : dborca@users.sourceforge.net
 #  Web   : http://www.geocities.com/dborca

@@ -64,7 +64,7 @@ CPU ?= pentium
 GLU ?= mesa

 CFLAGS = -Wall -W -pedantic
-CFLAGS += -O2 -ffast-math -mtune=$(CPU)
+CFLAGS += -O2 -ffast-math -mcpu=$(CPU)

 export CFLAGS

--- a/Makefile.mgw
+++ b/Makefile.mgw
@@ -20,9 +20,9 @@
 # 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.

-# MinGW makefile v1.2 for Mesa
+# MinGW makefile v1.1 for Mesa
 #
-#  Copyright (C) 2002 - Daniel Borca
+#  Copyright (C) 2002 - Borca Daniel
 #  Email : dborca@users.sourceforge.net
 #  Web   : http://www.geocities.com/dborca

@@ -66,7 +66,7 @@ else
  # I love c89
  CFLAGS = -Wall -W -pedantic
 endif
-CFLAGS += -O2 -ffast-math -mtune=$(CPU)
+CFLAGS += -O2 -ffast-math -mcpu=$(CPU)

 export CFLAGS

--- a/Mesa.dsw
+++ b/Mesa.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00

 ###############################################################################

-Project: "array_cache"=".\SRC\MESA\array_cache\array_cache.dsp" - Package Owner=<4>
+Project: "array_cache"=.\SRC\MESA\array_cache\array_cache.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -15,7 +15,7 @@ Package=<4>

 ###############################################################################

-Project: "gdi"=".\src\mesa\drivers\windows\gdi\gdi.dsp" - Package Owner=<4>
+Project: "gdi"=.\src\mesa\drivers\windows\gdi\gdi.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -51,7 +51,7 @@ Package=<4>

 ###############################################################################

-Project: "glapi"=".\SRC\MESA\glapi\glapi.dsp" - Package Owner=<4>
+Project: "glapi"=.\SRC\MESA\glapi\glapi.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -63,7 +63,7 @@ Package=<4>

 ###############################################################################

-Project: "glu"=".\src\glu\sgi\glu.dsp" - Package Owner=<4>
+Project: "glu"=.\src\glu\sgi\glu.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -78,7 +78,22 @@ Package=<4>

 ###############################################################################

-Project: "main"=".\SRC\MESA\main\main.dsp" - Package Owner=<4>
+Project: "glut"=.\src\glut\glx\glut.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name glu
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "main"=.\SRC\MESA\main\main.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -90,7 +105,7 @@ Package=<4>

 ###############################################################################

-Project: "math"=".\SRC\MESA\math\math.dsp" - Package Owner=<4>
+Project: "math"=.\SRC\MESA\math\math.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -102,7 +117,7 @@ Package=<4>

 ###############################################################################

-Project: "osmesa"=".\SRC\MESA\DRIVERS\osmesa\osmesa.dsp" - Package Owner=<4>
+Project: "osmesa"=.\SRC\MESA\DRIVERS\osmesa\osmesa.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -117,7 +132,7 @@ Package=<4>

 ###############################################################################

-Project: "shader"=".\SRC\MESA\shader\shader.dsp" - Package Owner=<4>
+Project: "shader"=.\SRC\MESA\shader\shader.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -129,7 +144,7 @@ Package=<4>

 ###############################################################################

-Project: "swrast"=".\SRC\MESA\swrast\swrast.dsp" - Package Owner=<4>
+Project: "swrast"=.\SRC\MESA\swrast\swrast.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -141,7 +156,7 @@ Package=<4>

 ###############################################################################

-Project: "swrast_setup"=".\SRC\MESA\swrast_setup\swrast_setup.dsp" - Package Owner=<4>
+Project: "swrast_setup"=.\SRC\MESA\swrast_setup\swrast_setup.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -153,7 +168,7 @@ Package=<4>

 ###############################################################################

-Project: "tnl"=".\SRC\MESA\tnl\tnl.dsp" - Package Owner=<4>
+Project: "tnl"=.\SRC\MESA\tnl\tnl.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/bin/installmesa
+++ b/bin/installmesa
@@ -12,7 +12,7 @@ TOP=.
 INCLUDE_DIR="/usr/local/include"
 LIB_DIR="/usr/local/lib"

-if [ x$# == "x0" ] ; then
+
 echo
 echo "***** Mesa installation - You may need root privileges to do this *****"
 echo
@@ -33,6 +33,7 @@ if [ x${INPUT} != "x" ] ; then
 	LIB_DIR=${INPUT}
 fi

+
 echo
 echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL
 echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR}
@@ -40,10 +41,6 @@ echo "Press <Enter> to continue, or <ctrl>-C to abort."

 read INPUT

-else
-INCLUDE_DIR=$1/include
-LIB_DIR=$1/lib
-fi

 # flags:
 #  -f = force
--- a/bin/mklib
+++ b/bin/mklib
@@ -21,7 +21,6 @@
 #   -arch ARCH    override using `uname` to determine architecture
 #   -archopt OPT  specify an extra achitecture-specific option OPT
 #   -noprefix     don't prefix library name with "lib" or any suffix
-#   -exports FILE only export the symbols listed in FILE
 #
 # The library name should just be "GL" or "GLU", etc.  The 'lib' prefix
 # will be added here if needed, as well as the ".so" or ".a" suffix,
@@ -49,7 +48,6 @@ INSTALLDIR="."
 ARCH="auto"
 ARCHOPT=""
 NOPREFIX=0
-EXPORTS=""


 #
@@ -70,7 +68,6 @@ do
 	'-arch')      shift 1; ARCH=$1;;
 	'-archopt')   shift 1; ARCHOPT=$1;;
 	'-noprefix')  NOPREFIX=1;;
-	'-exports')   shift 1; EXPORTS=$1;;
 	-*)           echo "mklib: Unknown option: " $1 ; exit 1;;
 	*) break
    esac
@@ -107,7 +104,6 @@ if [  ]  ; then
    echo MINOR is $MINOR
    echo PATCH is $PATCH
    echo DEPS are $DEPS
-    echo "EXPORTS in" $EXPORTS
    echo "-----------------"
 fi

@@ -118,15 +114,7 @@ fi
 case $ARCH in

    'Linux' | 'OpenBSD')
-	# we assume gcc
-
-	# Set default compilers if env vars not set
-	if [ "x$CXX" = "x" ] ; then
-	    CXX=g++
-	fi
-	if [ "x$CC" = "x" ] ; then
-	    CC=gcc
-	fi
+	# GCC-based environment

 	if [ $NOPREFIX = 1 ] ; then
 	    # No "lib" or ".so" part
@@ -161,27 +149,6 @@ case $ARCH in
 	    else
 		OPTS="-shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
 	    fi
-	    if [ $EXPORTS ] ; then
-		#OPTS="${OPTS} -Xlinker --retain-symbols-file ${EXPORTS}"
-		# Make the 'exptmp' file for --version-script option
-		echo "VERSION_${MAJOR}.${MINOR} {" > exptmp
-		echo "global:" >> exptmp
-		sed 's/$/;/' ${EXPORTS} >> exptmp
-		echo "local:" >> exptmp
-		echo "*;" >> exptmp
-		echo "};" >> exptmp
-		OPTS="${OPTS} -Xlinker --version-script=exptmp"
-		# exptmp is removed below
-	    fi
-
-	    # Check if objects are 32-bit and we're running in 64-bit
-	    # environment.  If so, pass -m32 flag to linker.
-	    set ${OBJECTS}
-	    ABI32=`file $1 | grep 32-bit`
-	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
-		OPTS="-m32 ${OPTS}"
-	    fi
-
 	    if [ x${PATCH} = "x" ] ; then
 		VERSION="${MAJOR}.${MINOR}"
 	    else
@@ -208,7 +175,6 @@ case $ARCH in
            ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
            # finish up
            FINAL_LIBS="${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so"
-#	    rm -f exptmp
        fi
 	;;

@@ -365,27 +331,19 @@ case $ARCH in
 	fi
 	;;

-    'AIX' | 'AIX64')
-	if [ $ARCH = "AIX64" ] ; then
-	    X64="-X64"
-	fi
-
+    'AIX')
        if [ $STATIC = 1 ] ; then
            LIBNAME="lib${LIBNAME}.a"
            echo "mklib: Making AIX static library: " ${LIBNAME}
-            ar -ruv ${X64} ${LIBNAME} ${OBJECTS}
+            ar -ruv ${LIBNAME} ${OBJECTS}
            FINAL_LIBS=${LIBNAME}
        else
 	    EXPFILE="lib${LIBNAME}.exp"
 	    OFILE=shr.o  #Want to be consistent with the IBM libGL.a
 	    LIBNAME="lib${LIBNAME}.a"  # shared objects are still stored in the .a libraries
-	    if [ $ARCH = "AIX64" ] ; then
-		OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry -q64"
-	    else
-		OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry"
-	    fi
+	    OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry"
 	    rm -f ${EXPFILE} ${OFILE}
-	    NM="/bin/nm -eC ${X64}"
+	    NM="/bin/nm -eC"
 	    echo "#! /usr/lib/${LIBNAME}" > ${EXPFILE}
 	    ${NM} ${OBJECTS} | awk '{
 	    if ((($2 == "T") || ($2 == "D") || ($2 == "B")) \
@@ -402,11 +360,22 @@ case $ARCH in
 		}
 	    }' | sort -u >> ${EXPFILE}
 	    cc ${OPTS} -o ${OFILE} ${OBJECTS} ${DEPS}
-	    ar ${X64} -r ${LIBNAME} ${OFILE}
+	    ar -r ${LIBNAME} ${OFILE}
            FINAL_LIBS="${LIBNAME}"
        fi
        ;;

+    'AIX64')
+        if [ $STATIC = 1 ] ; then
+            LIBNAME="lib${LIBNAME}.a"
+            echo "mklib: Making AIX static library: " ${LIBNAME}
+            ar -X64 -ruv ${LIBNAME} ${OBJECTS}
+            FINAL_LIBS=${LIBNAME}
+        else
+            echo "mklib: PROBLEM: AIX64 shared libs not supported!!!"
+        fi
+        ;;
+
    'OpenSTEP')
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making OpenSTEP static library: " ${LIBNAME}
@@ -425,13 +394,8 @@ case $ARCH in
 	    VERSION="${MAJOR}.${MINOR}"
 	    LIBNAME="lib${LIBNAME}.so"
 	    echo "mklib: Making OSF/1 shared library: " ${LIBNAME}
-	    if [ $CPLUSPLUS = 1 ] ; then
-		LINK=$CXX
-	    else
-		LINK=$CC
-	    fi
 	    rm -f ${LIBNAME}.${VERSION}
-	    ${LINK} -o ${LIBNAME}.${VERSION} -shared -set_version ${VERSION} -soname ${LIBNAME}.${VERSION} -expect_unresolved \* -all ${OBJECTS} ${DEPS}
+	    ld -o ${LIBNAME}.${VERSION} -shared -no_archive -set_version ${VERSION} -soname ${LIBNAME}.${VERSION} -expect_unresolved \* -all ${OBJECTS} ${DEPS}
 	    ln -sf ${LIBNAME}.${VERSION} ${LIBNAME}
 	    FINAL_LIBS="${LIBNAME} ${LIBNAME}.${VERSION}"
 	fi
--- a/configs/aix-64
+++ b/configs/aix-64
@@ -1,28 +0,0 @@
-# Configuration for AIX 64-bit, dynamic libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = aix-64
-
-# Compiler and flags
-CC = xlc
-CXX = xlC
-
-CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3
-CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3
-MKLIB_OPTIONS = -arch AIX64
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-GL_LIB_DEPS = -lX11 -lXext -lm
-GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
-GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
-GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXt -lX11
-OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
-APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC
-
--- a/configs/default
+++ b/configs/default
@@ -7,7 +7,7 @@ CONFIG_NAME = default

 # Version info
 MESA_MAJOR=6
-MESA_MINOR=3
+MESA_MINOR=2
 MESA_TINY=0

 # external projects
@@ -23,7 +23,7 @@ GLU_CFLAGS =
 # Misc tools and flags
 MKLIB_OPTIONS = 
 MKDEP = makedepend
-MKDEP_OPTIONS = -fdepend
+MKDEP_OPTIONS = -Y -fdepend
 MAKE = make

 # Library names (base name)
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -1,41 +0,0 @@
-# -*-makefile-*-
-# Configuration for freebsd-dri: FreeBSD DRI hardware drivers
-
-include $(TOP)/configs/freebsd
-
-CONFIG_NAME = freebsd-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-WARN_FLAGS = -Wall
-OPT_FLAGS = -O
-
-X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-DEFINES = -DDRI_NEW_INTERFACE_ONLY 
-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -I/usr/local/include $(X11_INCLUDES)
-CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
-
-ASM_SOURCES = 
-
-# Library/program dependencies
-DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread
-
-GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
-
-
-# Directories
-SRC_DIRS = mesa glu glut/glx glw glx/x11
-DRIVER_DIRS = dri
-PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri
-
-DRM_SOURCE_PATH=$(TOP)/../drm
-
-# ffb and gamma are missing because they have not been converted to use the new
-# interface.
-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx \
-	   unichrome savage sis
-
--- a/configs/freebsd-dri-x86
+++ b/configs/freebsd-dri-x86
@@ -1,12 +0,0 @@
-# -*-makefile-*-
-# Configuration for freebsd-dri: FreeBSD DRI hardware drivers
-
-include $(TOP)/configs/freebsd-dri
-
-CONFIG_NAME = freebsd-dri-x86
-
-# Unnecessary on x86, generally.
-PIC_FLAGS = 
-
-ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES = $(X86_SOURCES)
--- a/configs/hpux11-32
+++ b/configs/hpux11-32
@@ -1,26 +0,0 @@
-# Configuration for HPUX v11
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux11-32
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
-
-CXXFLAGS = +z -Aa +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
-
-MKLIB_OPTIONS =
-
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
-APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux11-64
+++ b/configs/hpux11-64
@@ -1,27 +0,0 @@
-# Configuration for HPUX v11, 64-bit
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux11-64
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = +z -Ae +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
-
-CXXFLAGS = +z -Aa +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
-
-MKLIB_OPTIONS =
-
-LIBDIR = $(TOP)/lib64
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
-APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/linux-debug
+++ b/configs/linux-debug
@@ -10,7 +10,7 @@ CXX = g++

 CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG

-CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
+CXXFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG

 GLUT_CFLAGS = -fexceptions

--- a/configs/linux-directfb
+++ b/configs/linux-directfb
@@ -1,29 +0,0 @@
-# Configuration for DirectFB
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-directfb
-
-# Compiler and flags
-CC  = gcc
-CXX = g++
-
-CFLAGS   = -Wall -O3 -ffast-math -fPIC -std=c99 -D_GNU_SOURCE -D_POSIX_SOURCE -D_SVID_SOURCE \
-         -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DPTHREADS
-
-CXXFLAGS = -Wall -O3 -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE   
-
-HAVE_X86 = $(shell uname -m | grep 'i[3-6]86' >/dev/null && echo yes)
-ifeq ($(HAVE_X86), yes)
-     CFLAGS   += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-     CXXFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-     ASM_SOURCES = $(X86_SOURCES) $(X86_API)
-endif
-
-# Directories
-SRC_DIRS     = mesa glu
-DRIVER_DIRS  = directfb
-PROGRAM_DIRS = # disabled
-
-# Library/program dependencies
-GL_LIB_DEPS  = -lm -lpthread
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -9,45 +9,36 @@ CONFIG_NAME = linux-dri
 CC = gcc
 CXX = g++

-MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
-#MKDEP_OPTIONS = -MF depend
-
 WARN_FLAGS = -Wall
-OPT_FLAGS = -O -g
+OPT_FLAGS = -O
+SOURCE_FLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
+	-D_BSD_SOURCE -D_GNU_SOURCE
 PIC_FLAGS = -fPIC

+CFLAGS = -DDRI_NEW_INTERFACE_ONLY $(WARN_FLAGS) -g $(OPT_FLAGS) $(ASM_FLAGS) \
+	-std=c99 $(PIC_FLAGS) -ffast-math $(SOURCE_FLAGS) -DPTHREADS \
+	-I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions

-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 
-
-X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-
-CFLAGS =  $(WARN_FLAGS) $(OPT_FLAGS) $(ASM_FLAGS) -std=c99 $(PIC_FLAGS) -ffast-math  \
-	$(DEFINES)
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) \
-	$(DEFINES)
-
+CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY $(WARN_FLAGS) -g $(OPT_FLAGS) -fPIC \
+	$(SOURCE_FLAGS)

 ASM_SOURCES = 

 # Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lexpat -ldl

 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11


 # Directories
-SRC_DIRS = mesa glu glut/glx glw glx/x11
+SRC_DIRS = mesa glu glut/glx glw
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri

 # ffb and gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon s3v \
-	savage sis tdfx trident unichrome
+DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx \
+	   unichrome savage sis
+
--- a/configs/linux-dri-ppc
+++ b/configs/linux-dri-ppc
@@ -1,17 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/linux-dri
-
-CONFIG_NAME = linux-dri-ppc
-
-OPT_FLAGS = -Os -mcpu=603
-PIC_FLAGS = -fPIC
-
-ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
-ASM_SOURCES = $(PPC_SOURCES)
-
-# Build only the drivers for cards that exist on PowerPC.  At some point MGA
-# will be added, but not yet.
-DRI_DIRS = dri_client mach64 r128 r200 radeon tdfx
-
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -9,25 +9,21 @@ CONFIG_NAME = linux-dri-x86-64
 CC = gcc
 CXX = g++

-DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE 
+CFLAGS = -DDRI_NEW_INTERFACE_ONLY -m64 -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE  -D__AMD64__ -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions

-CFLAGS = -m64 -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math $(DEFINES)
-CXXFLAGS = -m64 -Wall -g -ansi -pedantic -fPIC $(DEFINES)
-
-X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -m64 -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__

 #ASM_SOURCES = $(X86_SOURCES)

 LIB_DIR = $(TOP)/lib64

 # Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
+GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread -lexpat -ldl
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11

 # Directories
-SRC_DIRS = mesa glu glut/glx glw glx/x11
+SRC_DIRS = mesa glu glut/glx glw
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -8,24 +8,23 @@ CONFIG_NAME = linux-solo
 CC = gcc
 CXX = g++

-DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1
+CCOMMON = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE

-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
+CFLAGS = $(CCOMMON) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math

-CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
+CXXFLAGS = $(CCOMMON) -Wall -O3 -ansi -pedantic -fPIC


 ASM_SOURCES = $(X86_SOURCES)

 # Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS = -lm -lpthread -ldl
+GL_LIB_DEPS = -lm -lpthread -lexpat -ldl
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread

 # Directories
-SRC_DIRS = mesa glx/mini glu glut/mini
+SRC_DIRS = mesa glx glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx

--- a/configs/linux-solo-ia64
+++ b/configs/linux-solo-ia64
@@ -8,21 +8,20 @@ CONFIG_NAME = linux-solo-ia64
 CC = gcc
 CXX = g++

-DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE
+CCOMMON = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE

-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
+CFLAGS = $(CCOMMON) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math

-CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
+CXXFLAGS = $(CCOMMON) -Wall -O3 -ansi -pedantic -fPIC


 # Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS = -lm -lpthread -ldl
+GL_LIB_DEPS = -lm -lpthread -lexpat -ldl
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread

 # Directories
-SRC_DIRS = mesa glx/mini glu glut/mini
+SRC_DIRS = mesa glx glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx

--- a/configs/linux-solo-x86
+++ b/configs/linux-solo-x86
@@ -8,23 +8,22 @@ CONFIG_NAME = linux-solo-x86
 CC = gcc
 CXX = g++

-DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1
+CCOMMON = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS

-CFLAGS = $(DEFINES) -Wmissing-prototypes -O3 -g -std=c99 -Wundef -fPIC -ffast-math
+CFLAGS = $(CCOMMON) -Wmissing-prototypes -O3 -g -std=c99 -Wundef -fPIC -ffast-math

-CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
+CXXFLAGS = $(CCOMMON) -Wall -O3 -ansi -pedantic -fPIC


 ASM_SOURCES = $(X86_SOURCES)

 # Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS = -lm -lpthread -ldl
+GL_LIB_DEPS = -lm -lpthread -lexpat -ldl
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread

 # Directories
-SRC_DIRS = mesa glx/mini glu glut/mini
+SRC_DIRS = mesa glx glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx

--- a/configs/linux-tcc
+++ b/configs/linux-tcc
@@ -12,7 +12,7 @@ TCC_DIR=/home/progs/tcc-0.9.20

 CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DUSE_TCC -I$(TCC_DIR)

-CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
+CXXFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG

 GLUT_CFLAGS = -fexceptions

--- a/configs/linux-x86-32
+++ b/configs/linux-x86-32
@@ -1,13 +0,0 @@
-# To build Linux x86 32-bit in an x86-64 environment
-
-include $(TOP)/configs/linux-x86
-
-CONFIG_NAME = linux-x86-32
-
-
-# Other than -m32, these are the same as in linux-x86, which we included above.
-
-CFLAGS = -m32 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
-
-CXXFLAGS = -m32 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
--- a/configs/linux-x86-64
+++ b/configs/linux-x86-64
@@ -8,9 +8,9 @@ CONFIG_NAME = linux-x86-64
 CC = gcc
 CXX = g++

-CFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
+CFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -D__AMD64__ -I/usr/X11R6/include

-CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__

 GLUT_CFLAGS = -fexceptions

--- a/configs/linux-x86-64-static
+++ b/configs/linux-x86-64-static
@@ -8,9 +8,9 @@ CONFIG_NAME = linux-x86-64-static
 CC = gcc
 CXX = g++

-CFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
+CFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -D__AMD64__ -I/usr/X11R6/include

-CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__

 GLUT_CFLAGS = -fexceptions

--- a/configs/osf1
+++ b/configs/osf1
@@ -13,4 +13,6 @@ CXXFLAGS = -O2 -std ansi -ieee
 GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
-APP_LIB_DEPS = -L$(LIB_DIR) -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
+APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -lXext -lXmu -lXi -lm
+
+
--- a/descrip.mms
+++ b/descrip.mms
@@ -13,9 +13,7 @@ all :
 	if f$search("lib.dir") .eqs. "" then create/directory [.lib]
 	set default [.src]
 	$(MMS)$(MMSQUALIFIERS)
-	set default [-.progs.util]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.demos]
+	set default [-.progs.demos]
 	$(MMS)$(MMSQUALIFIERS)
 	set default [-.xdemos]
 	$(MMS)$(MMSQUALIFIERS)
--- a/docs/README.3DFX
+++ b/docs/README.3DFX
@@ -3,46 +3,49 @@



-Requirements:
-------------
+Mesa-6.2 release notes:
+-----------------------

-A Voodoo-based videocard/accelerator
-DOS (with DJGPP), Windows9x/2k (with MinGW), Linux
-Glide3x library for your OS
+1) Glide2 support has been ceased; please visit the Glide SourceForge and
+   help us improve Glide3.
+2) The current release is a WIP; among other things, the Linux build works
+   only to some extent. Voodoo Rush not fully tested. Any help will be
+   appreciated.
+3) Although Mesa is designed to work with any Glide3, it would benefit from
+   interacting with newer Glide libraries, which can export functions like:
+   `grGetRegistryOrEnvironmentStringExt', `grSetNumPendingBuffers', Texus2
+   and pointcast palette. The latest Glide3 can be reached here:
+	http://sourceforge.net/projects/glide/

-http://sourceforge.net/projects/glide/
+
+
+Known supported HW/OS:
+----------------------
+
+Voodoo-based videocards/accelerators
+DOS (DJGPP), Windows9x/2k (MinGW/MSVC), Linux



 How to compile:
 ---------------

-DJGPP:
+DJGPP/MinGW:
   Place the Glide3 SDK in the top Mesa directory:
-	$(MESA)/glide3/include/
-		3dfx.h, g3ext.h, glide.h, glidesys.h, glideutl.h, sst1vid.h
+	$(MESA)/glide3/include/*.h
 	$(MESA)/glide3/lib/
-		libgld3x.a, libgld3i.a, glide3x.dxe
+   Required headers:
+	3dfx.h, g3ext.h, glide.h, glidesys.h, glideutl.h, sst1vid.h
+   Required libraries:
+	OS specific
   Type:
 	make -f Makefile.DJ X86=1 FX=1
-   Look into the makefile for further information.
-
-MinGW:
-   Place the Glide3 SDK in the top Mesa directory:
-	$(MESA)/glide3/include/
-		3dfx.h, g3ext.h, glide.h, glidesys.h, glideutl.h, sst1vid.h
-	$(MESA)/glide3/lib/
-		libglide3x.a, glide3x.dll
-   Type:
+	or
 	make -f Makefile.mgw X86=1 FX=1
-   Look into the makefile for further information.
+   Look into the corresponding makefiles for further information.

 Linux:
   Place the Glide3 SDK in /usr/local/glide
-	/usr/local/glide/include/
-		3dfx.h, g3ext.h, glide.h, glidesys.h, glideutl.h, sst1vid.h
-	/usr/local/glide/lib/
-		libglide3x.a, libglide3x.so
   Type:
 	make linux-glide
 	or
@@ -60,7 +63,12 @@ FX_TRAP_GLIDE
 FX_PACKEDCOLOR
 	use packed color in vertex structure
 FX_TC_NAPALM
-	map GL_COMPRESSED_RGB[A] to FXT1. Works with VSA100-based cards only.
+	map GL_COMPRESSED_RGB[A] to FXT1. This will have effect on Napalm
+	only (can coexist with FX_TC_NCC, but has higher priority)
+FX_TC_NCC
+	experimental
+	map GL_COMPRESSED_RGB[A] to NCC. This will have effect on any 3dfx
+	HW (can coexist with FX_TC_NAPALM, but has lesser priority)
 FX_COMPRESS_S3TC_AS_FXT1_HACK
 	map S3TC to FXT1
 FX_RESCALE_BIG_TEXURES_HACK
@@ -97,7 +105,7 @@ FX_GLIDE_SWAPPENDINGCOUNT
 	HW: all
 	Desc: max # of buffers allowed to build up
 	Note: (*) (!)
-	Value: "0", "1", "2", "3", "4", "5" or "6"
+	Value: "0", "1", "2" or "3"
 FX_GLIDE_SWAPINTERVAL
 	OS: all
 	HW: all
@@ -140,7 +148,7 @@ MESA_FX_NOSNAP
 	OS: all
 	HW: Voodoo1, Rush, Banshee
 	Desc: do not snap vertices inside Mesa
-	Note: to be used with Glide3x that snaps vertices internally
+	Note: to be used with Glide3x that snaps vertices itself
 MESA_FX_POINTCAST
 	OS: all
 	HW: dual-TMU cards (some Voodoo1, Voodoo2, Avenger, Napalm)
@@ -185,25 +193,15 @@ MESA_FX_MAXLOD
 	    "9"  - 512x512 textures
 	    "10" - 1024x1024 textures
 	    "11" - 2048x2048 textures
-MESA_FX_ALLOW_VP
-	OS: all
-	HW: all
-	Desc: allow vertex program extensions
 MESA_GLX_FX
 	OS: linux
 	HW: Voodoo1, Rush, Voodoo2
 	Desc: display mode
-	Note: (!) experimental
+	Note: (!) experimental: "w" may work in Win32 using non-V1/V2 HW
 	Value:
 	    "w" - windowed mode
 	    "f" - fullscreen mode
 	    "d" - disable glide driver
-	OS: win32
-	HW: Rush, Banshee, Avenger, Napalm
-	Desc: display mode
-	Note: (!) experimental
-	Value:
-	    "w" - windowed mode



--- a/docs/README.BEOS
+++ b/docs/README.BEOS
@@ -28,11 +28,9 @@ working.  No optimizations have been made at this time.

 * Compiling

-Since Mesa 6.x, it can be build under BeOS with both the R5 builtin gcc version
-or more recent gcc versions available for BeOS, like this gcc version 2.95.3 for BeOS 
-you can find at http://www.bebits.com/app/2157.
-Anyway, keep in mind that to take full advantage of Mesa x86 optimizations, you better
-want to use gcc 2.95.3 or sooner versions...
+Requirements:
+  - gcc version 2.95.3 for BeOS 
+  You can find it here: http://www.bebits.com/app/2157

 To build Mesa-powered BeOS libGL.so version, open an Terminal window,
 move to Mesa root folder and type this command:
@@ -113,7 +111,6 @@ cause a fatal error when running with Be's OpenGL.
 Jake Hamby                      jhamby <at> anobject <dot> com
 Marcin Konicki                  ahwayakchih <at> neoni <dot> net
 Francois Revol                  revol <at> free <dot> fr
-Nathan Whitehorn                nathanw <at> uchicago <dot> edu


 * Older BeOS Driver
@@ -134,4 +131,4 @@ as of February, 1999.


 ----------------------------------------------------------------------
-$Id: README.BEOS,v 1.12 2004/10/13 00:35:55 phoudoin Exp $
+$Id: README.BEOS,v 1.11 2004/08/24 08:31:57 phoudoin Exp $
--- a/docs/README.DJ
+++ b/docs/README.DJ
@@ -1,4 +1,4 @@
-			Mesa 6.3 DOS/DJGPP Port v1.7
+			Mesa 6.1 DOS/DJGPP Port v1.6
 			~~~~~~~~~~~~~~~~~~~~~~~~~~~~


@@ -6,7 +6,7 @@
 Description:
 ~~~~~~~~~~~~

-Well, guess what... this is the DOS port of Mesa 6.3, for DJGPP fans... Whoa!
+Well, guess what... this is the DOS port of Mesa 6.1, for DJGPP fans... Whoa!
 The driver has its origins in ddsample.c, written by Brian Paul and found by me
 in Mesa 3.4.2.

@@ -59,7 +59,7 @@ Tested on:
 	CPU:		AMD Athlon XP 1800+
 	Mainboard:	GA-7VTXE w/ 512 MB DDRAM
 	Video card:	Voodoo5 6000 AGP w/ 128 MB SDRAM
-	DJGPP:		djdev 2.04 + gcc v3.4.3 + make v3.80
+	DJGPP:		djdev 2.04 + gcc v3.3.2 + make v3.80
 	OS:		DOS and Win98SE


@@ -91,12 +91,8 @@ FAQ:

 2. Using Mesa for DJGPP

-   Q) Every test I tried crashes badly.
-   A) If you have compiled with SSE and you're running under plain DOS, you
-      have to disable SSE at run-time. See environment variables below.
-
   Q) DMesa is so SLOOOW! The Win32 OpenGL performs so much better...
-   A) Is that a question? If you have a 3dfx Voodoo (any model), you're
+   A) Is that a question? If you have a 3dfx Voodoo or higher card, you're
      lucky (check http://sourceforge.net/projects/glide for the DJGPP port).
      If you haven't, sorry; everything is done in software. Suggestions?

@@ -113,10 +109,14 @@ FAQ:
      at peak performance ;-).

   Q) I'm getting a "bad font!" fatal error.
-   A) Always use GLUT_STROKE_* and GLUT_BITMAP_* constants when dealing with
-      GLUT fonts. If you're using `glut.dxe', then make sure GLUT_STROKE_* and
-      GLUT_BITMAP_* are mapped to integer constants, not to the actual font
-      address (same mechanism used for Win32 _DLL).
+   A) By default, DOS GLUT compiles with GLUT_IMPORT_LIB, to cope with variable
+      access inside dynamic modules (same mechanism used for Win32 _DLL). Since
+      -DGLUT_IMPORT_LIB affects Mesa's `glut.h', your apps must be compiled the
+      same way GLUT was compiled (either with or without defining it). If you
+      want to use another `glut.h' when building your own demos, or just don't
+      feel happy about this, make sure you remove the line with GLUT_IMPORT_LIB
+      from `Mesa/src/glut/dos/Makefile.DJ' before (re)making GLUT. Beware, this
+      means you will never EVER be able to safely use `glut.dxe'!

   Q) What is NUL driver good for, if I don't get any output at all?
   A) For debugging. The NUL driver is very much like OSMesa. Everything is
@@ -134,7 +134,7 @@ FAQ:
 	struct {
 		int xres, yres;
 		int bpp;
-	} **l = malloc(n * sizeof(void *));
+	} **l = malloc(n * sizeof(void **));
      Now pass the newly allocated buffer to fill in:
 	DMesaGetIntegerv(DMESA_GET_VIDEO_MODES, (GLint *)l);
      And collect the info:
@@ -194,7 +194,6 @@ Environment variables:
 ~~~~~~~~~~~~~~~~~~~~~~
 	DMESA_NULDRV		- (any value) force NUL driver
 	GLUT_FPS		- print frames/second statistics to stderr
-	MESA_NO_SSE		- (any value) safe option under pure DOS
 	DMESA_GLUT_REFRESH	- set vertical screen refresh rate (VESA3)
 	DMESA_GLUT_BPP		- set default bits per pixel (VGA needs 8)
 	DMESA_GLUT_ALPHA	- set default alpha bits (8)
@@ -258,13 +257,6 @@ v1.6 (aug-2004)
 	! fixed a horrible bug in VGA initialization routine
 	! fixed partial clears

-v1.7 (???-2005)
-	+ enabled OpenGL 2.0 support
-	+ added support for sw texture compression
-	+ added FreeGLUT specific functions
-	* no more GLX sources in DOS GLUT
-	* made GLUT timer callbacks less accurate but safer
-


 Contact:
--- a/docs/README.WIN32
+++ b/docs/README.WIN32
@@ -1,6 +1,6 @@
 File: docs/README.WIN32

-Last updated: Oct 01, 2004 - Karl Schultz - kschultz@users.sourceforge.net
+Last updated: Sep 18, 2003 - Karl Schultz - kschultz@users.sourceforge.net

 Quick Start

@@ -14,36 +14,16 @@ The build system has been changed to use Microsoft Visual Studio project
 workspaces and projects.  Makefiles are no longer shipped or supported, but
 can be generated from the projects using Visual Studio.

-The workspace and project files were created with Visual Studio 6, so that
-they can be used with VS6 and so that they can also be imported into VS 7.
-
 Details and Notes

 - To build the Mesa libraries, open the Mesa.dsw workspace file
-  in the top directory.  You will need to build at least one
-  driver.  Currently, only the gdi and osmesa drivers are available.
-  Select one or the other as the active project and build it.
-  If you want glu, select the glu project as active and build that as well.
-
- Glut is no longer in the Mesa.dsw workspace.  It is now built in
-  the demo workspace (see below).
-  
- The build process will create a lib directory in the top directory 
-  and will put the following files there as you build them:
-	OPENGL32.LIB, GLU32.LIB, OSMESA32.LIB
-	OPENGL32.DLL, GLU32.DLL, OSMESA32.DLL
-
- Some users have reported problems building glu with VS7 after importing
-  and converting the VS6 project files.  The problem is caused by a custom
-  build step that was put in place to work around a problem with VS6 not
-  recognizing .cc files as C++ source files.  It appears that VS7 can be
-  configured to recognize .cc files as C++ files and so it compiles these
-  glu files with the default settings, and does not use settings that are
-  required to compile the files correctly.  The easiest way to solve the
-  problem is to remove the .cc files from the glu project.  This does not
-  delete the files, but removes them from the project so that VS does not
-  try to compile them at all.  This allows the custom build step to compile 
-  the files with the proper settings.
+  in the top directory.  You can build each project one-by-one,
+  or build the glut project to build everything except osmesa,
+  which needs to be built separately.  The build process will
+  create a lib directory in the top directory and will put the
+  following files there:
+	OPENGL32.LIB, GLU32.LIB, GLUT32.LIB, OSMESA32.LIB
+	OPENGL32.DLL, GLU32.DLL, GLUT32.DLL, OSMESA32.DLL

 - After building, you can copy the above DLL files to a place in your PATH
  such as $SystemRoot/SYSTEM32.  If you don't like putting things in a
@@ -71,6 +51,9 @@ Details and Notes
 - The si-glu sources are used to build the GLU libs.  This was done
  mainly to get the better tessellator code.

+- The osmesa driver builds and should work on Windows as well as
+  any other platform.
+
 - The Windows driver (in src/Windows) builds and runs at least at
  a minimal level.  I modified this driver to work with the new
  Mesa 4.0 code and driver architecture, but I did not do a great
--- a/docs/README.directfb
+++ b/docs/README.directfb
@@ -1,28 +0,0 @@
-                         
-                         Mesa DirectFB Information
-
-
-Requirements
-============
-
-  To build Mesa with DirectFB (DirectFBGL) support you need:
-     - DirectFB at least 0.9.21 (http://directfb.org)
-     - pkg-config at least 0.9 (http://pkgconfig.sf.net)
-
-
-Installation
-============
-  Run
-     
-     make linux-directfb
-
-  to build Mesa and DirectFBGL module,
-
-     make install
-
-  to install OpenGL libraries and
-
-     make linux-directfb-install
-
-  to install DirectFBGL module in the proper location.
-
--- a/docs/RELNOTES-6.2
+++ b/docs/RELNOTES-6.2
@@ -1,7 +1,7 @@

                           Mesa 6.2 release notes

-                              October 2, 2004
+                              Month, day, 2004

                              PLEASE READ!!!!

@@ -19,19 +19,6 @@ This release primarily just fixes bugs found in the Mesa 6.1 release.
 See the VERSIONS file for details.


-ToDo: PBO for polygon stipple, convolution filter, etc.
-
-
-
-Known Issues
------------
-
-The GL_EXT_pixel_buffer_object extension isn't fully implemented for
-functions like glPolygonStipple, glConvolutionFilter, glColorTable,
-etc.  The important functions like glRead/DrawPixels, glTex[Sub]Image,
-and glBitmap work with PBOs.
-
-

 Driver			Status
 ----------------------	---------------------
@@ -49,4 +36,4 @@ D3D			needs updating


 ----------------------------------------------------------------------
-$Id: RELNOTES-6.2,v 3.4 2004/10/02 15:43:14 brianp Exp $
+$Id: RELNOTES-6.2,v 3.1 2004/08/22 17:43:31 brianp Exp $
--- a/docs/RELNOTES-6.2.1
+++ b/docs/RELNOTES-6.2.1
@@ -1,50 +0,0 @@
-
-                           Mesa 6.2.1 release notes
-
-                              December 9, 2004
-
-                              PLEASE READ!!!!
-
-
-
-Introduction
------------
-
-Mesa uses an even/odd version number scheme like the Linux kernel.
-Odd numbered versions (such as 6.1) designate new developmental releases.
-Even numbered versions (such as 6.2.x) designate stable releases.
-
-
-This release primarily just fixes bugs found in the Mesa 6.2 release.
-See the VERSIONS file for details.
-
-
-
-Known Issues
------------
-
-The GL_EXT_pixel_buffer_object extension isn't fully implemented for
-functions like glPolygonStipple, glConvolutionFilter, glColorTable,
-etc.  The important functions like glRead/DrawPixels, glTex[Sub]Image,
-and glBitmap work with PBOs.  This has been fixed for Mesa 6.3.
-
-
-
-
-Driver			Status
----------------------	---------------------
-XMesa (Xlib)		implements OpenGL 1.5
-OSMesa (off-screen)	implements OpenGL 1.5
-Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
-SVGA			implements OpenGL 1.3
-Wind River UGL		implements OpenGL 1.3
-Windows/Win32		implements OpenGL 1.5
-DJGPP			implements OpenGL 1.5
-GGI			implements OpenGL 1.3
-BeOS			implements OpenGL 1.5
-Allegro			needs updating
-D3D			needs updating
-
-
----------------------------------------------------------------------
-$Id: RELNOTES-6.2.1,v 3.1 2004/12/09 23:21:36 brianp Exp $
--- a/docs/RELNOTES-6.3
+++ b/docs/RELNOTES-6.3
@@ -1,97 +0,0 @@
-
-                           Mesa 6.3 release notes
-
-                              month day, 2004
-
-                              PLEASE READ!!!!
-
-
-
-Introduction
------------
-
-Mesa uses an even/odd version number scheme like the Linux kernel.
-Odd numbered versions (such as 6.3) designate new developmental releases.
-Even numbered versions (such as 6.2) designate stable releases.
-
-
-
-New Features
------------
-
-GL_ARB_draw_buffers - allows a fragment program to write to a number of
-  separate color buffers, instead of just one.
-
-GL_OES_read_format - allows one to query the fastest glReadPixels format
-  and datatype.
-
-GL_ARB_pixel_buffer_object - buffer objects for pixel read/write functions.
-
-DirectFB driver, contributed by Claudio Ciccani.  See docs/README.directfb
-for details.
-
-
-
-Vertex/Fragment Program PRINT Instruction
-----------------------------------------
-
-The GL_NV_vertex_program and GL_NV_fragment_program languages have been
-extended with a PRINT instruction.
-
-
-
-glDeleteTextures(), glDeletePrograms() and glDeleteBuffers() Changed
--------------------------------------------------------------------
-
-To match the behaviour of other OpenGL implementations, glDeleteTextures,
-glDeletePrograms and glDeleteBuffers have been modified so that:
-
-  * The named texture/program/buffer ID is immediately freed for re-use.
-
-  * The actual texture object, program or buffers isn't really deleted until
-    it is no longer bound in any rendering context (the reference count
-    is zero).
-
-Previously, the texture/program/buffer ID wasn't freed until the object
-was really deleted.
-
-Note that textures, programs and buffers can be shared by several rendering
-contexts so they can't be deleted until they're unbound in _all_ contexts.
-
-
-
-
-
-To Do before release
--------------------
- Fix dinoshade bug
- Switch to freeglut
- Increase MAX_DRAWBUFFERS
- driver hooks for BeginQuery/EndQuery
-
-
-
-Miscellaneous
-------------
-
-The main/get.c file is now generated with a Python script.
-
-
-
-Driver			Status
----------------------	---------------------
-XMesa (Xlib)		implements OpenGL 1.5
-OSMesa (off-screen)	implements OpenGL 1.5
-Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
-SVGA			implements OpenGL 1.3
-Wind River UGL		implements OpenGL 1.3
-Windows/Win32		implements OpenGL 1.5
-DJGPP			implements OpenGL 1.5
-GGI			implements OpenGL 1.3
-BeOS			implements OpenGL 1.5
-Allegro			needs updating
-D3D			needs updating
-
-
----------------------------------------------------------------------
-$Id: RELNOTES-6.3,v 3.8 2005/01/20 04:03:37 brianp Exp $
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1276,7 +1276,7 @@ Mesa Version History
 	- fixed a number of minor memory leaks (bug #1002030)


-6.2  October 2, 2004
+6.2  Month, day, 2004
    New:
 	- enabled GL_ARB_texture_rectangle (same as GL_NV_texture_rectangle)
 	- updated Doxygen support (Jose Fonseca)
@@ -1293,39 +1293,3 @@ Mesa Version History
 	- repeated calls to glDeleteTexture(t) could lead to a crash
 	- fixed potential ref count bugs in VBOs and vertex/fragment programs
 	- spriteblast demo didn't handle window size changes correctly
-	- glTexSubImage didn't handle pixels=NULL correctly for PBOs
-	- fixed color index mode glDrawPixels bug (Karl Schultz)
-
-
-6.2.1  December 9, 2004
-    Bug fixes:
-	- don't apply regular fog or color sum when using a fragment program
-	- glProgramEnvParameter4fARB always generated an error on
-	  GL_FRAGMENT_PROGRAM_ARB (fdo bug 1645)
-	- glVertexAttrib3svNV and glVertexAttrib3svARB were broken
-	- fixed width/height mix-up in glSeparableFilter2D()
-	- fixed regression in glCopyPixels + convolution
-	- glReadPixels from a clipped front color buffer didn't always work
-	- glTexImage didn't accept GL_RED/GREEN/BLUE as the format
-	- Attempting queries/accesses of VBO 0 weren't detected as errors
-	- paletted textures failed if the palette had fewer that 256 entries
-    Changes:
-	- fixed a bunch of compiler warnings found with gcc 3.4
-	- bug reports should to go bugzilla.freedesktop.org
-
-
-6.3  Month day, 2004
-    New:
-	- GL_ARB_draw_buffers extension
-	- GL_ARB_pixel_buffer_object extension
-	- GL_OES_read_format extension (Ian Romanick)
-	- DirectFB driver (Claudio Ciccani)
-    Changes:
-	- added -stereo option for glxgears demo (Jacek Rosik)
-	- updated the PBuffer demo code in xdemos/ directory
-	- glDeleteTextures/Programs/Buffers() now makes the object ID
-	  available for immediate re-use
-    Bug fixes:
-	- some functions didn't support PBO functionality
-	- glGetTexImage didn't convert color index images to RGBA as required
-
--- a/docs/bugs.html
+++ b/docs/bugs.html
@@ -2,27 +2,14 @@

 <TITLE>Mesa Bug Reporting</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Bug Database</H1>

 <p>
-The Mesa bug database is now hosted on
-<a href="http://freedesktop.org" target="_parent">freedesktop.org</a>
-instead of SourceForge.
-</p>
-
-<p>
-To file a Mesa bug, go to
-<a href="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa"
-target="_parent">
-Bugzilla on freedesktop.org</a>
-</p>
-
-<p>
-Please follow these bug reporting guidelines:
+Bug reports can be filed in the <a
+href="http://sourceforge.net/bugs/?group_id=3" target="_parent">Bug
+Database</a> on sourceforge.net. Please follow these guidelines:
 </p>

 <ul>
@@ -34,8 +21,7 @@ Please follow these bug reporting guidelines:
 </ul>

 <p>
-Bug reports will automatically be forwarded to the Mesa developer's mailing
-list.
+Bug reports will automatically be forwarded to the Mesa developer's list.
 </p>

 <p>
--- a/docs/conform.html
+++ b/docs/conform.html
@@ -2,9 +2,7 @@

 <TITLE>Conformance</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Conformance</H1>

--- a/docs/contents.html
+++ b/docs/contents.html
@@ -2,26 +2,7 @@

 <title>Contents</title>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<body bgcolor="#119955">
-
-<!--Override a few values from the style sheet: -->
-<style>
-<!--
-body {
-	background-color: #119955;
-	color: white;
-}
-a:link {
-	color: #fff;
-}
-a:visited {
-	color: #ccc;
-}
-->
-</style>
-
+<body text="#ffffff" bgcolor="#119955" link="#ffffff" vlink="#dddddd" alink="#ffffff">

 <b>Documentation</b>
 <ul>
@@ -39,7 +20,7 @@ a:visited {

 <b>Download / Install</b>
 <ul>
-<li><a href="http://www.sourceforge.net/projects/mesa3d" target="_parent">Stable Release (6.2.1)</a>
+<li><a href="http://www.sourceforge.net/projects/mesa3d" target="_parent">Stable Release (6.0.1)</a>
 <li><a href="download.html" target="MainFrame">Downloading/Unpacking</a>
 <li><a href="install.html" target="MainFrame">Compilation/Installation</a>
 <li><a href="glu.html" target="MainFrame">SGI's GLU</a>
@@ -72,6 +53,7 @@ a:visited {
 <li><a href="utilities.html" target="MainFrame">Utilities</a>
 <li><a href="helpwanted.html" target="MainFrame">Help Wanted</a>
 <li><a href="devinfo.html" target="MainFrame">Development Notes</a>
+<li><a href="drivers.html" target="MainFrame">Writing Device Drivers</a>
 <li><a href="sourcedocs.html" target="MainFrame">Source Documentation</a>
 <li><a href="subset.html" target="MainFrame">Subset Information</a>
 <li><a href="fbdev-dri.html" target="MainFrame">fbdev/DRI Environment</a>
--- a/docs/custom.html
+++ b/docs/custom.html
@@ -2,9 +2,7 @@

 <TITLE>Custom Development</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Custom Development</H1>

--- a/docs/cvs_access.html
+++ b/docs/cvs_access.html
@@ -2,9 +2,7 @@

 <TITLE>CVS Access</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <h1>CVS Access</h1>

--- a/docs/cvs_branches.html
+++ b/docs/cvs_branches.html
@@ -2,9 +2,7 @@

 <TITLE>CVS Branches</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>CVS Branch Information</H1>

@@ -17,25 +15,25 @@ code while a CVS branch has the latest stable code.
 </p>

 <p>
-Currently (Oct 2004), the trunk is the Mesa 6.3 development code
-while the mesa_6_2_branch branch has the stable Mesa 6.2.x code.
+Currently (Nov 2003), the trunk is the Mesa 5.1 development code
+while the mesa_5_0_branch branch has the stable Mesa 5.0.x code.
 </p>

 <p>
 Mesa releases use an even/odd numbering scheme to represent stable/development
 releases.

-For example, Mesa 6.2 (0 is considered even) is a stable release while
-Mesa 6.3 is a development release.
+For example, Mesa 5.0.x (0 is considered even) is a stable release while
+Mesa 5.1.x is a development release.
 </p>

 <p>
 To checkout a specific CVS branch pass <code>-r</code> and
 the branch tag after your CVS command.

-For example <code>cvs checkout -r mesa_6_2_branch Mesa</code> will
-checkout the 6.2 branch and <code>cvs update -r
-mesa_6_2_branch</code> will convert your current CVS tree to the 6.2
+For example <code>cvs checkout -r mesa_5_0_branch Mesa</code> will
+checkout the 5.0.x branch and <code>cvs update -r
+mesa_5_0_branch</code> will convert your current CVS tree to the 5.0.x
 branch.

 Consult <a href="http://www.durak.org/cvswebsites/doc/cvs_5.php3#SEC54"
--- a/docs/debugging.html
+++ b/docs/debugging.html
@@ -2,9 +2,7 @@

 <TITLE>Debugging Tips</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Debugging Tips</H1>

--- a/docs/demos.html
+++ b/docs/demos.html
@@ -2,9 +2,7 @@

 <TITLE>Demos</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Demos</H1>

--- a/docs/devinfo.html
+++ b/docs/devinfo.html
@@ -2,9 +2,7 @@

 <TITLE>Development Notes</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Development Notes</H1>

@@ -41,7 +39,7 @@ To add a new GL extension to Mesa you have to do at least the following.
   extension is rather large, try to implement it in a new source file.
 </li>
 <li>
-   If the new extension adds new GL state, the functions in get.c, enable.c
+   If hew extension adds new GL state, the functions in get.c, enable.c
   and attrib.c will most likely require new code.
 </li>
 </ul>
@@ -96,7 +94,7 @@ Constants and macros are ALL_UPPERCASE, with _ between words
 </p>

 <p>
-Global variables are not allowed.
+Global vars not allowed.
 </p>

 <p>
@@ -111,85 +109,110 @@ Function name examples:
 </pre>


+<H2>Writing a Device Driver</H2>
+
+<p>
+XXX to do
+</p>
+
+
+
 <H2>Making a New Mesa Release</H2>

 <p>
 These are the instructions for making a new Mesa release.
 </p>

-<H3>Get latest source files</H3>
 <p>
-Use "cvs update -dAP " to get the latest Mesa files from CVS.
+Prerequisites (later versions may work):
+</p>
+<ul>
+<li>	autoconf 2.50
+<li>	automake 1.4-p2
+<li>	libtool 1.4
+</ul>
+
+<p>
+Be sure to do a "cvs update -d ." in the Mesa directory to
+get all the latest files.
 </p>

+<p>
+Update the version definitions in src/version.h
+</p>

-<H3>Verify and update version info</H3>
 <p>
 Create/edit the docs/RELNOTES-X.Y file to document what's new in the release.
-Add the new RELNOTES-X.Y file to <a href="relnotes.html">relnotes.html</a>.
-Update the docs/VERSIONS file too.
+Edit the docs/VERSIONS file too.
 </p>

 <p>
-Edit configs/default and change the MESA_MAJOR, MESA_MINOR and MESA_TINY
-version numbers.
+Edit Make-config and change the MESA_MAJOR and/or MESA_MINOR versions.
 </p>

 <p>
-Make sure the values in src/mesa/main/version.h is correct.
+Edit the GNU configure stuff to change versions numbers as needed:
+Update the version string (second argument) in the line
+"AM_INIT_AUTOMAKE(Mesa, 3.3)" in the configure.in file.
 </p>

 <p>
-Edit the top-level Makefile and verify that DIRECTORY, LIB_NAME and
-DEMO_NAME are correct.
+Remove the leading `dnl' from the line "dnl AM_MAINTAINER_MODE".
 </p>

 <p>
-Update the docs/news.html file and docs/contents.html files.
+Verify the version numbers near the top of configure.in
 </p>

 <p>
-Check in all updates to CVS.
+Run "fixam -f" to disable automatic dependency tracking.
 </p>

 <p>
-Tag the CVS files with the release name (in the form <b>mesa_X_Y</b>).
+Run the bootstrap script to generate the configure script.
 </p>

-
-<H3>Make the tarballs</H3>
 <p>
-Make a symbolic link from $(DIRECTORY) to 'Mesa'.  For example,
-ln -s Mesa Mesa-6.3
-This is needed in order to make a correct tar file in the next step.
+Edit Makefile.X11 and verify DIRECTORY is set correctly.  The Mesa
+sources must be in that directory (or there must be a symbolic link).
+</p>
+
+<p>
+Edit Makefile.X11 and verify that LIB_NAME and DEMO_NAME are correct.
+If it's a beta release, be sure the bump up the beta release number.
+</p>
+
+<p>
+cp Makefile.X11 to Makefile so that the old-style Mesa makefiles
+still work.  ./configure will overwrite it if that's what the user runs.
+</p>
+
+<p>
+Make a symbolic link from $(DIRECTORY) to Mesa.  For example,
+ln -s Mesa Mesa-3.3    This is needed in order to make a correct
+tar file in the next step.
 </p>

 <p>
 Make the distribution files.  From inside the Mesa directory:
 <pre>
-	make tarballs
+	make -f Makefile.X11 lib_tar
+	make -f Makefile.X11 demo_tar
+	make -f Makefile.X11 lib_zip
+	make -f Makefile.X11 demo_zip
 </pre>

-<p>
-After the tarballs are created, the md5 checksums for the files will
-be computed.
-Add them to the docs/news.html file.
-</p>
-
 <p>
 Copy the distribution files to a temporary directory, unpack them,
 compile everything, and run some demos to be sure everything works.
 </p>

-<H3>Update the website and announce the release</H3>
 <p>
-Follow the directions on SourceForge for creating a new "release" and
-uploading the tarballs.
+Upload the *.tar.gz and *.zip files to ftp.mesa3d.org
 </p>

 <p>
-Update the web site by copying the docs/ directory's files to 
-/home/users/b/br/brianp/mesa-www/htdocs/
+Update the web site.
 </p>

 <p>
@@ -201,6 +224,17 @@ and
 </p>


+<H2>Autoconf info</H2>
+
+<p>
+In order to run the bootstrap script you'll need:
+<p>
+<pre>
+autoconf 2.50
+automake 1.4-p5
+libtool 1.4
+</pre>
+

 </body>
 </html>
--- a/docs/download.html
+++ b/docs/download.html
@@ -2,9 +2,7 @@

 <TITLE>Getting Mesa</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Downloading / Unpacking</H1>

--- a/docs/envvars.html
+++ b/docs/envvars.html
@@ -2,9 +2,7 @@

 <TITLE>Environment Variables</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Environment Variables</H1>

--- a/docs/extensions.html
+++ b/docs/extensions.html
@@ -2,9 +2,7 @@

 <TITLE>Mesa Extensions</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Mesa Extensions</H1>

--- a/docs/faq.html
+++ b/docs/faq.html
@@ -2,14 +2,12 @@

 <head><title>Mesa FAQ</title></head>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">


 <center>
 <h1>Mesa Frequently Asked Questions</h1>
-Last updated: 17 November 2004
+Last updated: 27 April 2004
 </center>

 <br>
@@ -55,7 +53,7 @@ the 3Dfx Glide/Voodoo driver, an old S3 driver, etc) but the DRI drivers
 are the modern ones.
 </p>

-<h2>1.3 What purpose does Mesa serve today?</h2>
+<h2>1.3 What purpose does Mesa (software-based rendering) serve today?</h2>
 <p>
 Hardware-accelerated OpenGL implementations are available for most popular
 operating systems today.
@@ -82,39 +80,7 @@ Still, Mesa serves at least these purposes:
 </li>
 </ul>

-
-<h2>1.4 What's the difference between"Stand-Alone" Mesa and the DRI drivers?</h2>
-<p>
-<em>Stand-alone Mesa</em> is the original incarnation of Mesa.
-On systems running the X Window System, it does all its rendering through
-the Xlib API.
-<ul>
-<li>The GLX API is supported, but it's really just an emulation of the
-     real thing.
-<li>The GLX wire protocol is not supported and there's no OpenGL extension
-    loaded by the X server.
-<li>There is no hardware acceleration.
-<li>The OpenGL library, libGL.so, contains everything (the programming API,
-    the GLX functions and all the rendering code).
-</ul>
-</p>
-<p>
-Alternately, Mesa acts as the core for a number of OpenGL hardware drivers
-within the DRI (Direct Rendering Infrastructure):
-<ul>
-<li>The libGL.so library provides the GL and GLX API functions, a GLX
-    protocol encoder, and a device driver loader.
-<li>The device driver modules (such as r200_dri.so) contain a built-in
-    copy of the core Mesa code.
-<li>The X server loads the GLX module.
-    The GLX module decodes incoming GLX protocol and dispatches the commands
-    to a rendering module.
-    For the DRI, this module is basically a software Mesa renderer.
-</ul>
-
-
-
-<h2>1.5 How do I upgrade my DRI installation to use a new Mesa release?</h2>
+<h2>1.4 How do I upgrade my DRI installation to use a new Mesa release?</h2>
 <p>
 You don't!  A copy of the Mesa source code lives inside the XFree86/DRI source
 tree and gets compiled into the individual DRI driver modules.
@@ -134,7 +100,7 @@ if there's newer drivers.
 </p>


-<h2>1.6 Are there other open-source implementations of OpenGL?</h2>
+<h2>1.5 Are there other open-source implementations of OpenGL?</h2>
 <p>
 Yes, SGI's <a href="http://oss.sgi.com/projects/ogl-sample/index.html"
 target="_parent">
@@ -169,13 +135,12 @@ but it does export the OpenGL API.  It allows tiled rendering, sort-last
 rendering, etc.
 </p>

+
 <p>
 There may be other open OpenGL implementations, but Mesa is the most
 popular and feature-complete.
 </p>

-
-
 <br>
 <br>

@@ -191,24 +156,38 @@ has Mesa packages (like RPM or DEB) which you can easily install.
 </a></p>


-<h2><a name="part2">2.2 Running <code>configure; make</code> doesn't Work</a></h2>
+<h2><a name="part2">2.2 Running <code>configure; make</code> Doesn't Work</a></h2>
 <p>
-Mesa no longer supports GNU autoconf/automake.  Why?
-<ul>
-<li>It seemed to seldom work on anything but Linux
-<li>The config files were hard to maintain and hard to understand
-<li>libtool caused a lot of grief
-</ul>
-
+<a name="part2">Unfortunately, the GNU autoconf/automake/libtool system doesn't seem to work
+too well on non GNU/Linux systems, even after installing gmake, gcc, etc.
+For that reason, Mesa's <b>old-style</b> makefile system is still included.
+The old-style system uses good old traditional Makefiles.  Try the following:
+</a></p><pre><a name="part2">  cd Mesa-x.y.z
+  cp Makefile.X11 Makefile
+  make
+</a></pre>
+<a name="part2">You'll see a list of system configurations from which to choose.
+For example:
+</a><pre><a name="part2">  make linux-x86
+</a></pre>
 <p>
-Now, Mesa again uses a conventional Makefile system (as it did originally).
-Basically, each Makefile in the tree includes one of the configuration
-files from the config/ directory.
-The config files specify all the variables for a variety of popular systems.
-</p>
+<a name="part2">If you're experienced with GNU autoconf/automake/libtool and think you can help
+with maintence, contact the Mesa developers.
+FYI, the Mesa developers generally don't use the autoconf/automake system.
+We're especially annoyed with the fact that a +5000-line script (libtool)
+is needed to make shared libraries (ugh).
+</a></p>
+
+<h2><a name="part2">2.3 Mesa still doesn't compile</a></h2>
+<p>
+<a name="part2">If the old-style Makefile system doesn't work either, make sure you have
+the most recent version of Mesa.
+Otherwise, file a bug report or post to the Mesa3d-users mailing list.
+Give as much info as possible when describing your problem.
+</a></p>


-<h2><a name="part2">2.3 I get undefined symbols such as bgnpolygon, v3f, etc...</a></h2>
+<h2><a name="part2">2.4 I get undefined symbols such as bgnpolygon, v3f, etc...</a></h2>
 <p>
 <a name="part2">You're application is written in IRIS GL, not OpenGL.
 IRIS GL was the predecessor to OpenGL and is a different thing (almost)
@@ -217,7 +196,7 @@ Mesa's not the solution.
 </a></p>


-<h2><a name="part2">2.4 Where is the GLUT library?</a></h2>
+<h2><a name="part2">2.5 Where is the GLUT library?</a></h2>
 <p>
 <a name="part2">GLUT (OpenGL Utility Toolkit) is in the separate MesaDemos-x.y.z.tar.gz file.
 If you don't already have GLUT installed, you should grab the MesaDemos
@@ -226,7 +205,7 @@ package and unpack it before compiling Mesa.



-<h2><a name="part2">2.5 What's the proper place for the libraries and headers?</a></h2>
+<h2><a name="part2">2.6 What's the proper place for the libraries and headers?</a></h2>
 <p>
 <a name="part2">On Linux-based systems you'll want to follow the
 </a><a href="http://oss.sgi.com/projects/ogl-sample/ABI/index.html"
--- a/docs/fbdev-dri.html
+++ b/docs/fbdev-dri.html
@@ -2,9 +2,7 @@

 <TITLE>Mesa fbdev/DRI Environment</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <center><H1>Mesa fbdev/DRI Drivers</H1></center>

--- a/docs/games.html
+++ b/docs/games.html
@@ -2,9 +2,7 @@

 <TITLE>Games</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Games</H1>

--- a/docs/glfbdev-driver.html
+++ b/docs/glfbdev-driver.html
@@ -2,9 +2,7 @@

 <TITLE>Mesa glFBDev Driver</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <center><H1>Mesa glFBDev Driver</H1></center>

--- a/docs/glu.html
+++ b/docs/glu.html
@@ -2,9 +2,7 @@

 <TITLE>SGI GLU</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>SGI SI GLU</H1>

--- a/docs/helpwanted.html
+++ b/docs/helpwanted.html
@@ -2,71 +2,59 @@

 <TITLE>Help Wanted</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Help Wanted</H1>

 <p>
-We can always use more help with the Mesa project.
-Here are some specific ideas and areas where help would be appreciated:
+We can always use more help with the Mesa project.  Here are some
+specific areas.  If you think you can help out, post to the mesa3d-dev
+mailing list.
 </p>

-<ol>
-<li><p>
-    Generate the src/mesa/main/enums.c file with a Python script which
-    uses the gl_API.xml file.
-    </p>
-<li><p>
-    Try to auto-generate the display list "save" functions seen in dlist.c
-    using a Python script and the gl_API.xml file.
-    The gl_API.xml file will probably need a new tag to indicate whether or
-    not each function gets compiled into display lists.
-    </p>
-<li><p>
-    Maintenance of assembly language files on Linux, Windows and SPARC systems.
-    </p>
-<li><p>
-    Help to incorporate the 3Dlabs' shading language compiler for OpenGL 2.0.
-    </p>
-<li><p>
-    Implement assembly language (SSE/MMX) code generation for
-    vertex/fragment programs.
-    </p>
-<li><p>
-    Windows 98/NT driver building, maintenance and testing
-    (Karl Schultz has been doing a great job of this lately).
-    </p>
-<li><p>
-    Maintenance and testing of various drivers, such as DOS/DJGPP, GGI, etc.
-    </p>
-<li><p>
-    Write new tests for Glean.
-    </p>
-</ol>
+<ul>
+<li>Windows 98/NT build/driver maintenance and testing (Karl Schultz has been
+    doing a great job of this lately)
+<li>DOS/DJGPP build/driver maintenance and testing
+<li>GGI driver/build maintenance and testing
+<li>GNU autoconfig/libtool maintenance (esp. on non-Linux systems)
+<li>x86, SSE, 3DNow! and SPARC assembly language programming
+<li>Implement WGL font functions in the WGL interface code
+<li>Implement off-screen bitmap rendering support in the WGL interface code
+<li>Help with writing/testing the new NV_fragment_program extension code
+<li>Implement the ARB_vertex/fragment extensions
+<li>Download/compile/test Mesa and report any bugs found
+</ul>


 <p>
 If you want to help with Mesa, first join the Mesa developer's
-mailing list.
-Then post a message to propose what you want to do, just to make sure
-there's no issues.
+mailing list.  Then post a message explaining what you might like
+to help with.  The Mesa web page has a list of a few work items
+which you may consider.
 </p>

 </p>
-Anyone is welcome to contribute code to the Mesa project.
-By doing so, it's assumed that you agree to the code's licensing terms.
+Anyone is welcome to contribute code to the Mesa project, provided you
+agree to the copyright terms of the relevant code.  See the COPYRIGHT
+file.
 </p>

 <p>
-Finally:
-<p>
+Unfortunately, all the easy work in Mesa was done years ago.  Nowadays, the
+work is rather complicated and not suited to beginners.
+</p>

+<p>
+If you're contribution code to the Mesa library itself:
+<p>
 <ol>
-<li>Try to write high-quality code that follows the existing style.
-<li>Use uniform indentation, write comments, use meaningful identifiers, etc.
-<li>Test your code thoroughly.  Include test programs if appropriate.
+<li>Try to write clean code (uniform indentation, comments, meaningful
+      identifiers, etc).  It must be readable and maintainable!
+
+<li>Test your code.  On several occations I've incorporated code from
+      users which later turned out to have bugs.  Now, I'm pretty hesitant
+      to use code which doesn't look good.
 </ol>


--- a/docs/index.html
+++ b/docs/index.html
@@ -13,7 +13,10 @@

 <noframes>

-<body>
+<BODY>
+
+<P>
+
 </body>

 </noframes>
--- a/docs/install.html
+++ b/docs/install.html
@@ -2,9 +2,7 @@

 <TITLE>Compilation and Installation</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">


 <H1>Compilation and Installation</H1>
--- a/docs/intro.html
+++ b/docs/intro.html
@@ -2,9 +2,7 @@

 <TITLE>Mesa Introduction</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff">

 <H1>Introduction</H1>

--- a/docs/libraries.html
+++ b/docs/libraries.html
@@ -2,9 +2,7 @@

 <TITLE>Libraries and Toolkits</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Libraries and Toolkits</H1>

@@ -38,7 +36,7 @@ Open SG PLUS</a> - a scene-graph library
 </a> - a scene-graph library
 <li><a href="http://www.openvrml.org/" target="_parent">OpenVRML</a>
 - a VRML parsing/display library with "lookat" - an example VRML browser
-<li><a href="http://plib.sourceforge.net/" target="_parent">PLIB</a> - A collection of portable games libraries, including an OpenGL GUI and a simple Scene Graph API
+<li><a href="http://www.woodsoup.org/projs/plib" target="_parent">PLIB</a> - A collection of portable games libraries, including an OpenGL GUI and a simple Scene Graph API
 <li><a href="ftp://ftp.troll.no/contest/Pryan-1.2.tar.gz" target="_parent">Pryan</a> - an OpenInventor-like toolkit
 <li><a href="http://starship.python.net:9673/crew/da/Code/PyOpenGL" target="_parent">PyOpenGL</a> - OpenGL interface for Python
 <li><a href="http://www.quesa.org/" target="_parent">Quesa</a> - QuickDraw3D-compatible library based on OpenGL, Mesa or Direct3D
--- a/docs/license.html
+++ b/docs/license.html
@@ -2,9 +2,7 @@

 <TITLE>License / Cppyright Information</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>License / Copyright Information</H1>

--- a/docs/lists.html
+++ b/docs/lists.html
@@ -2,9 +2,7 @@

 <TITLE>Mesa Mailing Lists</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Mailing Lists</H1>

--- a/docs/mangling.html
+++ b/docs/mangling.html
@@ -2,9 +2,7 @@

 <TITLE>Function Name Mangling</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Function Name Mangling</H1>

--- a/docs/mesa.css
+++ b/docs/mesa.css
@@ -1,35 +0,0 @@
-/* Mesa CSS */
-body {
-	background-color: #55bbff;
-	font: 14px 'Lucida Grande', Geneva, Arial, Verdana, sans-serif;
-	color: black;
- 	link: #111188;
-}
-
-h1 {
-	background-color: #55bbff;
-	font: 24px 'Lucida Grande', Geneva, Arial, Verdana, sans-serif;
-	font-weight: bold;
-	color: black;
-}
-
-h2 {
-	background-color: #55bbff;
-	font: 18px 'Lucida Grande', Geneva, Arial, Verdana, sans-serif, bold;
-	font-weight: bold;
-	color: black;
-}
-
-code {
-	font-family: monospace;
-	font-size: 10pt;
-	color: black;
-}
-
-
-pre {
-	/*font-family: monospace;*/
-	font-size: 10pt;
-	/*color: black;*/
-}
-
--- a/docs/modelers.html
+++ b/docs/modelers.html
@@ -2,9 +2,7 @@

 <TITLE>Modelers, Renderers and Viewers</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Modelers, Renderers and Viewers</H1>

--- a/docs/news.html
+++ b/docs/news.html
@@ -2,85 +2,11 @@

 <TITLE>Mesa News</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff">

 <H1>News</H1>


-<h2>December 9, 2004</h2>
-<p>
-Mesa 6.2.1 has been released.
-This is a stable release which just fixes bugs since the 6.2 release.
-</p>
-<pre>
-    Bug fixes:
-	- don't apply regular fog or color sum when using a fragment program
-	- glProgramEnvParameter4fARB always generated an error on
-	  GL_FRAGMENT_PROGRAM_ARB (fdo bug 1645)
-	- glVertexAttrib3svNV and glVertexAttrib3svARB were broken
-	- fixed width/height mix-up in glSeparableFilter2D()
-	- fixed regression in glCopyPixels + convolution
-	- glReadPixels from a clipped front color buffer didn't always work
-	- glTexImage didn't accept GL_RED/GREEN/BLUE as the format
-	- Attempting queries/accesses of VBO 0 weren't detected as errors
-	- paletted textures failed if the palette had fewer that 256 entries
-    Changes:
-	- fixed a bunch of compiler warnings found with gcc 3.4
-	- bug reports should to go bugzilla.freedesktop.org
-</pre>
-<p>
-The MD5 checksums are:
-</p>
-<pre>
-80008a92f6e055d3bfdde2cf331ec3fa  MesaLib-6.2.1.tar.gz
-f43228cd2bf70f583ef3275c1c545421  MesaLib-6.2.1.tar.bz2
-dec26cfd40116ad021020fea2d94f652  MesaLib-6.2.1.zip
-2c7af3c986a7571c8713c8bfee7e49e3  MesaDemos-6.2.1.tar.gz
-3cac74667b50bcbd4f67f594fb4224a2  MesaDemos-6.2.1.tar.bz2
-75b3edd12eb2b370caf05f29b99e508a  MesaDemos-6.2.1.zip
-</pre>
-
-
-<h2>October 2, 2004</h2>
-<p>
-Mesa 6.2 has been released.
-This is a stable release which just fixes bugs since the 6.1 release.
-</p>
-<pre>
-    New:
-	- enabled GL_ARB_texture_rectangle (same as GL_NV_texture_rectangle)
-	- updated Doxygen support (Jose Fonseca)
-    Changes:
-	- some GGI driver updates (Christoph Egger, bug 1025977)
-    Bug fixes:
-	- Omit GL_ARB_texture_non_power_of_two from list of OpenGL 1.5 features
-	- fixed a few compilation issues on IRIX
-	- fixed a matrix classification bug (reported by Wes Bethel)
-	- we weren't reseting the vertex/fragment program error state
-	  before parsing (Dave Reveman)
-	- adjust texcoords for sampling texture rectangles (Dave Reveman)
-	- glGet*(GL_MAX_VERTEX_ATTRIBS_ARB) wasn't implemented
-	- repeated calls to glDeleteTexture(t) could lead to a crash
-	- fixed potential ref count bugs in VBOs and vertex/fragment programs
-	- spriteblast demo didn't handle window size changes correctly
-	- glTexSubImage didn't handle pixels=NULL correctly for PBOs
-	- fixed color index mode glDrawPixels bug (Karl Schultz)
-</pre>
-<p>
-The MD5 checksums are:
-</p>
-<pre>
-9e8f34b059272dbb8e1f2c968b33bbf0  MesaLib-6.2.tar.gz
-3d6a6362390b6a37d3cb2e615f3ac7db  MesaLib-6.2.tar.bz2
-6cfd7895d28e695c0dbbed9469564091  MesaLib-6.2.zip
-3e06e33b0809f09855cb60883b8bdfef  MesaDemos-6.2.tar.gz
-9d160009c3dfdb35fe7e4088c9ba8f85  MesaDemos-6.2.tar.bz2
-856f7ec947122eb3c8985ebc2f654dcd  MesaDemos-6.2.zip
-</pre>
-
-
 <h2>August 18, 2004</h2>
 <p>
 Mesa 6.1 has been released.
@@ -960,6 +886,6 @@ source code</a>.</p>


 <hr>
-$Id: news.html,v 3.17 2005/01/20 03:55:10 brianp Exp $
+$Id: news.html,v 3.14 2004/08/18 22:41:09 brianp Exp $
 </body>
 </html>
--- a/docs/osmesa.html
+++ b/docs/osmesa.html
@@ -2,9 +2,7 @@

 <TITLE>Off-screen Rendering</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Off-screen Rendering</H1>

--- a/docs/pbuffers.html
+++ b/docs/pbuffers.html
@@ -2,9 +2,7 @@

 <TITLE>PBuffer Rendering</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>PBuffer Rendering</H1>

@@ -12,7 +10,6 @@
 Basically, FBconfigs and PBuffers allow you to do off-screen rendering
 with OpenGL.  The OSMesa interface does basically the same thing, but
 fbconfigs and pbuffers are supported by more vendors.
-PBuffer rendering may also be hardware accelerated.
 </p>

 <p>
--- a/docs/perf.html
+++ b/docs/perf.html
@@ -2,9 +2,7 @@

 <TITLE>Performance Tips</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Performance Tips</H1>

--- a/docs/precompiled.html
+++ b/docs/precompiled.html
@@ -2,9 +2,7 @@

 <TITLE>Precompiled libraries</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Precompiled Libraries</H1>

--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -2,9 +2,7 @@

 <TITLE>Mesa Release Notes</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Release Notes</H1>

@@ -13,8 +11,6 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>

 <UL>
-<LI><A HREF="RELNOTES-6.3">RELNOTES-6.3</A>
-<LI><A HREF="RELNOTES-6.2.1">RELNOTES-6.2.1</A>
 <LI><A HREF="RELNOTES-6.2">RELNOTES-6.2</A>
 <LI><A HREF="RELNOTES-6.1">RELNOTES-6.1</A>
 <LI><A HREF="RELNOTES-6.0">RELNOTES-6.0</A>
--- a/docs/science.html
+++ b/docs/science.html
@@ -2,9 +2,7 @@

 <TITLE>Science and Technical</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Science and Technical</H1>

--- a/docs/sourcedocs.html
+++ b/docs/sourcedocs.html
@@ -2,9 +2,7 @@

 <TITLE>Source Code Documentation</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Source Code Documentation</H1>

--- a/docs/subset.html
+++ b/docs/subset.html
@@ -2,9 +2,7 @@

 <TITLE>Mesa Subset</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Mesa Subset</H1>

--- a/docs/systems.html
+++ b/docs/systems.html
@@ -2,9 +2,7 @@

 <TITLE>Supported Systems and Drivers</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Supported Systems and Drivers</H1>

--- a/docs/thanks.html
+++ b/docs/thanks.html
@@ -4,9 +4,7 @@
 <TITLE>Acknowledgements</TITLE>
 </HEAD>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Acknowledgments</H1>

--- a/docs/utilities.html
+++ b/docs/utilities.html
@@ -2,9 +2,7 @@

 <TITLE>Development Utilities</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Development Utilities</H1>

--- a/docs/utility.html
+++ b/docs/utility.html
@@ -2,15 +2,13 @@

 <TITLE>Utilities</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">

 <H1>Utilities</H1>

 <ul>
-<li><a href="http://fsv.sourceforge.net/"
-	target="_parent">fsv</a> - 3D file system visualizer
+<li><a href="http://fox.mit.edu/skunk/soft/fsv/"
+	target="_parent">fvs</a> - 3D file system visualizer

 <li><a href="http://www.dgp.utoronto.ca/%7Emac/projects/glbiff.html"
 	target="_parent">glbiff</a> - GL version of xbiff
--- a/docs/webmaster.html
+++ b/docs/webmaster.html
@@ -2,9 +2,7 @@

 <TITLE>Mesa Introduction</TITLE>

-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<BODY>
+<BODY text="#000000" bgcolor="#55bbff">

 <H1>Webmaster</font></H1>

--- a/include/GL/directfbgl.h
+++ b/include/GL/directfbgl.h
@@ -1,89 +0,0 @@
-/*
-   (c) Copyright 2001  convergence integrated media GmbH.
-   All rights reserved.
-
-   Written by Denis Oliver Kropp <dok@convergence.de> and
-              Andreas Hundt <andi@convergence.de>.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __DIRECTFBGL_H__
-#define __DIRECTFBGL_H__
-
-#include <directfb.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-
-typedef struct {
-     int        buffer_size;
-     int        depth_size;
-     int        stencil_size;
-     int        aux_buffers;
-    
-     int        red_size;
-     int        green_size;
-     int        blue_size;
-     int        alpha_size;
-
-     int        accum_red_size;
-     int        accum_green_size;
-     int        accum_blue_size;
-     int        accum_alpha_size;
-
-     DFBBoolean double_buffer;
-     DFBBoolean stereo;
-} DFBGLAttributes;
-
-
-DEFINE_INTERFACE(   IDirectFBGL,
-
-   /** Context handling **/
-
-     /*
-      * Acquire the hardware lock.
-      */
-     DFBResult (*Lock) (
-          IDirectFBGL              *thiz
-     );
-
-     /*
-      * Release the lock.
-      */
-     DFBResult (*Unlock) (
-          IDirectFBGL              *thiz
-     );
-
-     /*
-      * Query the OpenGL attributes.
-      */
-     DFBResult (*GetAttributes) (
-          IDirectFBGL              *thiz,
-          DFBGLAttributes          *attributes
-     );
-)
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
--- a/include/GL/dmesa.h
+++ b/include/GL/dmesa.h
@@ -23,9 +23,9 @@
 */

 /*
- * DOS/DJGPP device driver v1.7 for Mesa
+ * DOS/DJGPP device driver v1.6 for Mesa
 *
- *  Copyright (C) 2002 - Daniel Borca
+ *  Copyright (C) 2002 - Borca Daniel
 *  Email : dborca@users.sourceforge.net
 *  Web   : http://www.geocities.com/dborca
 */
@@ -35,7 +35,7 @@
 #define DMESA_H_included

 #define DMESA_MAJOR_VERSION 6
-#define DMESA_MINOR_VERSION 3
+#define DMESA_MINOR_VERSION 1

 /* Sample Usage:
 *
@@ -138,8 +138,7 @@ void DMesaSetCI (int ndx, GLfloat red, GLfloat green, GLfloat blue);
 /*
 * DMesa functions
 */
-typedef void (*DMesaProc) (void);
-DMesaProc DMesaGetProcAddress (const char *name);
+void *DMesaGetProcAddress (const char *name);

 /*
 * DMesa state retrieval.
--- a/include/GL/fxmesa.h
+++ b/include/GL/fxmesa.h
@@ -38,8 +38,8 @@ extern "C" {
 #endif


-#define FXMESA_MAJOR_VERSION 6
-#define FXMESA_MINOR_VERSION 3
+#define FXMESA_MAJOR_VERSION 5
+#define FXMESA_MINOR_VERSION 0


 /*
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,6 +1,6 @@
 /*
 * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.2
 *
 * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
 *
@@ -38,6 +38,8 @@
 */
 #if !defined(__SCITECH_SNAP__)

+#include <stddef.h>     /* to get ptrdiff_t, used below */
+
 #if defined(__BEOS__)
 #include <stdlib.h>     /* to get some BeOS-isms */
 #endif
@@ -51,9 +53,9 @@
 #endif

 #if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
-#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
+#  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
 #    define GLAPI __declspec(dllexport)
-#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#  elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
 #    define GLAPI __declspec(dllimport)
 #  else /* for use with static link lib build of Win32 edition only */
 #    define GLAPI extern
@@ -62,10 +64,11 @@
 #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
 #  define GLAPI extern
 #  define GLAPIENTRY __stdcall
-#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
-#  define GLAPI __attribute__((visibility("default")))
+#else
+/* non-Windows compilation */
+#  define GLAPI extern
 #  define GLAPIENTRY
-#endif /* WIN32 && !CYGWIN */
+#endif /* WIN32 / CYGWIN bracket */

 #if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
 #  define PRAGMA_EXPORT_SUPPORTED		1
@@ -92,22 +95,10 @@
 #pragma import on
 #endif

-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-#ifndef GLAPIENTRY
-#define GLAPIENTRY
-#endif
-
 #ifndef APIENTRY
 #define APIENTRY GLAPIENTRY
 #endif
-
-/* "P" suffix for when function returns a pointer */
-#ifndef APIENTRYP
 #define APIENTRYP APIENTRY *
-#endif

 #ifndef GLAPIENTRYP
 #define GLAPIENTRYP GLAPIENTRY *
@@ -853,7 +844,7 @@ GLAPI GLint GLAPIENTRY glRenderMode( GLenum mode );

 GLAPI GLenum GLAPIENTRY glGetError( void );

-GLAPI const GLubyte GLAPIENTRYP glGetString( GLenum name );
+GLAPI const GLubyte* GLAPIENTRY glGetString( GLenum name );

 GLAPI void GLAPIENTRY glFinish( void );

@@ -2213,11 +2204,11 @@ GLAPI void GLAPIENTRY glTracePointerRangeMESA( const GLvoid* first, const GLvoid

 typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data);

-GLAPI void GLAPIENTRY
+extern void
 glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback,
                      GLvoid *data);

-GLAPI void GLAPIENTRY
+extern void
 glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name,
                           GLfloat *v);

@@ -2235,123 +2226,6 @@ typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen
 #endif /* GL_ATI_blend_equation_separate */


-/* XXX this is temporary here! */
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object
-
-GLAPI GLboolean GLAPIENTRY
-glIsRenderbufferEXT(GLuint renderbuffer);
-
-GLAPI void GLAPIENTRY
-glBindRenderbufferEXT(GLenum target, GLuint renderbuffer);
-
-GLAPI void GLAPIENTRY
-glDeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers);
-
-GLAPI void GLAPIENTRY
-glGenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers);
-
-GLAPI void GLAPIENTRY
-glRenderbufferStorageEXT(GLenum target, GLenum internalformat,
-                             GLsizei width, GLsizei height);
-
-GLAPI void GLAPIENTRY
-glGetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params);
-
-GLAPI GLboolean GLAPIENTRY
-glIsFramebufferEXT(GLuint framebuffer);
-
-GLAPI void GLAPIENTRY
-glBindFramebufferEXT(GLenum target, GLuint framebuffer);
-
-GLAPI void GLAPIENTRY
-glDeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers);
-
-GLAPI void GLAPIENTRY
-glGenFramebuffersEXT(GLsizei n, GLuint *framebuffers);
-
-GLAPI GLenum GLAPIENTRY
-glCheckFramebufferStatusEXT(GLenum target);
-
-GLAPI void GLAPIENTRY
-glFramebufferTexture1DEXT(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture, GLint level);
-
-GLAPI void GLAPIENTRY
-glFramebufferTexture2DEXT(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture, GLint level);
-
-GLAPI void GLAPIENTRY
-glFramebufferTexture3DEXT(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture,
-                              GLint level, GLint zoffset);
-
-GLAPI void GLAPIENTRY
-glFramebufferRenderbufferEXT(GLenum target, GLenum attachment,
-                                 GLenum renderbuffertarget,
-                                 GLuint renderbuffer);
-
-GLAPI void GLAPIENTRY
-glGetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
-                                             GLenum pname, GLint *params);
-
-GLAPI void GLAPIENTRY
-glGenerateMipmapEXT(GLenum target);
-
-
-#define GL_FRAMEBUFFER_EXT                     0x8D40
-#define GL_RENDERBUFFER_EXT                    0x8D41
-#define GL_STENCIL_INDEX_EXT                   0x8D45
-#define GL_STENCIL_INDEX1_EXT                  0x8D46
-#define GL_STENCIL_INDEX4_EXT                  0x8D47
-#define GL_STENCIL_INDEX8_EXT                  0x8D48
-#define GL_STENCIL_INDEX16_EXT                 0x8D49
-#define GL_RENDERBUFFER_WIDTH_EXT              0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT             0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT    0x8D44
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT            0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT            0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT          0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT  0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT     0x8CD4
-#define GL_COLOR_ATTACHMENT0_EXT                0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT                0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT                0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT                0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT                0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT                0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT                0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT                0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT                0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT                0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT               0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT               0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT               0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT               0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT               0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT               0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT                 0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT               0x8D20
-#define GL_FRAMEBUFFER_COMPLETE_EXT                          0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT             0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT     0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT   0x8CD8
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT             0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT                0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT            0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT            0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT                       0x8CDD
-#define GL_FRAMEBUFFER_STATUS_ERROR_EXT                      0x8CDE
-#define GL_FRAMEBUFFER_BINDING_EXT             0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT            0x8CA7
-#define GL_MAX_COLOR_ATTACHMENTS_EXT           0x8CDF
-#define GL_MAX_RENDERBUFFER_SIZE_EXT           0x84E8
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT   0x0506
-
-#endif /* GL_EXT_framebuffer_object */
-
-
-
 /**
 ** NOTE!!!!!  If you add new functions to this file, or update
 ** glext.h be sure to regenerate the gl_mangle.h file.  See comments
@@ -2359,7 +2233,6 @@ glGenerateMipmapEXT(GLenum target);
 **/


-
 /**********************************************************************
 * Begin system-specific stuff
 */
--- a/include/GL/gl_mangle.h
+++ b/include/GL/gl_mangle.h
@@ -30,6 +30,7 @@
 /* Internal symbols which may collide with other OpenGL implementations. */
 #define __glCoreCreateContext __mglCoreCreateContext
 #define __glCoreNopDispatch   __mglCoreNopDispatch
+#define gl__unused413 MANGLE(__unused413)

 /*REGENERATE_TO_END-----------ALL LINES BELOW HERE GET REPLACED ON REGENERATION */

@@ -50,7 +51,6 @@
 #define glArrayObjectATI		MANGLE(ArrayObjectATI)
 #define glAsyncMarkerSGIX		MANGLE(AsyncMarkerSGIX)
 #define glAttachObjectARB		MANGLE(AttachObjectARB)
-#define glAttachShader		MANGLE(AttachShader)
 #define glBeginFragmentShaderATI		MANGLE(BeginFragmentShaderATI)
 #define glBegin		MANGLE(Begin)
 #define glBeginOcclusionQueryNV		MANGLE(BeginOcclusionQueryNV)
@@ -58,7 +58,6 @@
 #define glBeginQuery		MANGLE(BeginQuery)
 #define glBeginVertexShaderEXT		MANGLE(BeginVertexShaderEXT)
 #define glBindAttribLocationARB		MANGLE(BindAttribLocationARB)
-#define glBindAttribLocation		MANGLE(BindAttribLocation)
 #define glBindBufferARB		MANGLE(BindBufferARB)
 #define glBindBuffer		MANGLE(BindBuffer)
 #define glBindFragmentShaderATI		MANGLE(BindFragmentShaderATI)
@@ -91,7 +90,6 @@
 #define glBlendEquation		MANGLE(BlendEquation)
 #define glBlendEquationSeparateATI		MANGLE(BlendEquationSeparateATI)
 #define glBlendEquationSeparateEXT		MANGLE(BlendEquationSeparateEXT)
-#define glBlendEquationSeparate		MANGLE(BlendEquationSeparate)
 #define glBlendFunc		MANGLE(BlendFunc)
 #define glBlendFuncSeparateEXT		MANGLE(BlendFuncSeparateEXT)
 #define glBlendFuncSeparateINGR		MANGLE(BlendFuncSeparateINGR)
@@ -102,7 +100,6 @@
 #define glBufferSubData		MANGLE(BufferSubData)
 #define glCallList		MANGLE(CallList)
 #define glCallLists		MANGLE(CallLists)
-#define glClampColorARB		MANGLE(ClampColorARB)
 #define glClearAccum		MANGLE(ClearAccum)
 #define glClearColor		MANGLE(ClearColor)
 #define glClearDepth		MANGLE(ClearDepth)
@@ -183,7 +180,6 @@
 #define glCombinerParameterivNV		MANGLE(CombinerParameterivNV)
 #define glCombinerStageParameterfvNV		MANGLE(CombinerStageParameterfvNV)
 #define glCompileShaderARB		MANGLE(CompileShaderARB)
-#define glCompileShader		MANGLE(CompileShader)
 #define glCompressedTexImage1DARB		MANGLE(CompressedTexImage1DARB)
 #define glCompressedTexImage1D		MANGLE(CompressedTexImage1D)
 #define glCompressedTexImage2DARB		MANGLE(CompressedTexImage2DARB)
@@ -227,9 +223,7 @@
 #define glCopyTexSubImage2D		MANGLE(CopyTexSubImage2D)
 #define glCopyTexSubImage3DEXT		MANGLE(CopyTexSubImage3DEXT)
 #define glCopyTexSubImage3D		MANGLE(CopyTexSubImage3D)
-#define glCreateProgram		MANGLE(CreateProgram)
 #define glCreateProgramObjectARB		MANGLE(CreateProgramObjectARB)
-#define glCreateShader		MANGLE(CreateShader)
 #define glCreateShaderObjectARB		MANGLE(CreateShaderObjectARB)
 #define glCullFace		MANGLE(CullFace)
 #define glCullParameterdvEXT		MANGLE(CullParameterdvEXT)
@@ -247,12 +241,10 @@
 #define glDeleteLists		MANGLE(DeleteLists)
 #define glDeleteObjectARB		MANGLE(DeleteObjectARB)
 #define glDeleteOcclusionQueriesNV		MANGLE(DeleteOcclusionQueriesNV)
-#define glDeleteProgram		MANGLE(DeleteProgram)
 #define glDeleteProgramsARB		MANGLE(DeleteProgramsARB)
 #define glDeleteProgramsNV		MANGLE(DeleteProgramsNV)
 #define glDeleteQueriesARB		MANGLE(DeleteQueriesARB)
 #define glDeleteQueries		MANGLE(DeleteQueries)
-#define glDeleteShader		MANGLE(DeleteShader)
 #define glDeleteTexturesEXT		MANGLE(DeleteTexturesEXT)
 #define glDeleteTextures		MANGLE(DeleteTextures)
 #define glDeleteVertexArraysAPPLE		MANGLE(DeleteVertexArraysAPPLE)
@@ -262,20 +254,16 @@
 #define glDepthMask		MANGLE(DepthMask)
 #define glDepthRange		MANGLE(DepthRange)
 #define glDetachObjectARB		MANGLE(DetachObjectARB)
-#define glDetachShader		MANGLE(DetachShader)
 #define glDetailTexFuncSGIS		MANGLE(DetailTexFuncSGIS)
 #define glDisableClientState		MANGLE(DisableClientState)
 #define glDisable		MANGLE(Disable)
 #define glDisableTraceMESA		MANGLE(DisableTraceMESA)
 #define glDisableVariantClientStateEXT		MANGLE(DisableVariantClientStateEXT)
 #define glDisableVertexAttribArrayARB		MANGLE(DisableVertexAttribArrayARB)
-#define glDisableVertexAttribArray		MANGLE(DisableVertexAttribArray)
 #define glDrawArraysEXT		MANGLE(DrawArraysEXT)
 #define glDrawArrays		MANGLE(DrawArrays)
 #define glDrawBuffer		MANGLE(DrawBuffer)
-#define glDrawBuffersARB		MANGLE(DrawBuffersARB)
 #define glDrawBuffersATI		MANGLE(DrawBuffersATI)
-#define glDrawBuffers		MANGLE(DrawBuffers)
 #define glDrawElementArrayAPPLE		MANGLE(DrawElementArrayAPPLE)
 #define glDrawElementArrayATI		MANGLE(DrawElementArrayATI)
 #define glDrawElements		MANGLE(DrawElements)
@@ -297,7 +285,6 @@
 #define glEnableTraceMESA		MANGLE(EnableTraceMESA)
 #define glEnableVariantClientStateEXT		MANGLE(EnableVariantClientStateEXT)
 #define glEnableVertexAttribArrayARB		MANGLE(EnableVertexAttribArrayARB)
-#define glEnableVertexAttribArray		MANGLE(EnableVertexAttribArray)
 #define glEndFragmentShaderATI		MANGLE(EndFragmentShaderATI)
 #define glEndList		MANGLE(EndList)
 #define glEnd		MANGLE(End)
@@ -387,15 +374,11 @@
 #define glGenVertexArraysAPPLE		MANGLE(GenVertexArraysAPPLE)
 #define glGenVertexShadersEXT		MANGLE(GenVertexShadersEXT)
 #define glGetActiveAttribARB		MANGLE(GetActiveAttribARB)
-#define glGetActiveAttrib		MANGLE(GetActiveAttrib)
 #define glGetActiveUniformARB		MANGLE(GetActiveUniformARB)
-#define glGetActiveUniform		MANGLE(GetActiveUniform)
 #define glGetArrayObjectfvATI		MANGLE(GetArrayObjectfvATI)
 #define glGetArrayObjectivATI		MANGLE(GetArrayObjectivATI)
 #define glGetAttachedObjectsARB		MANGLE(GetAttachedObjectsARB)
-#define glGetAttachedShaders		MANGLE(GetAttachedShaders)
 #define glGetAttribLocationARB		MANGLE(GetAttribLocationARB)
-#define glGetAttribLocation		MANGLE(GetAttribLocation)
 #define glGetBooleanv		MANGLE(GetBooleanv)
 #define glGetBufferParameterivARB		MANGLE(GetBufferParameterivARB)
 #define glGetBufferParameteriv		MANGLE(GetBufferParameteriv)
@@ -492,9 +475,7 @@
 #define glGetPolygonStipple		MANGLE(GetPolygonStipple)
 #define glGetProgramEnvParameterdvARB		MANGLE(GetProgramEnvParameterdvARB)
 #define glGetProgramEnvParameterfvARB		MANGLE(GetProgramEnvParameterfvARB)
-#define glGetProgramInfoLog		MANGLE(GetProgramInfoLog)
 #define glGetProgramivARB		MANGLE(GetProgramivARB)
-#define glGetProgramiv		MANGLE(GetProgramiv)
 #define glGetProgramivNV		MANGLE(GetProgramivNV)
 #define glGetProgramLocalParameterdvARB		MANGLE(GetProgramLocalParameterdvARB)
 #define glGetProgramLocalParameterfvARB		MANGLE(GetProgramLocalParameterfvARB)
@@ -512,10 +493,7 @@
 #define glGetQueryObjectuiv		MANGLE(GetQueryObjectuiv)
 #define glGetSeparableFilterEXT		MANGLE(GetSeparableFilterEXT)
 #define glGetSeparableFilter		MANGLE(GetSeparableFilter)
-#define glGetShaderInfoLog		MANGLE(GetShaderInfoLog)
-#define glGetShaderiv		MANGLE(GetShaderiv)
 #define glGetShaderSourceARB		MANGLE(GetShaderSourceARB)
-#define glGetShaderSource		MANGLE(GetShaderSource)
 #define glGetSharpenTexFuncSGIS		MANGLE(GetSharpenTexFuncSGIS)
 #define glGetString		MANGLE(GetString)
 #define glGetTexBumpParameterfvATI		MANGLE(GetTexBumpParameterfvATI)
@@ -533,11 +511,8 @@
 #define glGetTexParameteriv		MANGLE(GetTexParameteriv)
 #define glGetTrackMatrixivNV		MANGLE(GetTrackMatrixivNV)
 #define glGetUniformfvARB		MANGLE(GetUniformfvARB)
-#define glGetUniformfv		MANGLE(GetUniformfv)
 #define glGetUniformivARB		MANGLE(GetUniformivARB)
-#define glGetUniformiv		MANGLE(GetUniformiv)
 #define glGetUniformLocationARB		MANGLE(GetUniformLocationARB)
-#define glGetUniformLocation		MANGLE(GetUniformLocation)
 #define glGetVariantArrayObjectfvATI		MANGLE(GetVariantArrayObjectfvATI)
 #define glGetVariantArrayObjectivATI		MANGLE(GetVariantArrayObjectivATI)
 #define glGetVariantBooleanvEXT		MANGLE(GetVariantBooleanvEXT)
@@ -547,16 +522,12 @@
 #define glGetVertexAttribArrayObjectfvATI		MANGLE(GetVertexAttribArrayObjectfvATI)
 #define glGetVertexAttribArrayObjectivATI		MANGLE(GetVertexAttribArrayObjectivATI)
 #define glGetVertexAttribdvARB		MANGLE(GetVertexAttribdvARB)
-#define glGetVertexAttribdv		MANGLE(GetVertexAttribdv)
 #define glGetVertexAttribdvNV		MANGLE(GetVertexAttribdvNV)
 #define glGetVertexAttribfvARB		MANGLE(GetVertexAttribfvARB)
-#define glGetVertexAttribfv		MANGLE(GetVertexAttribfv)
 #define glGetVertexAttribfvNV		MANGLE(GetVertexAttribfvNV)
 #define glGetVertexAttribivARB		MANGLE(GetVertexAttribivARB)
-#define glGetVertexAttribiv		MANGLE(GetVertexAttribiv)
 #define glGetVertexAttribivNV		MANGLE(GetVertexAttribivNV)
 #define glGetVertexAttribPointervARB		MANGLE(GetVertexAttribPointervARB)
-#define glGetVertexAttribPointerv		MANGLE(GetVertexAttribPointerv)
 #define glGetVertexAttribPointervNV		MANGLE(GetVertexAttribPointervNV)
 #define glGlobalAlphaFactorbSUN		MANGLE(GlobalAlphaFactorbSUN)
 #define glGlobalAlphaFactordSUN		MANGLE(GlobalAlphaFactordSUN)
@@ -605,11 +576,9 @@
 #define glIsObjectBufferATI		MANGLE(IsObjectBufferATI)
 #define glIsOcclusionQueryNV		MANGLE(IsOcclusionQueryNV)
 #define glIsProgramARB		MANGLE(IsProgramARB)
-#define glIsProgram		MANGLE(IsProgram)
 #define glIsProgramNV		MANGLE(IsProgramNV)
 #define glIsQueryARB		MANGLE(IsQueryARB)
 #define glIsQuery		MANGLE(IsQuery)
-#define glIsShader		MANGLE(IsShader)
 #define glIsTextureEXT		MANGLE(IsTextureEXT)
 #define glIsTexture		MANGLE(IsTexture)
 #define glIsVariantEnabledEXT		MANGLE(IsVariantEnabledEXT)
@@ -626,7 +595,6 @@
 #define glLineStipple		MANGLE(LineStipple)
 #define glLineWidth		MANGLE(LineWidth)
 #define glLinkProgramARB		MANGLE(LinkProgramARB)
-#define glLinkProgram		MANGLE(LinkProgram)
 #define glListBase		MANGLE(ListBase)
 #define glListParameterfSGIX		MANGLE(ListParameterfSGIX)
 #define glListParameterfvSGIX		MANGLE(ListParameterfvSGIX)
@@ -987,7 +955,6 @@
 #define glShaderOp2EXT		MANGLE(ShaderOp2EXT)
 #define glShaderOp3EXT		MANGLE(ShaderOp3EXT)
 #define glShaderSourceARB		MANGLE(ShaderSourceARB)
-#define glShaderSource		MANGLE(ShaderSource)
 #define glSharpenTexFuncSGIS		MANGLE(SharpenTexFuncSGIS)
 #define glSpriteParameterfSGIX		MANGLE(SpriteParameterfSGIX)
 #define glSpriteParameterfvSGIX		MANGLE(SpriteParameterfvSGIX)
@@ -996,12 +963,9 @@
 #define glStartInstrumentsSGIX		MANGLE(StartInstrumentsSGIX)
 #define glStencilFunc		MANGLE(StencilFunc)
 #define glStencilFuncSeparateATI		MANGLE(StencilFuncSeparateATI)
-#define glStencilFuncSeparate		MANGLE(StencilFuncSeparate)
 #define glStencilMask		MANGLE(StencilMask)
-#define glStencilMaskSeparate		MANGLE(StencilMaskSeparate)
 #define glStencilOp		MANGLE(StencilOp)
 #define glStencilOpSeparateATI		MANGLE(StencilOpSeparateATI)
-#define glStencilOpSeparate		MANGLE(StencilOpSeparate)
 #define glStopInstrumentsSGIX		MANGLE(StopInstrumentsSGIX)
 #define glSwizzleEXT		MANGLE(SwizzleEXT)
 #define glTagSampleBufferSGIX		MANGLE(TagSampleBufferSGIX)
@@ -1121,52 +1085,31 @@
 #define glTranslated		MANGLE(Translated)
 #define glTranslatef		MANGLE(Translatef)
 #define glUniform1fARB		MANGLE(Uniform1fARB)
-#define glUniform1f		MANGLE(Uniform1f)
 #define glUniform1fvARB		MANGLE(Uniform1fvARB)
-#define glUniform1fv		MANGLE(Uniform1fv)
 #define glUniform1iARB		MANGLE(Uniform1iARB)
-#define glUniform1i		MANGLE(Uniform1i)
 #define glUniform1ivARB		MANGLE(Uniform1ivARB)
-#define glUniform1iv		MANGLE(Uniform1iv)
 #define glUniform2fARB		MANGLE(Uniform2fARB)
-#define glUniform2f		MANGLE(Uniform2f)
 #define glUniform2fvARB		MANGLE(Uniform2fvARB)
-#define glUniform2fv		MANGLE(Uniform2fv)
 #define glUniform2iARB		MANGLE(Uniform2iARB)
-#define glUniform2i		MANGLE(Uniform2i)
 #define glUniform2ivARB		MANGLE(Uniform2ivARB)
-#define glUniform2iv		MANGLE(Uniform2iv)
 #define glUniform3fARB		MANGLE(Uniform3fARB)
-#define glUniform3f		MANGLE(Uniform3f)
 #define glUniform3fvARB		MANGLE(Uniform3fvARB)
-#define glUniform3fv		MANGLE(Uniform3fv)
 #define glUniform3iARB		MANGLE(Uniform3iARB)
-#define glUniform3i		MANGLE(Uniform3i)
 #define glUniform3ivARB		MANGLE(Uniform3ivARB)
-#define glUniform3iv		MANGLE(Uniform3iv)
 #define glUniform4fARB		MANGLE(Uniform4fARB)
-#define glUniform4f		MANGLE(Uniform4f)
 #define glUniform4fvARB		MANGLE(Uniform4fvARB)
-#define glUniform4fv		MANGLE(Uniform4fv)
 #define glUniform4iARB		MANGLE(Uniform4iARB)
-#define glUniform4i		MANGLE(Uniform4i)
 #define glUniform4ivARB		MANGLE(Uniform4ivARB)
-#define glUniform4iv		MANGLE(Uniform4iv)
 #define glUniformMatrix2fvARB		MANGLE(UniformMatrix2fvARB)
-#define glUniformMatrix2fv		MANGLE(UniformMatrix2fv)
 #define glUniformMatrix3fvARB		MANGLE(UniformMatrix3fvARB)
-#define glUniformMatrix3fv		MANGLE(UniformMatrix3fv)
 #define glUniformMatrix4fvARB		MANGLE(UniformMatrix4fvARB)
-#define glUniformMatrix4fv		MANGLE(UniformMatrix4fv)
 #define glUnlockArraysEXT		MANGLE(UnlockArraysEXT)
 #define glUnmapBufferARB		MANGLE(UnmapBufferARB)
 #define glUnmapBuffer		MANGLE(UnmapBuffer)
 #define glUnmapObjectBufferATI		MANGLE(UnmapObjectBufferATI)
 #define glUpdateObjectBufferATI		MANGLE(UpdateObjectBufferATI)
-#define glUseProgram		MANGLE(UseProgram)
 #define glUseProgramObjectARB		MANGLE(UseProgramObjectARB)
 #define glValidateProgramARB		MANGLE(ValidateProgramARB)
-#define glValidateProgram		MANGLE(ValidateProgram)
 #define glVariantArrayObjectATI		MANGLE(VariantArrayObjectATI)
 #define glVariantbvEXT		MANGLE(VariantbvEXT)
 #define glVariantdvEXT		MANGLE(VariantdvEXT)
@@ -1211,114 +1154,77 @@
 #define glVertexArrayRangeAPPLE		MANGLE(VertexArrayRangeAPPLE)
 #define glVertexArrayRangeNV		MANGLE(VertexArrayRangeNV)
 #define glVertexAttrib1dARB		MANGLE(VertexAttrib1dARB)
-#define glVertexAttrib1d		MANGLE(VertexAttrib1d)
 #define glVertexAttrib1dNV		MANGLE(VertexAttrib1dNV)
 #define glVertexAttrib1dvARB		MANGLE(VertexAttrib1dvARB)
-#define glVertexAttrib1dv		MANGLE(VertexAttrib1dv)
 #define glVertexAttrib1dvNV		MANGLE(VertexAttrib1dvNV)
 #define glVertexAttrib1fARB		MANGLE(VertexAttrib1fARB)
-#define glVertexAttrib1f		MANGLE(VertexAttrib1f)
 #define glVertexAttrib1fNV		MANGLE(VertexAttrib1fNV)
 #define glVertexAttrib1fvARB		MANGLE(VertexAttrib1fvARB)
-#define glVertexAttrib1fv		MANGLE(VertexAttrib1fv)
 #define glVertexAttrib1fvNV		MANGLE(VertexAttrib1fvNV)
 #define glVertexAttrib1hNV		MANGLE(VertexAttrib1hNV)
 #define glVertexAttrib1hvNV		MANGLE(VertexAttrib1hvNV)
 #define glVertexAttrib1sARB		MANGLE(VertexAttrib1sARB)
-#define glVertexAttrib1s		MANGLE(VertexAttrib1s)
 #define glVertexAttrib1sNV		MANGLE(VertexAttrib1sNV)
 #define glVertexAttrib1svARB		MANGLE(VertexAttrib1svARB)
-#define glVertexAttrib1sv		MANGLE(VertexAttrib1sv)
 #define glVertexAttrib1svNV		MANGLE(VertexAttrib1svNV)
 #define glVertexAttrib2dARB		MANGLE(VertexAttrib2dARB)
-#define glVertexAttrib2d		MANGLE(VertexAttrib2d)
 #define glVertexAttrib2dNV		MANGLE(VertexAttrib2dNV)
 #define glVertexAttrib2dvARB		MANGLE(VertexAttrib2dvARB)
-#define glVertexAttrib2dv		MANGLE(VertexAttrib2dv)
 #define glVertexAttrib2dvNV		MANGLE(VertexAttrib2dvNV)
 #define glVertexAttrib2fARB		MANGLE(VertexAttrib2fARB)
-#define glVertexAttrib2f		MANGLE(VertexAttrib2f)
 #define glVertexAttrib2fNV		MANGLE(VertexAttrib2fNV)
 #define glVertexAttrib2fvARB		MANGLE(VertexAttrib2fvARB)
-#define glVertexAttrib2fv		MANGLE(VertexAttrib2fv)
 #define glVertexAttrib2fvNV		MANGLE(VertexAttrib2fvNV)
 #define glVertexAttrib2hNV		MANGLE(VertexAttrib2hNV)
 #define glVertexAttrib2hvNV		MANGLE(VertexAttrib2hvNV)
 #define glVertexAttrib2sARB		MANGLE(VertexAttrib2sARB)
-#define glVertexAttrib2s		MANGLE(VertexAttrib2s)
 #define glVertexAttrib2sNV		MANGLE(VertexAttrib2sNV)
 #define glVertexAttrib2svARB		MANGLE(VertexAttrib2svARB)
-#define glVertexAttrib2sv		MANGLE(VertexAttrib2sv)
 #define glVertexAttrib2svNV		MANGLE(VertexAttrib2svNV)
 #define glVertexAttrib3dARB		MANGLE(VertexAttrib3dARB)
-#define glVertexAttrib3d		MANGLE(VertexAttrib3d)
 #define glVertexAttrib3dNV		MANGLE(VertexAttrib3dNV)
 #define glVertexAttrib3dvARB		MANGLE(VertexAttrib3dvARB)
-#define glVertexAttrib3dv		MANGLE(VertexAttrib3dv)
 #define glVertexAttrib3dvNV		MANGLE(VertexAttrib3dvNV)
 #define glVertexAttrib3fARB		MANGLE(VertexAttrib3fARB)
-#define glVertexAttrib3f		MANGLE(VertexAttrib3f)
 #define glVertexAttrib3fNV		MANGLE(VertexAttrib3fNV)
 #define glVertexAttrib3fvARB		MANGLE(VertexAttrib3fvARB)
-#define glVertexAttrib3fv		MANGLE(VertexAttrib3fv)
 #define glVertexAttrib3fvNV		MANGLE(VertexAttrib3fvNV)
 #define glVertexAttrib3hNV		MANGLE(VertexAttrib3hNV)
 #define glVertexAttrib3hvNV		MANGLE(VertexAttrib3hvNV)
 #define glVertexAttrib3sARB		MANGLE(VertexAttrib3sARB)
-#define glVertexAttrib3s		MANGLE(VertexAttrib3s)
 #define glVertexAttrib3sNV		MANGLE(VertexAttrib3sNV)
 #define glVertexAttrib3svARB		MANGLE(VertexAttrib3svARB)
-#define glVertexAttrib3sv		MANGLE(VertexAttrib3sv)
 #define glVertexAttrib3svNV		MANGLE(VertexAttrib3svNV)
 #define glVertexAttrib4bvARB		MANGLE(VertexAttrib4bvARB)
-#define glVertexAttrib4bv		MANGLE(VertexAttrib4bv)
 #define glVertexAttrib4dARB		MANGLE(VertexAttrib4dARB)
-#define glVertexAttrib4d		MANGLE(VertexAttrib4d)
 #define glVertexAttrib4dNV		MANGLE(VertexAttrib4dNV)
 #define glVertexAttrib4dvARB		MANGLE(VertexAttrib4dvARB)
-#define glVertexAttrib4dv		MANGLE(VertexAttrib4dv)
 #define glVertexAttrib4dvNV		MANGLE(VertexAttrib4dvNV)
 #define glVertexAttrib4fARB		MANGLE(VertexAttrib4fARB)
-#define glVertexAttrib4f		MANGLE(VertexAttrib4f)
 #define glVertexAttrib4fNV		MANGLE(VertexAttrib4fNV)
 #define glVertexAttrib4fvARB		MANGLE(VertexAttrib4fvARB)
-#define glVertexAttrib4fv		MANGLE(VertexAttrib4fv)
 #define glVertexAttrib4fvNV		MANGLE(VertexAttrib4fvNV)
 #define glVertexAttrib4hNV		MANGLE(VertexAttrib4hNV)
 #define glVertexAttrib4hvNV		MANGLE(VertexAttrib4hvNV)
 #define glVertexAttrib4ivARB		MANGLE(VertexAttrib4ivARB)
-#define glVertexAttrib4iv		MANGLE(VertexAttrib4iv)
 #define glVertexAttrib4NbvARB		MANGLE(VertexAttrib4NbvARB)
-#define glVertexAttrib4Nbv		MANGLE(VertexAttrib4Nbv)
 #define glVertexAttrib4NivARB		MANGLE(VertexAttrib4NivARB)
-#define glVertexAttrib4Niv		MANGLE(VertexAttrib4Niv)
 #define glVertexAttrib4NsvARB		MANGLE(VertexAttrib4NsvARB)
-#define glVertexAttrib4Nsv		MANGLE(VertexAttrib4Nsv)
 #define glVertexAttrib4NubARB		MANGLE(VertexAttrib4NubARB)
-#define glVertexAttrib4Nub		MANGLE(VertexAttrib4Nub)
 #define glVertexAttrib4NubvARB		MANGLE(VertexAttrib4NubvARB)
-#define glVertexAttrib4Nubv		MANGLE(VertexAttrib4Nubv)
 #define glVertexAttrib4NuivARB		MANGLE(VertexAttrib4NuivARB)
-#define glVertexAttrib4Nuiv		MANGLE(VertexAttrib4Nuiv)
 #define glVertexAttrib4NusvARB		MANGLE(VertexAttrib4NusvARB)
-#define glVertexAttrib4Nusv		MANGLE(VertexAttrib4Nusv)
 #define glVertexAttrib4sARB		MANGLE(VertexAttrib4sARB)
-#define glVertexAttrib4s		MANGLE(VertexAttrib4s)
 #define glVertexAttrib4sNV		MANGLE(VertexAttrib4sNV)
 #define glVertexAttrib4svARB		MANGLE(VertexAttrib4svARB)
-#define glVertexAttrib4sv		MANGLE(VertexAttrib4sv)
 #define glVertexAttrib4svNV		MANGLE(VertexAttrib4svNV)
 #define glVertexAttrib4ubNV		MANGLE(VertexAttrib4ubNV)
 #define glVertexAttrib4ubvARB		MANGLE(VertexAttrib4ubvARB)
-#define glVertexAttrib4ubv		MANGLE(VertexAttrib4ubv)
 #define glVertexAttrib4ubvNV		MANGLE(VertexAttrib4ubvNV)
 #define glVertexAttrib4uivARB		MANGLE(VertexAttrib4uivARB)
-#define glVertexAttrib4uiv		MANGLE(VertexAttrib4uiv)
 #define glVertexAttrib4usvARB		MANGLE(VertexAttrib4usvARB)
-#define glVertexAttrib4usv		MANGLE(VertexAttrib4usv)
 #define glVertexAttribArrayObjectATI		MANGLE(VertexAttribArrayObjectATI)
 #define glVertexAttribPointerARB		MANGLE(VertexAttribPointerARB)
-#define glVertexAttribPointer		MANGLE(VertexAttribPointer)
 #define glVertexAttribPointerNV		MANGLE(VertexAttribPointerNV)
 #define glVertexAttribs1dvNV		MANGLE(VertexAttribs1dvNV)
 #define glVertexAttribs1fvNV		MANGLE(VertexAttribs1fvNV)
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -52,9 +52,9 @@ extern "C" {
 /*************************************************************/

 /* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2005/01/20 */
+/* glext.h last updated 2004/7/26 */
 /* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */
-#define GL_GLEXT_VERSION 26
+#define GL_GLEXT_VERSION 24

 #ifndef GL_VERSION_1_2
 #define GL_UNSIGNED_BYTE_3_3_2            0x8032
@@ -372,93 +372,6 @@ extern "C" {
 #define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
 #endif

-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             GL_BLEND_EQUATION
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_POINT_SPRITE                   0x8861
-#define GL_COORD_REPLACE                  0x8862
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_COORDS             0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
 #ifndef GL_ARB_multitexture
 #define GL_TEXTURE0_ARB                   0x84C0
 #define GL_TEXTURE1_ARB                   0x84C1
@@ -912,48 +825,6 @@ extern "C" {
 #define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
 #endif

-#ifndef GL_ARB_color_buffer_float
-#define GL_RGBA_FLOAT_MODE_ARB            0x8820
-#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
-#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
-#define GL_CLAMP_READ_COLOR_ARB           0x891C
-#define GL_FIXED_ONLY_ARB                 0x891D
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB                 0x140B
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
-#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
-#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
-#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
-#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
-#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
-#define GL_RGBA32F_ARB                    0x8814
-#define GL_RGB32F_ARB                     0x8815
-#define GL_ALPHA32F_ARB                   0x8816
-#define GL_INTENSITY32F_ARB               0x8817
-#define GL_LUMINANCE32F_ARB               0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
-#define GL_RGBA16F_ARB                    0x881A
-#define GL_RGB16F_ARB                     0x881B
-#define GL_ALPHA16F_ARB                   0x881C
-#define GL_INTENSITY16F_ARB               0x881D
-#define GL_LUMINANCE16F_ARB               0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
-#endif
-
 #ifndef GL_EXT_abgr
 #define GL_ABGR_EXT                       0x8000
 #endif
@@ -2922,11 +2793,6 @@ extern "C" {
 #ifndef GL_ATI_vertex_attrib_array_object
 #endif

-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-#endif
-
 #ifndef GL_EXT_depth_bounds_test
 #define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
 #define GL_DEPTH_BOUNDS_EXT               0x8891
@@ -2984,11 +2850,6 @@ extern "C" {
 /*************************************************************/

 #include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;			/* native character */
-#endif
-
 #ifndef GL_VERSION_1_5
 /* GL types for handling large vertex buffer objects */
 typedef ptrdiff_t GLintptr;
@@ -3002,17 +2863,13 @@ typedef ptrdiff_t GLsizeiptrARB;
 #endif

 #ifndef GL_ARB_shader_objects
-/* GL types for handling shader object handles and program/shader text */
+/* GL types for handling shader object handles and characters */
 typedef char GLcharARB;		/* native character */
 typedef unsigned int GLhandleARB;	/* shader object handle */
 #endif

-/* GL types for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
 #ifndef GL_NV_half_float
+/* GL type for representing NVIDIA "half" floating point type in host memory */
 typedef unsigned short GLhalfNV;
 #endif

@@ -3336,198 +3193,6 @@ typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pn
 typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
 #endif

-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
-GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
-GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
-GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
-GLAPI void APIENTRY glCompileShader (GLuint);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum);
-GLAPI void APIENTRY glDeleteProgram (GLuint);
-GLAPI void APIENTRY glDeleteShader (GLuint);
-GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint);
-GLAPI GLboolean APIENTRY glIsShader (GLuint);
-GLAPI void APIENTRY glLinkProgram (GLuint);
-GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
-GLAPI void APIENTRY glUseProgram (GLuint);
-GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1i (GLint, GLint);
-GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glValidateProgram (GLuint);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
 #ifndef GL_ARB_multitexture
 #define GL_ARB_multitexture 1
 #ifdef GL_GLEXT_PROTOTYPES
@@ -4087,26 +3752,6 @@ typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs)
 #define GL_ARB_texture_rectangle 1
 #endif

-#ifndef GL_ARB_color_buffer_float
-#define GL_ARB_color_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClampColorARB (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_ARB_pixel_buffer_object 1
-#endif
-
 #ifndef GL_EXT_abgr
 #define GL_EXT_abgr 1
 #endif
@@ -6329,10 +5974,6 @@ typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index,
 typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
 #endif

-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
 #ifndef GL_EXT_depth_bounds_test
 #define GL_EXT_depth_bounds_test 1
 #ifdef GL_GLEXT_PROTOTYPES
--- a/include/GL/glut.h
+++ b/include/GL/glut.h
@@ -75,7 +75,7 @@ extern "C" {
   To avoid the atexit workaround, #define GLUT_DISABLE_ATEXIT_HACK. */

 /* XXX This is from Win32's <process.h> */
-# if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__cdecl)
+# if !defined(_MSC_VER) && !defined(__cdecl)
   /* Define __cdecl for non-Microsoft compilers. */
 #  define __cdecl
 #  define GLUT_DEFINED___CDECL
@@ -108,7 +108,7 @@ extern _CRTIMP void __cdecl exit(int);
   and redifinition of Windows system defs, also removes requirement of
   pretty much any standard windows header from this file */

-#if (_MSC_VER >= 800) || defined(__MINGW32__) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__)
+#if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__)
 #	define GLUTAPIENTRY __stdcall
 #else
 #	define GLUTAPIENTRY
@@ -193,11 +193,13 @@ WGLAPI int   GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);
 #else /* _WIN32 not defined */

 /* Define GLUTAPIENTRY and GLUTCALLBACK to nothing if we aren't on Win32. */
-#  define GLUTAPIENTRY GLAPIENTRY
+#  define GLUTAPIENTRY
 #  define GLUTAPIENTRYV
+#  define GLUT_APIENTRY_DEFINED
 #  define GLUTCALLBACK
 #  define GLUTAPI extern
-
+/* Prototype exit for the non-Win32 case (see above). */
+/*extern void exit(int);  this screws up gcc -ansi -pedantic! */
 #endif


@@ -662,8 +664,7 @@ GLUTAPI int GLUTAPIENTRY glutGetModifiers(void);
 GLUTAPI int GLUTAPIENTRY glutLayerGet(GLenum type);
 #endif
 #if (GLUT_API_VERSION >= 5)
-typedef void (*GLUTproc)();
-GLUTAPI GLUTproc GLUTAPIENTRY glutGetProcAddress(const char *procName);
+GLUTAPI void * GLUTAPIENTRY glutGetProcAddress(const char *procName);
 #endif

 /* GLUT font sub-API */
@@ -745,4 +746,26 @@ GLUTAPI int GLUTAPIENTRY glutGameModeGet(GLenum mode);
 }
 #endif

+#if 0
+#ifdef GLUT_APIENTRY_DEFINED
+# undef GLUT_APIENTRY_DEFINED
+# undef APIENTRY
+#endif
+
+#ifdef GLUT_WINGDIAPI_DEFINED
+# undef GLUT_WINGDIAPI_DEFINED
+# undef WINGDIAPI
+#endif
+
+#ifdef GLUT_DEFINED___CDECL
+# undef GLUT_DEFINED___CDECL
+# undef __cdecl
+#endif
+
+#ifdef GLUT_DEFINED__CRTIMP
+# undef GLUT_DEFINED__CRTIMP
+# undef _CRTIMP
+#endif
+#endif
+
 #endif                  /* __glut_h__ */
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -1,8 +1,8 @@
 /*
 * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.2
 * 
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  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"),
@@ -482,21 +482,6 @@ typedef GLuint (* PFNGLXGETAGPOFFSETMESAPROC) (const GLvoid *pointer);
 #endif /* GLX_MESA_agp_offset */


-/*
- * ???. GLX_MESA_allocate_memory
- */ 
-#ifndef GLX_MESA_allocate_memory
-#define GLX_MESA_allocate_memory 1
-
-extern void *glXAllocateMemoryMESA(Display *dpy, int scrn, size_t size, float readfreq, float writefreq, float priority);
-extern void glXFreeMemoryMESA(Display *dpy, int scrn, void *pointer);
-extern GLuint glXGetMemoryOffsetMESA(Display *dpy, int scrn, const void *pointer);
-typedef void * ( * PFNGLXALLOCATEMEMORYMESAPROC) (Display *dpy, int scrn, size_t size, float readfreq, float writefreq, float priority);
-typedef void ( * PFNGLXFREEMEMORYMESAPROC) (Display *dpy, int scrn, void *pointer);
-typedef GLuint (* PFNGLXGETMEMORYOFFSETMESAPROC) (Display *dpy, int scrn, const void *pointer);
-
-#endif /* GLX_MESA_allocate_memory */
-
 /*
 * ARB ?. GLX_ARB_render_texture
 */
@@ -510,39 +495,6 @@ extern Bool glXDrawableAttribARB(Display *dpy, GLXDrawable draw, const int *attr
 #endif /* GLX_ARB_render_texture */


-/*
- * Remove this when glxext.h is updated.
- */
-#ifndef GLX_NV_float_buffer
-#define GLX_NV_float_buffer 1
-
-#define GLX_FLOAT_COMPONENTS_NV         0x20B0
-
-#endif /* GLX_NV_float_buffer */
-
-
-/*** Should these go here, or in another header? */
-/*
-** GLX Events
-*/
-typedef struct {
-    int event_type;		/* GLX_DAMAGED or GLX_SAVED */
-    int draw_type;		/* GLX_WINDOW or GLX_PBUFFER */
-    unsigned long serial;	/* # of last request processed by server */
-    Bool send_event;		/* true if this came for SendEvent request */
-    Display *display;		/* display the event was read from */
-    GLXDrawable drawable;	/* XID of Drawable */
-    unsigned int buffer_mask;	/* mask indicating which buffers are affected */
-    unsigned int aux_buffer;	/* which aux buffer was affected */
-    int x, y;
-    int width, height;
-    int count;			/* if nonzero, at least this many more */
-} GLXPbufferClobberEvent;
-
-typedef union __GLXEvent {
-    GLXPbufferClobberEvent glxpbufferclobber;
-    long pad[24];
-} GLXEvent;

 #ifdef __cplusplus
 }
--- a/include/GL/glxext.h
+++ b/include/GL/glxext.h
@@ -331,15 +331,6 @@ typedef struct {
 } GLXBufferClobberEventSGIX;
 #endif

-#if defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-#elif defined( __VMS )
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#endif
-
 #ifndef GLX_VERSION_1_3
 #define GLX_VERSION_1_3 1
 #ifdef GLX_GLXEXT_PROTOTYPES
@@ -606,6 +597,11 @@ typedef Bool ( * PFNGLXSET3DFXMODEMESAPROC) (int mode);

 #ifndef GLX_OML_sync_control
 #define GLX_OML_sync_control 1
+#if defined(__STDC_VERSION__)
+#if __STDC_VERSION__ >= 199901L
+/* Include ISO C99 integer types for OML_sync_control; need a better test */
+#include <inttypes.h>
+
 #ifdef GLX_GLXEXT_PROTOTYPES
 extern Bool glXGetSyncValuesOML (Display *, GLXDrawable, int64_t *, int64_t *, int64_t *);
 extern Bool glXGetMscRateOML (Display *, GLXDrawable, int32_t *, int32_t *);
@@ -618,6 +614,8 @@ typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, i
 typedef int64_t ( * PFNGLXSWAPBUFFERSMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
 typedef Bool ( * PFNGLXWAITFORMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc);
 typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_sbc, int64_t *ust, int64_t *msc, int64_t *sbc);
+#endif /* C99 version test */
+#endif /* STDC test */
 #endif

 #ifndef GLX_SGIX_hyperpipe_group
@@ -675,6 +673,7 @@ extern unsigned int glXGetAGPOffsetMESA (const void *);
 typedef unsigned int ( * PFNGLXGETAGPOFFSETMESAPROC) (const void *pointer);
 #endif

+
 #ifdef __cplusplus
 }
 #endif
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -149,8 +149,6 @@ typedef GLboolean (* PFNGLXGETDRAWABLEINFOPROC) ( __DRInativeDisplay *dpy, int s
    int * backX, int * backY,
    int * numBackClipRects, drm_clip_rect_t ** pBackClipRects );

-/* Test for the xf86dri.h header file */
-#ifndef _XF86DRI_H_
 extern GLboolean XF86DRIDestroyContext( __DRInativeDisplay *dpy, int screen,
    __DRIid context_id );

@@ -159,7 +157,6 @@ extern GLboolean XF86DRICreateDrawable( __DRInativeDisplay *dpy, int screen,

 extern GLboolean XF86DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen, 
    __DRIid drawable);
-#endif
 /*@}*/


--- a/include/GL/internal/sarea.h
+++ b/include/GL/internal/sarea.h
@@ -1,94 +0,0 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */
-/**
- * \file sarea.h 
- * SAREA definitions.
- * 
- * \author Kevin E. Martin <kevin@precisioninsight.com>
- * \author Jens Owen <jens@tungstengraphics.com>
- * \author Rickard E. (Rik) Faith <faith@valinux.com>
- */
-
-/*
- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc.
- * 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"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN 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/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */
-
-#ifndef _SAREA_H_
-#define _SAREA_H_
-
-#include "xf86drm.h"
-
-/* SAREA area needs to be at least a page */
-#if defined(__alpha__)
-#define SAREA_MAX 			0x2000
-#elif defined(__ia64__)
-#define SAREA_MAX			0x10000		/* 64kB */
-#else
-/* Intel 830M driver needs at least 8k SAREA */
-#define SAREA_MAX			0x2000
-#endif
-
-#define SAREA_MAX_DRAWABLES 		256
-
-#define SAREA_DRAWABLE_CLAIMED_ENTRY	0x80000000
-
-/**
- * SAREA per drawable information.
- *
- * \sa _XF86DRISAREA.
- */
-typedef struct _XF86DRISAREADrawable {
-    unsigned int	stamp;
-    unsigned int	flags;
-} XF86DRISAREADrawableRec, *XF86DRISAREADrawablePtr;
-
-/**
- * SAREA frame information.
- *
- * \sa  _XF86DRISAREA.
- */
-typedef struct _XF86DRISAREAFrame {
-    unsigned int        x;
-    unsigned int        y;
-    unsigned int        width;
-    unsigned int        height;
-    unsigned int        fullscreen;
-} XF86DRISAREAFrameRec, *XF86DRISAREAFramePtr;
-
-/**
- * SAREA definition.
- */
-typedef struct _XF86DRISAREA {
-    /** first thing is always the DRM locking structure */
-    drmLock			lock;
-    /** \todo Use readers/writer lock for drawable_lock */
-    drmLock			drawable_lock;
-    XF86DRISAREADrawableRec	drawableTable[SAREA_MAX_DRAWABLES];
-    XF86DRISAREAFrameRec        frame;
-    drm_context_t			dummy_context;
-} XF86DRISAREARec, *XF86DRISAREAPtr;
-
-#endif
--- a/include/GL/mesa_wgl.h
+++ b/include/GL/mesa_wgl.h
@@ -32,7 +32,7 @@
 #define _mesa_wgl_h_


-#include <GL/gl.h>
+#include <gl/gl.h>

 #ifdef __cplusplus
 extern "C" {
@@ -40,10 +40,10 @@ extern "C" {


 #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__))
-#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
+#  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
 #    define GLAPI __declspec(dllexport)
 #    define WGLAPI __declspec(dllexport)
-#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#  elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
 #    define GLAPI __declspec(dllimport)
 #    define WGLAPI __declspec(dllimport)
 #  else /* for use with static link lib build of Win32 edition only */
--- a/include/GL/miniglx.h
+++ b/include/GL/miniglx.h
@@ -52,20 +52,14 @@ extern "C" {
 * 
 * It can have the values #True or #False.
 */
-#ifndef MINIGLX_NO_XTYPES
 typedef int Bool;
-#endif
-typedef int MINI_Bool;

 /**
 * \brief Color map.
 *
 * Alias for private ::MiniGLXColormapRec structure.
 */
-typedef struct MiniGLXColormapRec *MINI_Colormap;
-#ifndef MINIGLX_NO_XTYPES
 typedef struct MiniGLXColormapRec *Colormap;
-#endif

 /**
 * \brief Window attributes.
@@ -73,7 +67,7 @@ typedef struct MiniGLXColormapRec *Colormap;
 typedef struct MiniGLXSetWindowAttributesRec {
   int background_pixel; /**< \brief background pixel */
   int border_pixel;     /**< \brief border pixel value */
-   MINI_Colormap colormap;    /**< \brief color map to be associated with window */
+   Colormap colormap;    /**< \brief color map to be associated with window */
   int event_mask;       /**< \brief set of events that should be saved */
 } XSetWindowAttributes;

@@ -91,13 +85,10 @@ typedef struct MiniGLXVisualRec Visual;
 *
 * \sa \ref datatypes.
 */
-#ifndef MINIGLX_NO_XTYPES
-typedef unsigned long VisualID;
-#endif
-typedef unsigned long MINI_VisualID;
+typedef unsigned int VisualID;
 typedef struct MiniGLXXVisualInfoRec {
   Visual *visual;	/**< \brief pointer to the GLX Visual */
-   MINI_VisualID visualid;	/**< \brief visual ID */
+   VisualID visualid;	/**< \brief visual ID */
   int screen;		/**< \brief screen number */
   int depth;		/**< \brief bit depth */
 #if defined(__cplusplus) || defined(c_plusplus)
@@ -124,10 +115,7 @@ typedef struct MiniGLXFBConfigRec {
 *
 * \sa \ref datatypes.
 */
-#ifndef MINIGLX_NO_XTYPES
 typedef struct MiniGLXDisplayRec   Display;
-#endif
-typedef struct MiniGLXDisplayRec   MINI_Display;

 /**
 * \brief Window handle.
@@ -136,10 +124,7 @@ typedef struct MiniGLXDisplayRec   MINI_Display;
 *
 * \sa \ref datatypes.
 */
-#ifndef MINIGLX_NO_XTYPES
 typedef struct MiniGLXWindowRec   *Window;
-#endif
-typedef struct MiniGLXWindowRec   *MINI_Window;

 /**
 * \brief Drawable.
@@ -151,10 +136,7 @@ typedef struct MiniGLXWindowRec   *MINI_Window;
 *
 * \sa \ref datatypes.
 */
-#ifndef MINIGLX_NO_XTYPES
 typedef struct MiniGLXWindowRec   *Drawable;
-#endif
-typedef struct MiniGLXWindowRec   *MINI_Drawable;

 /**
 * \brief GLX drawable.
@@ -192,9 +174,9 @@ typedef struct MiniGLXContextRec  *GLXContext;
 typedef struct {
 	int type;
 	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window window;
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window window;
 	int x, y;
 	int width, height;
 	int count;		/* if non-zero, at least this many more */
@@ -203,53 +185,53 @@ typedef struct {
 typedef struct {
 	int type;
 	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window parent;		/* parent of the window */
-        MINI_Window window;		/* window id of window created */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window parent;		/* parent of the window */
+	Window window;		/* window id of window created */
 	int x, y;		/* window location */
 	int width, height;	/* size of window */
 	int border_width;	/* border width */
-	MINI_Bool override_redirect;	/* creation should be overridden */
+	Bool override_redirect;	/* creation should be overridden */
 } XCreateWindowEvent;

 typedef struct {
 	int type;
 	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window event;
-	MINI_Window window;
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window event;
+	Window window;
 } XDestroyWindowEvent;

 typedef struct {
 	int type;
 	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window event;
-	MINI_Window window;
-	MINI_Bool from_configure;
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window event;
+	Window window;
+	Bool from_configure;
 } XUnmapEvent;

 typedef struct {
 	int type;
 	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window event;
-	MINI_Window window;
-	MINI_Bool override_redirect;	/* boolean, is override set... */
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window event;
+	Window window;
+	Bool override_redirect;	/* boolean, is override set... */
 } XMapEvent;


 typedef struct {
 	int type;
 	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window parent;
-	MINI_Window window;
+	Bool send_event;	/* true if this came from a SendEvent request */
+	Display *display;	/* Display the event was read from */
+	Window parent;
+	Window window;
 } XMapRequestEvent;

 typedef union _XEvent {
@@ -281,7 +263,6 @@ typedef union _XEvent {
 #define CWColormap           (1L<<13)
 #define PseudoColor          3
 #define TrueColor            4
-#define VisualIDMask     0x1
 #define VisualScreenMask     0x2
 #define Expose		     12
 #define CreateNotify	     16
@@ -337,11 +318,11 @@ typedef union _XEvent {
 /**
 * \name Server-specific functions
 */
-extern MINI_Display *
+extern Display *
 __miniglx_StartServer( const char *display_name );

 extern int
-__miniglx_Select( MINI_Display *dpy, int maxfd,
+__miniglx_Select( Display *dpy, int maxfd,
 		  fd_set *rfds, fd_set *wfds, fd_set *xfds,
 		  struct timeval *tv );

@@ -350,25 +331,25 @@ __miniglx_Select( MINI_Display *dpy, int maxfd,
 * \name Simulated Xlib functions
 */
 /*@{*/
-extern MINI_Display *
+extern Display *
 XOpenDisplay( const char *dpy_name );


 extern void
-XCloseDisplay( MINI_Display *display );
+XCloseDisplay( Display *display );

-extern MINI_Window
-XCreateWindow( MINI_Display *display, MINI_Window parent, int x, int y,
+extern Window
+XCreateWindow( Display *display, Window parent, int x, int y,
               unsigned int width, unsigned int height,
               unsigned int border_width, int depth, unsigned int winclass,
               Visual *visual, unsigned long valuemask,
               XSetWindowAttributes *attributes );

 extern int 
-XNextEvent(MINI_Display *display, XEvent *event_return);
+XNextEvent(Display *display, XEvent *event_return);

-extern MINI_Bool 
-XCheckMaskEvent( MINI_Display *dpy, long event_mask, XEvent *event_return );
+extern Bool 
+XCheckMaskEvent( Display *dpy, long event_mask, XEvent *event_return );

 /**
 * \brief Return the root window.
@@ -384,27 +365,27 @@ XCheckMaskEvent( MINI_Display *dpy, long event_mask, XEvent *event_return );
 #define DefaultScreen(dpy)  0

 extern void
-XDestroyWindow( MINI_Display *display, MINI_Window w );
+XDestroyWindow( Display *display, Window w );

 extern void
-XMapWindow( MINI_Display *display, MINI_Window w );
+XMapWindow( Display *display, Window w );

 /* Should clients have access to this?
 */
 extern void
-XUnmapWindow( MINI_Display *display, MINI_Window w );
+XUnmapWindow( Display *display, Window w );

-extern MINI_Colormap
-XCreateColormap( MINI_Display *display, MINI_Window w, Visual *visual, int alloc );
+extern Colormap
+XCreateColormap( Display *display, Window w, Visual *visual, int alloc );

 extern void
-XFreeColormap( MINI_Display *display, MINI_Colormap cmap );
+XFreeColormap( Display *display, Colormap cmap );

 extern void
 XFree( void *data );

 extern XVisualInfo *
-XGetVisualInfo( MINI_Display *display, long vinfo_mask,
+XGetVisualInfo( Display *display, long vinfo_mask,
                XVisualInfo *vinfo_template, int *nitems_return );
 /*@}*/

@@ -415,23 +396,23 @@ XGetVisualInfo( MINI_Display *display, long vinfo_mask,
 */
 /*@{*/
 extern XVisualInfo*
-glXChooseVisual( MINI_Display *dpy, int screen, int *attribList );
+glXChooseVisual( Display *dpy, int screen, int *attribList );

 extern int
-glXGetConfig( MINI_Display *dpy, XVisualInfo *vis, int attrib, int *value );
+glXGetConfig( Display *dpy, XVisualInfo *vis, int attrib, int *value );

 extern GLXContext
-glXCreateContext( MINI_Display *dpy, XVisualInfo *vis,
-                  GLXContext shareList, MINI_Bool direct );
+glXCreateContext( Display *dpy, XVisualInfo *vis,
+                  GLXContext shareList, Bool direct );

 extern void
-glXDestroyContext( MINI_Display *dpy, GLXContext ctx );
+glXDestroyContext( Display *dpy, GLXContext ctx );

-extern MINI_Bool
-glXMakeCurrent( MINI_Display *dpy, GLXDrawable drawable, GLXContext ctx);
+extern Bool
+glXMakeCurrent( Display *dpy, GLXDrawable drawable, GLXContext ctx);

 extern void
-glXSwapBuffers( MINI_Display *dpy, GLXDrawable drawable );
+glXSwapBuffers( Display *dpy, GLXDrawable drawable );

 extern GLXContext
 glXGetCurrentContext( void );
@@ -442,35 +423,22 @@ glXGetCurrentDrawable( void );
 extern void 
 (*glXGetProcAddress(const GLubyte *procname))( void );

-extern MINI_Bool
-glXQueryVersion( MINI_Display *dpy, int *major, int *minor );
+extern Bool
+glXQueryVersion( Display *dpy, int *major, int *minor );

 /* Added in MiniGLX 1.1 */
 extern GLXPbuffer
-glXCreatePbuffer( MINI_Display *dpy, GLXFBConfig config, const int *attribList );
+glXCreatePbuffer( Display *dpy, GLXFBConfig config, const int *attribList );

 extern void
-glXDestroyPbuffer( MINI_Display *dpy, GLXPbuffer pbuf );
+glXDestroyPbuffer( Display *dpy, GLXPbuffer pbuf );

 extern GLXFBConfig *
-glXChooseFBConfig( MINI_Display *dpy, int screen, const int *attribList,
+glXChooseFBConfig( Display *dpy, int screen, const int *attribList,
                   int *nitems );

 extern XVisualInfo *
-glXGetVisualFromFBConfig( MINI_Display *dpy, GLXFBConfig config );
-
-extern void *glXAllocateMemoryMESA(Display *dpy, int scrn,
-				   size_t size, float readFreq,
-				   float writeFreq, float priority);
-
-extern void glXFreeMemoryMESA(Display *dpy, int scrn, void *pointer);
-
-extern GLuint glXGetMemoryOffsetMESA( Display *dpy, int scrn,
-				      const void *pointer );
-/*@}*/
-
-extern void
-__glXScrEnableExtension( void *, const char * name );
+glXGetVisualFromFBConfig( Display *dpy, GLXFBConfig config );

 /*@}*/

--- a/include/GL/osmesa.h
+++ b/include/GL/osmesa.h
@@ -1,8 +1,8 @@
 /*
 * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  4.1
 * 
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2002  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"),
@@ -60,8 +60,8 @@ extern "C" {
 #include <GL/gl.h>


-#define OSMESA_MAJOR_VERSION 6
-#define OSMESA_MINOR_VERSION 3
+#define OSMESA_MAJOR_VERSION 4
+#define OSMESA_MINOR_VERSION 1
 #define OSMESA_PATCH_VERSION 0


@@ -252,18 +252,12 @@ OSMesaGetColorBuffer( OSMesaContext c, GLint *width, GLint *height,



-/**
- * This typedef is new in Mesa 6.3.
- */
-typedef void (*OSMESAproc)();
-
-
 /*
 * Return pointer to the named function.
+ *
 * New in Mesa 4.1
- * Return OSMESAproc in 6.3.
 */
-GLAPI OSMESAproc GLAPIENTRY
+GLAPI void * GLAPIENTRY
 OSMesaGetProcAddress( const char *funcName );


--- a/include/GL/wmesa.h
+++ b/include/GL/wmesa.h
@@ -50,7 +50,7 @@ extern "C" {
 #endif


-#include "GL/gl.h"
+#include "gl\gl.h"

 #if defined(_MSV_VER) && !defined(__GNUC__)
 #  pragma warning (disable:4273)
--- a/include/GL/xmesa.h
+++ b/include/GL/xmesa.h
@@ -87,8 +87,8 @@ extern struct Library *XLibBase;
 #endif


-#define XMESA_MAJOR_VERSION 6
-#define XMESA_MINOR_VERSION 3
+#define XMESA_MAJOR_VERSION 4
+#define XMESA_MINOR_VERSION 1



--- a/include/GLES/egl.h
+++ b/include/GLES/egl.h
@@ -1,232 +0,0 @@
-#ifndef _EGL_H
-#define _EGL_H
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2004 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-*/
-
-#include <GL/gl.h>
-#include <GLES/egltypes.h>
-
-/* XXX should go in eglext.h */
-#define GL_OES_VERSION_1_0  1
-#define GL_OES_read_format  1
-#define GL_OES_compressed_paletted_texture 1
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-#define GL_PALETTE4_RGB8_OES        0x8B90
-#define GL_PALETTE4_RGBA8_OES       0x8B91
-#define GL_PALETTE4_R5_G6_B5_OES    0x8B92
-#define GL_PALETTE4_RGBA4_OES       0x8B93
-#define GL_PALETTE4_RGB5_A1_OES     0x8B94
-#define GL_PALETTE8_RGB8_OES        0x8B95
-#define GL_PALETTE8_RGBA8_OES       0x8B96
-#define GL_PALETTE8_R5_G6_B5_OES    0x8B97
-#define GL_PALETTE8_RGBA4_OES       0x8B98
-#define GL_PALETTE8_RGB5_A1_OES     0x8B99
-/* XXX */
-
-/*
-** Versioning and extensions
-*/
-#define EGL_VERSION_1_0		       1
-#if 0
-#define EGL_VERSION_1_1		       1
-#endif
-
-/*
-** Boolean
-*/
-#define EGL_FALSE		       0
-#define EGL_TRUE		       1
-
-/*
-** Errors
-*/
-#define EGL_SUCCESS		       0x3000
-#define EGL_NOT_INITIALIZED	       0x3001
-#define EGL_BAD_ACCESS		       0x3002
-#define EGL_BAD_ALLOC		       0x3003
-#define EGL_BAD_ATTRIBUTE	       0x3004
-#define EGL_BAD_CONFIG		       0x3005
-#define EGL_BAD_CONTEXT		       0x3006
-#define EGL_BAD_CURRENT_SURFACE        0x3007
-#define EGL_BAD_DISPLAY		       0x3008
-#define EGL_BAD_MATCH		       0x3009
-#define EGL_BAD_NATIVE_PIXMAP	       0x300A
-#define EGL_BAD_NATIVE_WINDOW	       0x300B
-#define EGL_BAD_PARAMETER	       0x300C
-#define EGL_BAD_SURFACE		       0x300D
-#define EGL_CONTEXT_LOST	       0x300E
-/* 0x300F - 0x301F reserved for additional errors. */
-
-/*
-** Config attributes
-*/
-#define EGL_BUFFER_SIZE		       0x3020
-#define EGL_ALPHA_SIZE		       0x3021
-#define EGL_BLUE_SIZE		       0x3022
-#define EGL_GREEN_SIZE		       0x3023
-#define EGL_RED_SIZE		       0x3024
-#define EGL_DEPTH_SIZE		       0x3025
-#define EGL_STENCIL_SIZE	       0x3026
-#define EGL_CONFIG_CAVEAT	       0x3027
-#define EGL_CONFIG_ID		       0x3028
-#define EGL_LEVEL		       0x3029
-#define EGL_MAX_PBUFFER_HEIGHT	       0x302A
-#define EGL_MAX_PBUFFER_PIXELS	       0x302B
-#define EGL_MAX_PBUFFER_WIDTH	       0x302C
-#define EGL_NATIVE_RENDERABLE	       0x302D
-#define EGL_NATIVE_VISUAL_ID	       0x302E
-#define EGL_NATIVE_VISUAL_TYPE	       0x302F
-/*#define EGL_PRESERVED_RESOURCES	 0x3030*/
-#define EGL_SAMPLES		       0x3031
-#define EGL_SAMPLE_BUFFERS	       0x3032
-#define EGL_SURFACE_TYPE	       0x3033
-#define EGL_TRANSPARENT_TYPE	       0x3034
-#define EGL_TRANSPARENT_BLUE_VALUE     0x3035
-#define EGL_TRANSPARENT_GREEN_VALUE    0x3036
-#define EGL_TRANSPARENT_RED_VALUE      0x3037
-#define EGL_NONE		       0x3038	/* Also a config value */
-#define EGL_BIND_TO_TEXTURE_RGB        0x3039
-#define EGL_BIND_TO_TEXTURE_RGBA       0x303A
-#define EGL_MIN_SWAP_INTERVAL	       0x303B
-#define EGL_MAX_SWAP_INTERVAL	       0x303C
-
-/*
-** Config values
-*/
-#define EGL_DONT_CARE		       ((EGLint) -1)
-
-#define EGL_SLOW_CONFIG		       0x3050	/* EGL_CONFIG_CAVEAT value */
-#define EGL_NON_CONFORMANT_CONFIG      0x3051	/* " */
-#define EGL_TRANSPARENT_RGB	       0x3052	/* EGL_TRANSPARENT_TYPE value */
-#define EGL_NO_TEXTURE		       0x305C	/* EGL_TEXTURE_FORMAT/TARGET value */
-#define EGL_TEXTURE_RGB		       0x305D	/* EGL_TEXTURE_FORMAT value */
-#define EGL_TEXTURE_RGBA	       0x305E	/* " */
-#define EGL_TEXTURE_2D		       0x305F	/* EGL_TEXTURE_TARGET value */
-
-/*
-** Config attribute mask bits
-*/
-#define EGL_PBUFFER_BIT		       0x01	/* EGL_SURFACE_TYPE mask bit */
-#define EGL_PIXMAP_BIT		       0x02	/* " */
-#define EGL_WINDOW_BIT		       0x04	/* " */
-
-/*
-** String names
-*/
-#define EGL_VENDOR		       0x3053	/* eglQueryString target */
-#define EGL_VERSION		       0x3054	/* " */
-#define EGL_EXTENSIONS		       0x3055	/* " */
-
-/*
-** Surface attributes
-*/
-#define EGL_HEIGHT		       0x3056
-#define EGL_WIDTH		       0x3057
-#define EGL_LARGEST_PBUFFER	       0x3058
-#define EGL_TEXTURE_FORMAT	       0x3080	/* For pbuffers bound as textures */
-#define EGL_TEXTURE_TARGET	       0x3081	/* " */
-#define EGL_MIPMAP_TEXTURE	       0x3082	/* " */
-#define EGL_MIPMAP_LEVEL	       0x3083	/* " */
-
-/*
-** BindTexImage / ReleaseTexImage buffer target
-*/
-#define EGL_BACK_BUFFER		       0x3084
-
-/*
-** Current surfaces
-*/
-#define EGL_DRAW		       0x3059
-#define EGL_READ		       0x305A
-
-/*
-** Engines
-*/
-#define EGL_CORE_NATIVE_ENGINE	       0x305B
-
-/* 0x305C-0x3FFFF reserved for future use */
-
-/*
-** Functions
-*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-GLAPI EGLint APIENTRY eglGetError (void);
-
-GLAPI EGLDisplay APIENTRY eglGetDisplay (NativeDisplayType display);
-GLAPI EGLBoolean APIENTRY eglInitialize (EGLDisplay dpy, EGLint *major, EGLint *minor);
-GLAPI EGLBoolean APIENTRY eglTerminate (EGLDisplay dpy);
-GLAPI const char * APIENTRY eglQueryString (EGLDisplay dpy, EGLint name);
-GLAPI void (* APIENTRY eglGetProcAddress (const char *procname))();
-
-GLAPI EGLBoolean APIENTRY eglGetConfigs (EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config);
-GLAPI EGLBoolean APIENTRY eglChooseConfig (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config);
-GLAPI EGLBoolean APIENTRY eglGetConfigAttrib (EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value);
-
-GLAPI EGLSurface APIENTRY eglCreateWindowSurface (EGLDisplay dpy, EGLConfig config, NativeWindowType window, const EGLint *attrib_list);
-GLAPI EGLSurface APIENTRY eglCreatePixmapSurface (EGLDisplay dpy, EGLConfig config, NativePixmapType pixmap, const EGLint *attrib_list);
-GLAPI EGLSurface APIENTRY eglCreatePbufferSurface (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);
-GLAPI EGLBoolean APIENTRY eglDestroySurface (EGLDisplay dpy, EGLSurface surface);
-GLAPI EGLBoolean APIENTRY eglQuerySurface (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value);
-
-/* EGL 1.1 render-to-texture APIs */
-GLAPI EGLBoolean APIENTRY eglSurfaceAttrib (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);
-GLAPI EGLBoolean APIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
-GLAPI EGLBoolean APIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
-
-/* EGL 1.1 swap control API */
-GLAPI EGLBoolean APIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval);
-
-GLAPI EGLContext APIENTRY eglCreateContext (EGLDisplay dpy, EGLConfig config, EGLContext share_list, const EGLint *attrib_list);
-GLAPI EGLBoolean APIENTRY eglDestroyContext (EGLDisplay dpy, EGLContext ctx);
-GLAPI EGLBoolean APIENTRY eglMakeCurrent (EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx);
-GLAPI EGLContext APIENTRY eglGetCurrentContext (void);
-GLAPI EGLSurface APIENTRY eglGetCurrentSurface (EGLint readdraw);
-GLAPI EGLDisplay APIENTRY eglGetCurrentDisplay (void);
-GLAPI EGLBoolean APIENTRY eglQueryContext (EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value);
-
-GLAPI EGLBoolean APIENTRY eglWaitGL (void);
-GLAPI EGLBoolean APIENTRY eglWaitNative (EGLint engine);
-GLAPI EGLBoolean APIENTRY eglSwapBuffers (EGLDisplay dpy, EGLSurface draw);
-GLAPI EGLBoolean APIENTRY eglCopyBuffers (EGLDisplay dpy, EGLSurface surface, NativePixmapType target);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _EGL_H */
--- a/include/GLES/egltypes.h
+++ b/include/GLES/egltypes.h
@@ -1,48 +0,0 @@
-/*
- * egltypes.h - EGL API compatibility
- *
- * The intention here is to support multiple EGL implementations for the
- * various backends - GLX, AGL, WGL, Solo - so we define the EGL types as
- * opaque handles.  We also define the Native types as opaque handles for
- * now, which should be fine for GLX and Solo but the others who knows.
- * They can extend this later.
- *
- * We require that 'int' be 32 bits.  Other than that this should be pretty
- * portable.
- *
- * Derived from the OpenGL|ES 1.1 egl.h on the Khronos website:
- * http://www.khronos.org/opengles/spec_headers/opengles1_1/egl.h
- *
- */
-
-#ifndef _EGLTYPES_H
-#define _EGLTYPES_H
-
-#include <sys/types.h>
-
-/*
- * Native types
- */
-typedef void    *NativeDisplayType;
-typedef void    *NativePixmapType;
-typedef void    *NativeWindowType;
-
-/*
- * Types and resources
- */
-typedef GLboolean   EGLBoolean;
-typedef GLint       EGLint;
-typedef void        *EGLDisplay;
-typedef void        *EGLConfig;
-typedef void        *EGLSurface;
-typedef void        *EGLContext;
-
-/*
- * EGL and native handle values
- */
-#define EGL_DEFAULT_DISPLAY ((NativeDisplayType)0)
-#define EGL_NO_CONTEXT      ((EGLContext)0)
-#define EGL_NO_DISPLAY      ((EGLDisplay)0)
-#define EGL_NO_SURFACE      ((EGLSurface)0)
-
-#endif /* _EGLTYPES_H */
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -7,10 +7,6 @@ INCDIR = $(TOP)/include

 OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)

-OSMESA16_LIBS = -L$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
-
-OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
-
 LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)

 PROGS = \
@@ -68,63 +64,27 @@ PROGS = \


 # make executable from .c file:
-.c: $(LIB_DEP) readtex.o
-	$(CC) -I$(INCDIR) $(CFLAGS) $< readtex.o $(APP_LIB_DEPS) -o $@
+.c: $(LIB_DEP)
+	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@


 ##### TARGETS #####

-default: readtex.o $(PROGS)
-
-
-readtex.c: $(TOP)/progs/util/readtex.c
-	cp $< .
-
-readtex.h: $(TOP)/progs/util/readtex.h
-	cp $< .
-
-readtex.o: readtex.c readtex.h
-	$(CC) -c -I$(INCDIR) $(CFLAGS) readtex.c
-
-
-showbuffer.c: $(TOP)/progs/util/showbuffer.c
-	cp $< .
-
-showbuffer.h: $(TOP)/progs/util/showbuffer.h
-	cp $< .
-
-showbuffer.o: showbuffer.c showbuffer.h
-	$(CC) -c -I$(INCDIR) $(CFLAGS) showbuffer.c
-
-
-reflect: reflect.o showbuffer.o readtex.o
-	$(CC) -I$(INCDIR) $(CFLAGS) reflect.o showbuffer.o readtex.o $(APP_LIB_DEPS) -o $@
-
-reflect.o: reflect.c showbuffer.h
-	$(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
-
-
-shadowtex: shadowtex.o showbuffer.o
-	$(CC) -I$(INCDIR) $(CFLAGS) shadowtex.o showbuffer.o $(APP_LIB_DEPS) -o $@
-
-shadowtex.o: shadowtex.c showbuffer.h
-	$(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
-
-# special case: need the -lOSMesa library:
-osdemo: osdemo.c
-	$(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
-
-# another special case: need the -lOSMesa16 library:
-osdemo16: osdemo16.c
-	$(CC) -I$(INCDIR) $(CFLAGS) osdemo16.c $(OSMESA16_LIBS) -o $@
-
-# another special case: need the -lOSMesa32 library:
-osdemo32: osdemo32.c
-	$(CC) -I$(INCDIR) $(CFLAGS) osdemo32.c $(OSMESA32_LIBS) -o $@
-
+default: readtex.c readtex.h $(PROGS)


 clean:
 	-rm -f $(PROGS)
 	-rm -f *.o *~
 	-rm -f readtex.[ch]
+
+
+readtex.c:
+	cp $(TOP)/progs/util/readtex.c .
+
+readtex.h:
+	cp $(TOP)/progs/util/readtex.h .
+
+# special case: need the -lOSMesa library:
+osdemo: osdemo.c
+	$(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
--- a/progs/demos/Windows/demos.dsw
+++ b/progs/demos/Windows/demos.dsw
@@ -134,9 +134,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name spriteblast
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -149,9 +146,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -164,9 +158,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -179,9 +170,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -194,9 +182,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -209,9 +194,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -224,9 +206,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -239,9 +218,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -254,9 +230,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -269,9 +242,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -282,21 +252,6 @@ Package=<5>
 {{{
 }}}

-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "glut"="..\..\..\src\glut\glx\glut.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
 Package=<4>
 {{{
 }}}
@@ -311,9 +266,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -326,9 +278,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -341,9 +290,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -356,9 +302,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -371,9 +314,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -386,9 +326,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -401,9 +338,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -416,9 +350,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -431,9 +362,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -446,9 +374,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -461,9 +386,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -476,9 +398,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -491,9 +410,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -506,9 +422,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -521,9 +434,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -536,9 +446,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -551,9 +458,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -566,9 +470,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -581,9 +482,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -596,9 +494,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -611,9 +506,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -626,9 +518,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -641,9 +530,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -656,9 +542,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -671,9 +554,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -686,9 +566,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -701,9 +578,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -716,9 +590,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -731,9 +602,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -746,9 +614,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
@@ -761,9 +626,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name glut
-    End Project Dependency
 }}}

 ###############################################################################
--- a/progs/demos/arbfplight.c
+++ b/progs/demos/arbfplight.c
@@ -51,20 +51,16 @@ static void Redisplay( void )
   glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );

   if (PixelLight) {
-#if defined(GL_ARB_fragment_program)
      glProgramLocalParameter4fvARB_func(GL_FRAGMENT_PROGRAM_ARB,
                                         LIGHTPOS, LightPos);
      glEnable(GL_FRAGMENT_PROGRAM_ARB);
      glEnable(GL_VERTEX_PROGRAM_ARB);
-#endif
      glDisable(GL_LIGHTING);
   }
   else {
      glLightfv(GL_LIGHT0, GL_POSITION, LightPos);
-#if defined(GL_ARB_fragment_program)
      glDisable(GL_FRAGMENT_PROGRAM_ARB);
      glDisable(GL_VERTEX_PROGRAM_ARB);
-#endif
      glEnable(GL_LIGHTING);
   }

@@ -221,7 +217,7 @@ static void Init( void )
      "MUL normal, fragment.texcoord[0], len.y; \n"

      "# Compute dot product of light direction and normal vector\n"
-      "DP3_SAT dotProd, lightDir, normal;             # limited to [0,1]\n"
+      "DP3 dotProd, lightDir, normal; \n"

      "MUL diffuseColor, Diffuse, dotProd;            # diffuse attenuation\n"

@@ -302,7 +298,6 @@ static void Init( void )
   glDeleteProgramsARB_func = (PFNGLDELETEPROGRAMSARBPROC) glutGetProcAddress("glDeleteProgramsARB");
   assert(glDeleteProgramsARB_func);

-#if defined(GL_ARB_fragment_program)
   /*
    * Fragment program
    */
@@ -354,7 +349,6 @@ static void Init( void )
      exit(0);
   }
   assert(glIsProgramARB_func(VertProg));
-#endif

   /*
    * Misc init
--- a/progs/demos/arbocclude.c
+++ b/progs/demos/arbocclude.c
@@ -115,7 +115,6 @@ static void Display( void )
   glScalef(0.3, 0.3, 1.0);
   glRotatef(-90.0 * Xpos, 0, 0, 1);

-#if defined(GL_ARB_occlusion_query)
 #if TEST_DISPLAY_LISTS
   glNewList(10, GL_COMPILE);
   glBeginQueryARB(GL_SAMPLES_PASSED_ARB, OccQuery);
@@ -153,7 +152,6 @@ static void Display( void )
   /* turn off occlusion testing */
   glColorMask(1, 1, 1, 1);
   glDepthMask(GL_TRUE);
-#endif /* GL_ARB_occlusion_query */

   /* draw the orange rect, so we can see what's going on */
   glColor3f(0.8, 0.5, 0);
@@ -175,7 +173,6 @@ static void Display( void )
   glLoadIdentity();

   glColor3f(1, 1, 1);
-#if defined(GL_ARB_occlusion_query)
   sprintf(s, " %4d Fragments Visible", passed);
   glRasterPos3f(-0.50, -0.7, 0);
   PrintString(s);
@@ -183,10 +180,6 @@ static void Display( void )
      glRasterPos3f(-0.25, -0.8, 0);
      PrintString("Fully Occluded");
   }
-#else
-   glRasterPos3f(-0.25, -0.8, 0);
-   PrintString("GL_ARB_occlusion_query not available at compile time");
-#endif /* GL_ARB_occlusion_query */

   glutSwapBuffers();
 }
@@ -245,21 +238,17 @@ static void Init( void )
      exit(-1);
   }

-#if defined(GL_ARB_occlusion_query)
   glGetQueryivARB(GL_SAMPLES_PASSED_ARB, GL_QUERY_COUNTER_BITS_ARB, &bits);
   if (!bits) {
      printf("Hmmm, GL_QUERY_COUNTER_BITS_ARB is zero!\n");
      exit(-1);
   }
-#endif /* GL_ARB_occlusion_query */

   glGetIntegerv(GL_DEPTH_BITS, &bits);
   printf("Depthbits: %d\n", bits);

-#if defined(GL_ARB_occlusion_query)
   glGenQueriesARB(1, &OccQuery);
   assert(OccQuery > 0);
-#endif /* GL_ARB_occlusion_query */

   glEnable(GL_DEPTH_TEST);
 }
--- a/progs/demos/bounce.c
+++ b/progs/demos/bounce.c
@@ -14,8 +14,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <GL/glut.h>
-#include <sys/time.h>
-#include <time.h>

 #define COS(X)   cos( (X) * 3.14159/180.0 )
 #define SIN(X)   sin( (X) * 3.14159/180.0 )
@@ -27,12 +25,12 @@
 GLboolean IndexMode = GL_FALSE;
 GLuint Ball;
 GLenum Mode;
-GLfloat Zrot = 0.0, Zstep = 180.0;
+GLfloat Zrot = 0.0, Zstep = 6.0;
 GLfloat Xpos = 0.0, Ypos = 1.0;
-GLfloat Xvel = 2.0, Yvel = 0.0;
+GLfloat Xvel = 0.2, Yvel = 0.0;
 GLfloat Xmin = -4.0, Xmax = 4.0;
 GLfloat Ymin = -3.8, Ymax = 4.0;
-GLfloat G = -9.8;
+GLfloat G = -0.1;

 static GLuint 
 make_ball(void)
@@ -151,17 +149,10 @@ static void
 idle(void)
 {
  static float vel0 = -100.0;
-  static double t0 = -1.;
-  double t, dt;
-  t = glutGet(GLUT_ELAPSED_TIME) / 1000.;
-  if (t0 < 0.)
-     t0 = t;
-  dt = t - t0;
-  t0 = t;

-  Zrot += Zstep*dt;
+  Zrot += Zstep;

-  Xpos += Xvel*dt;
+  Xpos += Xvel;
  if (Xpos >= Xmax) {
    Xpos = Xmax;
    Xvel = -Xvel;
@@ -172,8 +163,8 @@ idle(void)
    Xvel = -Xvel;
    Zstep = -Zstep;
  }
-  Ypos += Yvel*dt;
-  Yvel += G*dt;
+  Ypos += Yvel;
+  Yvel += G;
  if (Ypos < Ymin) {
    Ypos = Ymin;
    if (vel0 == -100.0)
--- a/progs/demos/cubemap.c
+++ b/progs/demos/cubemap.c
@@ -40,7 +40,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "GL/glut.h"
-#include "readtex.h"
+#include "../util/readtex.c" /* a hack */


 static GLfloat Xrot = 0, Yrot = 0;
--- a/Show More
+++ b/Show More