more updates for 6.3 release

GLUT callbacks.

Makefile

@@ -28,12 +28,13 @@ realclean:
 	-rm -f `find . -name \*.o`
 	-rm -f `find . -name \*.a`
 	-rm -f `find . -name \*.so`
+	-rm -f `find . -name depend`
 
 
 
 install:
 	@echo "Installing"
-	$(TOP)/bin/installmesa
+	$(TOP)/bin/installmesa $(DESTDIR)
 
 # DirectFBGL module installation
 linux-directfb-install:
@@ -61,6 +62,7 @@ darwin \
 darwin-static \
 freebsd \
 freebsd-dri \
+freebsd-dri-amd64 \
 freebsd-dri-x86 \
 hpux10 \
 hpux10-gcc \
@@ -87,6 +89,7 @@ linux-dri \
 linux-dri-x86 \
 linux-dri-x86-64 \
 linux-dri-ppc \
+linux-fbdev \
 linux-glide \
 linux-icc \
 linux-icc-static \
@@ -105,8 +108,11 @@ linux-ultrasparc \
 linux-tcc \
 linux-x86 \
 linux-x86-debug \
+linux-x86-32 \
 linux-x86-64 \
+linux-x86-64-debug \
 linux-x86-64-static \
+linux-x86-xcb \
 linux-x86-glide \
 linux-x86-static \
 netbsd \
@@ -135,13 +141,11 @@ LIB_FILES =	\
 	$(DIRECTORY)/Makefile*						\
 	$(DIRECTORY)/descrip.mms					\
 	$(DIRECTORY)/mms-config.					\
-	$(DIRECTORY)/Mesa.dsw						\
 	$(DIRECTORY)/bin/mklib						\
 	$(DIRECTORY)/bin/installmesa					\
 	$(DIRECTORY)/configs/[a-z]*					\
 	$(DIRECTORY)/docs/*.html					\
 	$(DIRECTORY)/docs/COPYING					\
-	$(DIRECTORY)/docs/INSTALL.GNU					\
 	$(DIRECTORY)/docs/README.*					\
 	$(DIRECTORY)/docs/RELNOTES*					\
 	$(DIRECTORY)/docs/VERSIONS					\
@@ -176,28 +180,25 @@ LIB_FILES =	\
 	$(DIRECTORY)/src/mesa/descrip.mms				\
 	$(DIRECTORY)/src/mesa/depend					\
 	$(DIRECTORY)/src/mesa/main/*.[chS]				\
-	$(DIRECTORY)/src/mesa/main/main.dsp				\
 	$(DIRECTORY)/src/mesa/main/descrip.mms				\
 	$(DIRECTORY)/src/mesa/glapi/*.[chS]				\
-	$(DIRECTORY)/src/mesa/glapi/glapi.dsp				\
 	$(DIRECTORY)/src/mesa/glapi/descrip.mms				\
 	$(DIRECTORY)/src/mesa/array_cache/*.[ch]			\
-	$(DIRECTORY)/src/mesa/array_cache/array_cache.dsp		\
 	$(DIRECTORY)/src/mesa/array_cache/descrip.mms			\
 	$(DIRECTORY)/src/mesa/math/*.[ch]				\
-	$(DIRECTORY)/src/mesa/math/math.dsp				\
 	$(DIRECTORY)/src/mesa/math/descrip.mms				\
 	$(DIRECTORY)/src/mesa/shader/*.[ch]				\
-	$(DIRECTORY)/src/mesa/shader/shader.dsp				\
 	$(DIRECTORY)/src/mesa/shader/descrip.mms			\
+	$(DIRECTORY)/src/mesa/shader/grammar/*.[ch]			\
+	$(DIRECTORY)/src/mesa/shader/grammar/descrip.mms		\
+	$(DIRECTORY)/src/mesa/shader/slang/*.[ch]			\
+	$(DIRECTORY)/src/mesa/shader/slang/descrip.mms			\
+	$(DIRECTORY)/src/mesa/shader/slang/library/*.[ch]		\
 	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\
-	$(DIRECTORY)/src/mesa/swrast/swrast.dsp				\
 	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\
 	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\
-	$(DIRECTORY)/src/mesa/swrast_setup/swrast_setup.dsp		\
 	$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms			\
 	$(DIRECTORY)/src/mesa/tnl/*.[chS]				\
-	$(DIRECTORY)/src/mesa/tnl/tnl.dsp				\
 	$(DIRECTORY)/src/mesa/tnl/descrip.mms				\
 	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\
@@ -206,13 +207,12 @@ 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/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			\
 	$(DIRECTORY)/src/mesa/drivers/glide/*.[ch]			\
-	$(DIRECTORY)/src/mesa/drivers/glide/*.def			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in		\
 	$(DIRECTORY)/src/mesa/drivers/ggi/default/*.c			\
@@ -223,26 +223,26 @@ LIB_FILES =	\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def			\
-	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.dsp			\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/svga/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\
-	$(DIRECTORY)/src/mesa/drivers/windows/*/*.dsp			\
 	$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms			\
 	$(DIRECTORY)/src/mesa/drivers/x11/*.[ch]			\
+	$(DIRECTORY)/src/mesa/ppc/*.[ch]				\
 	$(DIRECTORY)/src/mesa/sparc/*.[chS]				\
 	$(DIRECTORY)/src/mesa/x86/Makefile				\
 	$(DIRECTORY)/src/mesa/x86/*.[ch]				\
 	$(DIRECTORY)/src/mesa/x86/*.S					\
+	$(DIRECTORY)/src/mesa/x86/rtasm/*.[ch]				\
+	$(DIRECTORY)/src/mesa/x86-64/*.[chS]				\
+	$(DIRECTORY)/src/mesa/x86-64/Makefile				\
 	$(DIRECTORY)/src/glu/Makefile					\
 	$(DIRECTORY)/src/glu/descrip.mms				\
 	$(DIRECTORY)/src/glu/sgi/Makefile				\
 	$(DIRECTORY)/src/glu/sgi/Makefile.win				\
 	$(DIRECTORY)/src/glu/sgi/Makefile.DJ				\
-	$(DIRECTORY)/src/glu/sgi/cc*.txt				\
 	$(DIRECTORY)/src/glu/sgi/glu.def				\
-	$(DIRECTORY)/src/glu/sgi/glu.dsp				\
 	$(DIRECTORY)/src/glu/sgi/dummy.cc				\
 	$(DIRECTORY)/src/glu/sgi/descrip.mms				\
 	$(DIRECTORY)/src/glu/sgi/mesaglu.opt				\
@@ -274,7 +274,18 @@ LIB_FILES =	\
 	$(DIRECTORY)/progs/util/sampleMakefile				\
 	$(DIRECTORY)/vms/analyze_map.com				\
 	$(DIRECTORY)/vms/xlib.opt					\
-	$(DIRECTORY)/vms/xlib_share.opt
+	$(DIRECTORY)/vms/xlib_share.opt					\
+	$(DIRECTORY)/windows/VC6/mesa/gdi/gdi.dsp			\
+	$(DIRECTORY)/windows/VC6/mesa/glu/*.txt				\
+	$(DIRECTORY)/windows/VC6/mesa/glu/glu.dsp			\
+	$(DIRECTORY)/windows/VC6/mesa/mesa.dsw				\
+	$(DIRECTORY)/windows/VC6/mesa/mesa/mesa.dsp			\
+	$(DIRECTORY)/windows/VC6/mesa/osmesa/osmesa.dsp			\
+	$(DIRECTORY)/windows/VC7/mesa/gdi/gdi.vcproj			\
+	$(DIRECTORY)/windows/VC7/mesa/glu/glu.vcproj			\
+	$(DIRECTORY)/windows/VC7/mesa/mesa.sln				\
+	$(DIRECTORY)/windows/VC7/mesa/mesa/mesa.vcproj			\
+	$(DIRECTORY)/windows/VC7/mesa/osmesa/osmesa.vcproj
 
 
 GLUT_FILES = \
@@ -285,7 +296,6 @@ GLUT_FILES = \
 	$(DIRECTORY)/src/glut/glx/*def			\
 	$(DIRECTORY)/src/glut/glx/descrip.mms		\
 	$(DIRECTORY)/src/glut/glx/mms_depend		\
-	$(DIRECTORY)/src/glut/glx/glut.dsp		\
 	$(DIRECTORY)/src/glut/glx/*.[ch]		\
 	$(DIRECTORY)/src/glut/beos/*.[ch]		\
 	$(DIRECTORY)/src/glut/beos/*.cpp		\
@@ -308,8 +318,6 @@ DEMO_FILES = \
 	$(DIRECTORY)/progs/demos/*.cxx			\
 	$(DIRECTORY)/progs/demos/*.dat			\
 	$(DIRECTORY)/progs/demos/README			\
-	$(DIRECTORY)/progs/demos/Windows/*.dsp		\
-	$(DIRECTORY)/progs/demos/Windows/*.dsw		\
 	$(DIRECTORY)/progs/xdemos/Makefile*		\
 	$(DIRECTORY)/progs/xdemos/descrip.mms		\
 	$(DIRECTORY)/progs/xdemos/*.[chf]		\
@@ -322,7 +330,13 @@ DEMO_FILES = \
 	$(DIRECTORY)/progs/windml/Makefile.ugl		\
 	$(DIRECTORY)/progs/windml/*.c			\
 	$(DIRECTORY)/progs/windml/*.bmp			\
-	$(DIRECTORY)/progs/ggi/*.c
+	$(DIRECTORY)/progs/ggi/*.c			\
+	$(DIRECTORY)/windows/VC6/progs/demos/*.dsp	\
+	$(DIRECTORY)/windows/VC6/progs/glut/glut.dsp	\
+	$(DIRECTORY)/windows/VC6/progs/progs.dsw	\
+	$(DIRECTORY)/windows/VC7/progs/demos/*.vcproj	\
+	$(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj	\
+	$(DIRECTORY)/windows/VC7/progs/progs.sln
 
 
 DRI_FILES = \

Makefile.DJ

@@ -31,8 +31,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	CPU		optimize for the given processor.
-#			default = pentium
 #	GLU=[mesa|sgi]	specify GLU directory; can be `sgi' (requires GNU/C++)
 #			or `mesa'.
 #			default = mesa
@@ -59,12 +57,10 @@
 
 .PHONY : all libgl libglu libglut clean realclean
 
-CPU ?= pentium
-
 GLU ?= mesa
 
 CFLAGS = -Wall -W -pedantic
-CFLAGS += -O2 -ffast-math -mtune=$(CPU)
+CFLAGS += -O2 -ffast-math
 
 export CFLAGS
 

Makefile.mgw

@@ -31,8 +31,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	CPU		optimize for the given processor.
-#			default = pentium
 #	GLIDE		path to Glide3 SDK; used with FX.
 #			default = $(TOP)/glide3
 #	FX=1		build for 3dfx Glide3. Note that this disables
@@ -57,8 +55,6 @@
 
 .PHONY : all libgl clean realclean
 
-CPU ?= pentium
-
 ifeq ($(ICD),1)
   # when -std=c99 mingw will not define WIN32
   CFLAGS = -Wall -W -Werror
@@ -66,7 +62,7 @@ else
   # I love c89
   CFLAGS = -Wall -W -pedantic
 endif
-CFLAGS += -O2 -ffast-math -mtune=$(CPU)
+CFLAGS += -O2 -ffast-math
 
 export CFLAGS
 

Mesa.dsw

@@ -1,179 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "array_cache"=".\SRC\MESA\array_cache\array_cache.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "gdi"=".\src\mesa\drivers\windows\gdi\gdi.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name array_cache
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name main
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name math
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name swrast_setup
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name swrast
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name tnl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name glapi
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name shader
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "glapi"=".\SRC\MESA\glapi\glapi.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "glu"=".\src\glu\sgi\glu.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gdi
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "main"=".\SRC\MESA\main\main.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "math"=".\SRC\MESA\math\math.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "osmesa"=".\SRC\MESA\DRIVERS\osmesa\osmesa.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gdi
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "shader"=".\SRC\MESA\shader\shader.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "swrast"=".\SRC\MESA\swrast\swrast.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "swrast_setup"=".\SRC\MESA\swrast_setup\swrast_setup.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "tnl"=".\SRC\MESA\tnl\tnl.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

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,7 +33,6 @@ 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}
@@ -41,6 +40,10 @@ 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
@@ -50,8 +53,10 @@ set -v
 
 mkdir ${INCLUDE_DIR}
 mkdir ${INCLUDE_DIR}/GL
+mkdir ${INCLUDE_DIR}/GLES
 mkdir ${LIB_DIR}
 cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
+cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES
 cp -fd ${TOP}/lib*/lib* ${LIB_DIR}
 
 echo "Done."

bin/mklib

@@ -173,6 +173,15 @@ case $ARCH in
 		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
@@ -437,7 +446,7 @@ case $ARCH in
             ${LINK} ${OPTS} ${LIBNAME} ${OBJECTS}
             FINAL_LIBS=${LIBNAME}
         else
-            LIBNAME="${LIBNAME}.dylib"
+            LIBNAME="lib${LIBNAME}.dylib"
             echo "mklib: Making Darwin shared library: " ${LIBNAME}
             FLAGS="-dynamiclib -multiply_defined suppress"
 	    if [ $CPLUSPLUS = 1 ] ; then

configs/darwin

@@ -18,8 +18,12 @@ GLW_LIB_NAME = libGLw.dylib
 OSMESA_LIB_NAME = libOSMesa.dylib
 
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = $(TOP)/lib/GL.dylib
-GLU_LIB_DEPS = $(TOP)/lib/GL.dylib
-GLUT_LIB_DEPS = 
+OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
+GLU_LIB_DEPS = -L$(LIB_DIR) -lGL
+GLUT_LIB_DEPS = -L$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext
 GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
 APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+
+# omit glw lib for now:
+SRC_DIRS = mesa glu glut/glx
+

configs/default

@@ -26,6 +26,10 @@ MKDEP = makedepend
 MKDEP_OPTIONS = -fdepend
 MAKE = make
 
+# Python and flags (generally only needed by the developers)
+PYTHON2 = python
+PYTHON_FLAGS = -t -O -O
+
 # Library names (base name)
 GL_LIB = GL
 GLU_LIB = GLU
@@ -35,11 +39,11 @@ OSMESA_LIB = OSMesa
 
 
 # Library names (actual file names)
-GL_LIB_NAME = libGL.so
-GLU_LIB_NAME = libGLU.so
-GLUT_LIB_NAME = libglut.so
-GLW_LIB_NAME = libGLw.so
-OSMESA_LIB_NAME = libOSMesa.so
+GL_LIB_NAME = lib$(GL_LIB).so
+GLU_LIB_NAME = lib$(GLU_LIB).so
+GLUT_LIB_NAME = lib$(GLUT_LIB).so
+GLW_LIB_NAME = lib$(GLW_LIB).so
+OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
 
 
 # Optional assembly language optimization files for libGL
@@ -56,13 +60,15 @@ INSTALL_PREFIX = /usr/local
 SRC_DIRS = mesa glu glut/glx glw
 GLU_DIRS = sgi
 DRIVER_DIRS = x11 osmesa
+# Which subdirs under $(TOP)/progs/ to enter:
 PROGRAM_DIRS = demos redbook samples xdemos
 
 
 # Library/program dependencies
-GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
+EXTRA_LIB_PATH ?=
+GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
 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
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

configs/freebsd-dri

@@ -11,16 +11,18 @@ CXX = g++
 WARN_FLAGS = -Wall
 OPT_FLAGS = -O
 
+EXPAT_INCLUDES = -I/usr/local/include
 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)
+CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef -fPIC \
+	-ffast-math $(X11_INCLUDES)
 CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
 
 ASM_SOURCES = 
 
 # Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread
+DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 
 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

configs/freebsd-dri-amd64

@@ -0,0 +1,9 @@
+# -*-makefile-*-
+# Configuration for freebsd-dri-amd64: FreeBSD DRI hardware drivers
+
+include $(TOP)/configs/freebsd-dri
+
+CONFIG_NAME = freebsd-dri-x86-64
+
+ASM_FLAGS = -DUSE_X86_64_ASM
+ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)

configs/linux

@@ -8,13 +8,26 @@ CONFIG_NAME = linux
 CC = gcc
 CXX = g++
 
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+WARN_FLAGS = -Wall
+OPT_FLAGS  = -O3 -g
+PIC_FLAGS  = -fPIC
+
+# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.  Add -m32
+# to build properly on 64-bit platforms.
+
+ARCH_FLAGS ?=
+
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
+	-D_BSD_SOURCE -DPTHREADS -DUSE_XSHM
+
+X11_INCLUDES = -I/usr/X11R6/include
+
+CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
+	$(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math 
+
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
+	$(X11_INCLUDES) 
+
 GLUT_CFLAGS = -fexceptions
 
-
-# Library/program dependencies
-# Need to have -L/usr/X11R6/lib in these:
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-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
+EXTRA_LIB_PATH = -L/usr/X11R6/lib

configs/linux-debug

@@ -1,20 +1,8 @@
 # Configuration for debugging on Linux
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-debug
 
-# Compiler and flags
-CC = gcc
-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
-
-GLUT_CFLAGS = -fexceptions
-
-# Need to have -L/usr/X11R6/lib in these:
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-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) -lXt -L/usr/X11R6/lib -lX11
+OPT_FLAGS = -g
+DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK

configs/linux-dri

@@ -14,9 +14,11 @@ MKDEP = /usr/X11R6/bin/makedepend
 #MKDEP_OPTIONS = -MF depend
 
 WARN_FLAGS = -Wall
-OPT_FLAGS = -O -g
-PIC_FLAGS = -fPIC
+OPT_FLAGS  = -O -g
+PIC_FLAGS  = -fPIC
 
+# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
+ARCH_FLAGS ?=
 
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
@@ -24,30 +26,28 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 
 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)
+CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
+	$(ASM_FLAGS) -std=c99 -ffast-math 
 
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) \
-	$(DEFINES)
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 
 
 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
+EXTRA_LIB_PATH=-L/usr/X11R6/lib
 
-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
+DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
+GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
 
 
 # Directories
-SRC_DIRS = mesa glu glut/glx glw glx/x11
+SRC_DIRS = glx/x11 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
+# 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
+	savage sis tdfx trident unichrome ffb

configs/linux-dri-x86

@@ -8,5 +8,9 @@ CONFIG_NAME = linux-dri-x86
 # Unnecessary on x86, generally.
 PIC_FLAGS = 
 
+# Add -m32 to CFLAGS:
+ARCH_FLAGS = -m32
+
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES)
+

configs/linux-dri-x86-64

@@ -1,40 +1,23 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-dri
 
 CONFIG_NAME = linux-dri-x86-64
 
-# Compiler and flags
-CC = gcc
-CXX = g++
+ARCH_FLAGS = -m64
 
-DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE  -D__AMD64__ 
-
-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
-
-#ASM_SOURCES = $(X86_SOURCES)
+ASM_FLAGS = -DUSE_X86_64_ASM
+ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)
 
 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
-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
+EXTRA_LIB_PATH=-L/usr/X11R6/lib64
 
-# Directories
-SRC_DIRS = mesa glu glut/glx glw glx/x11
-DRIVER_DIRS = dri
-PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri
-
-# ffb, gamma, and sis are missing because they have
-# not be converted to use the new interface.  Do i810 & i830 really
-# need to be included here?
+# ffb, gamma, and sis are missing because they have not be converted to use
+# the new interface.  i810 and i830 are missing because there is no x86-64
+# system where they could *ever* be used.
 #
-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome savage
+DRI_DIRS = dri_client i915 mach64 mga r128 r200 radeon tdfx unichrome savage
 

configs/linux-fbdev

@@ -0,0 +1,10 @@
+# Configuration for Linux fbdev interface
+
+include $(TOP)/configs/linux
+
+CONFIG_NAME = linux-fbdev
+DRIVER_DIRS = fbdev
+
+CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DUSE_GLFBDEV_DRIVER
+
+PROGRAM_DIRS = fbdev

configs/linux-ppc

@@ -1,18 +1,9 @@
 # Configuration for Linux on PPC
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-ppc
 
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
-CXXFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE
-GLUT_CFLAGS = -fexceptions
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-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
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
+OPT_FLAGS = -O3 -mcpu=603 -fsigned-char -funroll-loops
 
+# FIXME: Use of PowerPC assembly should be enabled here.

configs/linux-ppc-static

@@ -1,15 +1,9 @@
 # Configuration for Linux on PPC, static libs
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-ppc
 
 CONFIG_NAME = linux-ppc-static
 
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
-CXXFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE
-GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static
 
 # Library names (actual file names)
@@ -18,9 +12,3 @@ GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
-
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-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
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm

configs/linux-profile

@@ -0,0 +1,29 @@
+# Configuration for profiling on Linux with gprof
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-profile
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+CFLAGS = -pg -O -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 = -pg -O -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
+
+GLUT_CFLAGS = -fexceptions
+
+# Need to have -L/usr/X11R6/lib in these:
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
+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) -lXt -L/usr/X11R6/lib -lX11
+
+# Need to make static libs for profiling:
+MKLIB_OPTIONS = -static
+GL_LIB_NAME = lib$(GL_LIB).a
+GLU_LIB_NAME = lib$(GLU_LIB).a
+GLUT_LIB_NAME = lib$(GLUT_LIB).a
+GLW_LIB_NAME = lib$(GLW_LIB).a
+OSMESA_LIB_NAME = lib$(OSMesa).a
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread

configs/linux-solo

@@ -8,26 +8,35 @@ 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
+WARN_FLAGS = -Wall -Wundef
+OPT_FLAGS  = -O3 -g
+PIC_FLAGS  = -fPIC
+                                                                                
+# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
+ARCH_FLAGS ?=
 
-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
+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 -DDRM_USE_MALLOC
 
-CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
+	 $(ASM_FLAGS) -std=c99 -ffast-math
 
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 
-ASM_SOURCES = $(X86_SOURCES)
+ASM_SOURCES =
 
 # Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
+DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(LIB_DIR) -lEGL -l$(GL_LIB) 
 GL_LIB_DEPS = -lm -lpthread -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 = egl mesa glx/mini glu glut/mini
 DRIVER_DIRS = dri
-PROGRAM_DIRS = miniglx
+PROGRAM_DIRS = miniglx egl
 
-#DRI_DIRS = fb ffb gamma sis savage
-DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome
+#DRI_DIRS = ffb gamma sis savage
+DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome fb

configs/linux-solo-ia64

@@ -8,7 +8,7 @@ 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
+DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DDRM_USE_MALLOC
 
 CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
 

configs/linux-solo-x86

@@ -1,32 +1,12 @@
-# Configuration for linux-solo: Linux DRI hardware drivers for fbdev
+# -*-makefile-*-
+# Configuration for linux-solo-x86: Linux hardware drivers for fbdev for x86
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-solo
 
 CONFIG_NAME = linux-solo-x86
 
-# Compiler and flags
-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
-
-CFLAGS = $(DEFINES) -Wmissing-prototypes -O3 -g -std=c99 -Wundef -fPIC -ffast-math
-
-CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
-
+# Unnecessary on x86, generally.
+PIC_FLAGS = 
 
+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES)
-
-# Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS = -lm -lpthread -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
-DRIVER_DIRS = dri
-PROGRAM_DIRS = miniglx
-
-#DRI_DIRS = fb ffb gamma sis savage
-DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome

configs/linux-static

@@ -1,17 +1,9 @@
 # Configuration for generic Linux, making static libs
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-static
 
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
-CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-GLUT_CFLAGS = -fexceptions
-
 MKLIB_OPTIONS = -static
 
 # Library names (actual file names)
@@ -27,4 +19,3 @@ OSMESA_LIB_DEPS =
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++

configs/linux-x86

@@ -1,24 +1,8 @@
 # Configuration for Linux with x86 optimizations
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-x86
 
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -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 = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-GLUT_CFLAGS = -fexceptions
-
-
+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
-
-# Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-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
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

configs/linux-x86-32

@@ -0,0 +1,7 @@
+# To build Linux x86 32-bit in an x86-64 environment
+
+include $(TOP)/configs/linux-x86
+
+CONFIG_NAME = linux-x86-32
+
+ARCH_FLAGS += -m32

configs/linux-x86-64

@@ -1,28 +1,13 @@
 # Configuration for Linux for 64-bit X86 (Opteron)
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-x86-64
 
-# Compiler and flags
-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 -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 -D__AMD64__
-
-GLUT_CFLAGS = -fexceptions
-
-
-#ASM_SOURCES = $(X86_SOURCES)
+ARCH_FLAGS = -m64
 
+ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)
+ASM_FLAGS = -DUSE_X86_64_ASM
 
 LIB_DIR = $(TOP)/lib64
-
-
-# Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread
-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
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
+EXTRA_LIB_PATH = -L/usr/X11R6/lib64

configs/linux-x86-64-debug

@@ -0,0 +1,7 @@
+# Configuration for Linux for 64-bit X86 (Opteron)
+
+include $(TOP)/configs/linux-x86-64
+
+CONFIG_NAME = linux-x86-64-debug
+
+DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK

configs/linux-x86-64-static

@@ -1,22 +1,11 @@
 # Configuration for Linux for 64-bit X86 (Opteron), static libs
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-x86-64
 
 CONFIG_NAME = linux-x86-64-static
 
-# Compiler and flags
-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 -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 -D__AMD64__
-
-GLUT_CFLAGS = -fexceptions
-
 MKLIB_OPTIONS = -static
 
-
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
@@ -24,17 +13,9 @@ GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 
-
-#ASM_SOURCES = $(X86_SOURCES)
-
-
-LIB_DIR = $(TOP)/lib64
-
-
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++

configs/linux-x86-debug

@@ -5,6 +5,5 @@ include $(TOP)/configs/linux-x86
 
 CONFIG_NAME = linux-x86-debug
 
-CFLAGS = -Wall -g -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 = -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+OPT_FLAGS = -g
+DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK

configs/linux-x86-static

@@ -1,22 +1,11 @@
 # Configuration for Linux with x86 optimizations, static libs
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-x86
 
 CONFIG_NAME = linux-x86-static
 
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -Wall -O3 -ansi -pedantic -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 = -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-GLUT_CFLAGS = -fexceptions
-
 MKLIB_OPTIONS = -static
 
-
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
@@ -24,14 +13,9 @@ GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 
-
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
-
-
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++

configs/linux-x86-xcb

@@ -0,0 +1,24 @@
+# Configuration for Linux with x86 optimizations
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-x86-xcb
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+CFLAGS = -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 -DUSE_XCB -I/usr/X11R6/include
+
+CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XCB
+
+GLUT_CFLAGS = -fexceptions
+
+
+ASM_SOURCES = $(X86_SOURCES) $(X86_API)
+
+# Library/program dependencies
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lXCB
+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
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

configs/solaris-x86

@@ -9,7 +9,7 @@ CC = cc
 CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM
 MKLIB_OPTIONS = -static
 
-APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
+APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm -lglut -lGLU -lGL
 
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a

docs/INSTALL.GNU

@@ -1,182 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.

docs/README.DJ

@@ -113,14 +113,10 @@ FAQ:
       at peak performance ;-).
 
    Q) I'm getting a "bad font!" fatal error.
-   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'!
+   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).
 
    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
@@ -265,8 +261,9 @@ v1.6 (aug-2004)
 v1.7 (???-2005)
 	+ enabled OpenGL 2.0 support
 	+ added support for sw texture compression
-	* minor rework
-	* `glutTimerFunc' now works with heavy callbacks
+	+ added FreeGLUT specific functions
+	* no more GLX sources in DOS GLUT
+	* made GLUT timer callbacks less accurate but safer
 
 
 

docs/README.MINGW32

@@ -14,68 +14,77 @@ Quick & dirty start:
 
 
 
-Contact:
---------
-
-Daniel Borca <dborca@users.sourceforge.net>
-
-
-
-WARNING! The info below this line is outdated (yet some of it useful). WARNING!
 *******************************************************************************
+The Mingw port for Mesa 3-D Graphics Library was created August 30, 1998 by Paul Garceau.
 
-
-
-August 30, 1998 -- Paul Garceau
-Updated January 13, 2000 -- Paul Garceau (pgarceau@teleport.com)
+Updated January 13, 2000; June 3, 2005 -- Paul Garceau <pgarceau@users.sourceforge.net>
 
 DISCLAIMER:  I make this port of the Mesa 3-D Graphics Library as a service
 to the general public.  I can, in no way support or make any guarantee that the
 build will work for your system.
 
-	The associated packages and batch files I have included as part of the GCC-2.95.2/Mingw32 extension are provided "As-is" with out any guarantee of support or functionality from this author.
+Acknowledgements:
 
-	Feel free to modify or change things as you see fit, just remember that
-I can't support any modifications you might want to make to the files which I
-have included OR the lgpl protected Mesa 3-D Graphics Library.
+	Daniel Borca, whose work and commitment to maintaining the Mingw port of the Mesa 3-D Graphics Library has been, and will continue to be greatly appreciated by an overworked and underpaid developer such as myself.
+	Without the creative inspiration and personal commitment provided by Mumit Khan, Jan-Jaap Vanderhagen and Colin Peters, Mingw would never have existed.  	Acknowledgements also need to be given to all of the developers who have worked on Mingw, Mesa and Msys over the years.
+	Last, but certainly far from the least, Brian Paul, who has dedicated at least the last seven or eight years of his life to making Mesa 3-D Graphics Library what it is today and managing the development for all of those years.
+*********************************************************************************
 
-	I recommend using GCC-2.95.2/Mingw32 which is available at Mumit Khans' ftp site:
+Greetings,
 
-		(ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/)
+	Feel free to modify or change things related to the Mingw build as you see fit, just remember that, the author of the current build may not be able to support any modifications you might want to make to the files which have been included for the build.
+
+Mesa core components are licensed under XFree-86 (for more on licensing of Mesa 3-D Graphics Library, check out the Mesa homepage (http://www.mesa3d.org).
+
+The Mingw generated libraries themselves are licensed under the GNU-LGPL license.  Source code for Mingw can be found at http://www.mingw.org.  For licensing terms on Mingw, please visit http://www.mingw.org.
+
+	It is recommended that you use the latest "stable" release of Mingw.  "Candidates" are beta testing distributions for Mingw.  Mingw is available at http://www.mingw.org.
 
 	This build has been tested under WinNT4/SP6.  Win9x and WinNT5 remain untested by me.  I have not tested any of the demos included with Mesa3d.
 
-	I recommend using the GCC-2.95.2/Mingw32.
+Installation:
 
-	ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95.2
+	This readme assumes that you already have extracted the necessary files to a working directory/folder that Mingw can use to build the Mesa3D libraries and that you know where that directory/folder is located on your Windows system.  If you have any questions about how to set things up properly which is specific to Mesa3D, the folks on the Mesa3D mailing lists (http://www.mesa3d.org) would probably be happy to assist you.  Also you can probably ask anyone on the Mingw mailing lists for any questions specific to Mingw (http://www.mingw.org)
 
-	Much thanks to the combined efforts of Mumit Khan, Jan-Jaap Vanderhagen
-and Colin Peters for making it possible for the Mingw32 toolchain to exist.  Also, thanks go out to Stephane Rehel for the work that was completed on the Cygwin build.
+Targets and Environment variables used for Mingw build:
 
-Installing GCC-2.95.2/Mingw32 Build:
+	Before going into the actual build of the libraries, here is a list of available targets for the make process:
 
-	a) Open the file archive (either tar.gz or .zip extensions)
+	"all" or "libgl"  -- this target will build libopengl.a, a static library.  It will not build the demos, etc.
 
-	b) Decide the directory you want to move the archived files to.
+	clean -- this target will clean up most of the Mesa 3-D Graphics Library/object code from your hard drive.
+
+	realclean -- this target will clean up all of the Mesa 3D Graphics Library and the Mesa object code that it can find.
+
+	Environment Variables:
+
+	The environment variables are used to determine what sort of graphics driver support needs to be included in the finished Mesa 3-D Graphics Library.
+
+	GLIDE		path to Glide3 SDK; used with FX.
+			default = $(TOP)/glide3
+	FX=1		build for 3dfx Glide3. Note that this disables
+			compilation of most WMesa code and requires fxMesa.
+			As a consequence, you'll need the Win32 Glide3
+			library to build any application.
+			default = no
+	ICD=1		build the installable client driver interface
+			(windows opengl driver interface)
+			default = no
+	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
+			default = no
 
-	d) Extract the files from the archive.
 	
-	e) Edit the mingw32.bat file to accomodate your choice of directory structure.
-
-		%mesaroot%:	This is your root directory (Mesa-3.3)
-		%mesasrc%:	This is the Mesa-3.3 src directory (Mesa-3.3\src)
-		%mesalib%:	This is where the build will put libGL.a and libGLU.a
-
 Running the Build:
 
-	Open your Command Prompt or MS-DOS prompt.
-	Go to your Mesa-3.3 'root' directory
-	At the command line type: mingw32
+	Launch Mingw.
+	From the Windows Command Prompt:
+	Set Environment Variables (as needed).
+	"cd" to your Mesa3D 'root' directory.
+	Enter "mingw32-make -f makefile.mgw <target>
 
 	That's all there is to it.
 
 	Enjoy!
 
-	Peace,
-
-		Paul G. (pgarceau@teleport.com)
+		Paul G. <pgarceau@users.sourceforge.net>
+		Daniel Borca <dborca@users.sourceforge.net>

docs/README.WIN32

@@ -1,108 +1,139 @@
 File: docs/README.WIN32
 
-Last updated: Oct 01, 2004 - Karl Schultz - kschultz@users.sourceforge.net
+Last updated: Jul 01, 2005 - Karl Schultz - kschultz@users.sourceforge.net
 
 Quick Start
+----- -----
 
 Unzip both ZIP files (MesaLib and MesaDemos) into the same directory.
 The libs and demos build separately, so if you do not care about the
 demos, you do not have to unzip that zip file.  But if you do, it does
-need to be unzipped into the same directory as the lib zip file because
-the demos depend on the libs.
+need to be unzipped into the same directory as the lib zip file
+because the demos depend on the libs.
 
-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 Windows build system uses Microsoft Visual Studio.  Project files
+for a specific version of Visual Studio are in their own directory in
+the top-level "windows" directory.  For example, Visual Studio 6 files
+are in windows/VC6.  If a directory does not exist for your version of
+Visual Studio, you can try importing the project files from an earlier
+version of Visual Studio.  At this time, project files exist for
+Version 6 and Version 7.  The code has been built with a beta version
+of Version 8 and it runs on 64-bit Windows.  If you want to try this,
+start by importing the VC7 files and create the 64-bit targets in the
+configuration manager.
 
-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.
+The project files to build the core Mesa library, Windows Mesa
+drivers, OSMesa, and GLU are in the mesa directory.  The project files
+to build GLUT and some demo programs are in the progs directory.
 
-Details and Notes
+Makefiles are no longer shipped or supported, but can be generated
+from the projects using Visual Studio.
 
-- 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:
+Windows Drivers
+------- -------
+
+At this time, only the GDI driver is known to work, as it has been
+ported and rewritten to the latest Mesa DD interfaces.  Source code
+also exists in the tree for other drivers in src/mesa/drivers/windows,
+but the status of this code is unknown.
+
+The GDI driver operates basically by writing pixel spans into a DIB
+section and then blitting the DIB to the window.  The driver was
+recently cleaned up and rewitten and so may have bugs or may be
+missing some functionality.  The older versions of the CVS source may
+be useful in figuring out any problems, or report them to me.
+
+To build Mesa with the GDI driver, build the mesa, gdi, and glu
+projects in the Visual Studio workspace found at
+
+	windows/VC6/mesa/mesa.dsw
+or
+	windows/VC7/mesa/mesa.sln
+
+The osmesa DLL can also be built with the osmesa project.
+
+The build system creates a lib top-level directory and copies
+resulting LIB and DLL files to this lib directory.  The files are:
+
 	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.
+If the MesaDemos ZIP file was extracted, the DLL files are also copied
+to the demos directory.  This facilitates running the demos as described
+below.
 
-- 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
-  system directory, place them in the same directory as the executable(s).
-  Be careful about accidentially overwriting files of the same name in
-  the SYSTEM32 directory.
 
-- Build the demos by opening the appropriate *.dsw file in the
-  progs directory tree.  For example, to build the demos, use
-  progs/demos/Windows/demos.dsw.  The Windows directory contains
-  the workspace and all the projects for each demo program.  Each
-  project places the executable in the same directory as its source
-  code, which is required for some demos.
+GLUT and Demos
+---- --- -----
 
-- The demo projects also copy the Mesa library DLL files from the lib
-  directory into the same directory as the demo executables, so that
-  the demos use the Mesa libs you just built.
+A Visual Studio workspace can be found at 
 
-- The DLL files are built so that the external entry points use the
-  stdcall calling convention.
+	windows/VC6/progs/progs.dsw
+or
+	windows/VC7/progs/progs.sln
 
-- Static LIB files are not built.  The LIB files that are built with
-  are the linker import files associated with the DLL files.  
+It can be used to build GLUT and a few demos.  The GLUT lib and DLL
+are copied to the top-level lib directory, along with the Mesa libs.
 
-- The si-glu sources are used to build the GLU libs.  This was done
-  mainly to get the better tessellator code.
+The demo build system expects to find the LIB files in the top level
+lib directory, so you must build the Mesa libs first.  The demo
+executables are placed in the demos directory, because some of them
+rely on data files found there.  Also, the Mesa lib DLL's were copied
+there by the Mesa lib build process.  Therefore, you should be able to
+simply run the demo executables from the demo directory.
 
-- 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
-  deal of optimization and testing.  There are many opportunities
-  for optimization, many of which can be done by coding more specific
-  paths for the rasterizers.  See src/osmesa/osmesa.c for some good
-  examples.
+If you want to run the demos from the Visual Studio, you may have to
+change the startup directory and explicitly state where the executables are.
 
-- There is DirectDraw support in the Windows driver, updated by
-  Daniel Slater.  You'll need to uncomment the #define DDRAW line
-  in src/Windows/wmesadef.h and add ddraw.lib to the list of libraries.
-  On some systems, you will acheive significantly higher framerates 
-  with DirectDraw.
 
-- Some of the more specialized code like FX drivers, stereo, and
-  parallel support isn't compiled or tested.  I left much of this
-  code alone, but it may need some work to get it 'turned on' again.
+Build System Notes
+----- ------ -----
 
-- No assembly code is compiled or assembled.  Again, this may need
-  some work to turn it back on or use it again.
+VC6
+---
 
-- To build "mangled" Mesa, add the preprocessor define USE_MGL_NAMESPACE
-  to the project settings.  You will also need to edit src/mesa.def to change
-  all the gl* symbols to mgl*.  Because this is easy to do with a global
-  replace operation in a text editor, no additional mangled version of mesa.def
-  is maintained or shipped.
+Visual Studio 6 does not recognize files with the .cc extension as C++
+language files, without a lot of unnatural tweaking.  So, the VC6
+build process uses custom build steps to compile these files in the
+GLU library.
+
+
+VC7
+---
+
+The above-mentioned .cc problem does not exist in this version.
+
+
+General
+-------
+
+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 system directory, place them in the same directory as the
+executable(s).  Be careful about accidentially overwriting files of
+the same name in the SYSTEM32 directory.
+
+The DLL files are built so that the external entry points use the
+stdcall calling convention.
+
+Static LIB files are not built.  The LIB files that are built with are
+the linker import files associated with the DLL files.
+
+The si-glu sources are used to build the GLU libs.  This was done
+mainly to get the better tessellator code.
+
+To build "mangled" Mesa, add the preprocessor define USE_MGL_NAMESPACE
+to the project settings.  You will also need to edit src/mesa.def to
+change all the gl* symbols to mgl*.  Because this is easy to do with a
+global replace operation in a text editor, no additional mangled
+version of mesa.def is maintained or shipped.
 
 If you have a Windows-related build problem or question, it is
 probably better to direct it to me (kschultz@users.sourceforge.net),
-rather than directly to the other Mesa developers.  I will help you
-as much as I can.  I also monitor the Mesa mailing lists and will
-answer questions in this area there as well.
+rather than directly to the other Mesa developers.  I will help you as
+much as I can.  I also monitor the Mesa mailing lists and will answer
+questions in this area there as well.
 
 
 Karl Schultz

docs/RELNOTES-6.3

@@ -1,7 +1,7 @@
 
                            Mesa 6.3 release notes
 
-                              month day, 2004
+                              July 20, 2004
 
                               PLEASE READ!!!!
 
@@ -27,6 +27,10 @@ GL_OES_read_format - allows one to query the fastest glReadPixels format
 
 GL_ARB_pixel_buffer_object - buffer objects for pixel read/write functions.
 
+GL_EXT_framebuffer_object - allows render-to-texture and provides a
+  window-system indepedent Pbuffer facility.
+  The Mesa CVS tree contains a couple tests of this extension.
+
 DirectFB driver, contributed by Claudio Ciccani.  See docs/README.directfb
 for details.
 
@@ -60,11 +64,25 @@ contexts so they can't be deleted until they're unbound in _all_ contexts.
 
 
 
+GL_EXT_framebuffer_object changes
+---------------------------------
+
+Implementing this extension involved changing a lot of code (for the better).
+
+The gl_framebuffer object now a collection of gl_renderbuffer objects.
+Renderbuffers may store colors, stencil indices, or depth values.  The
+gl_framebuffer and gl_renderbuffer types are object-oriented in design.
+
+All the old RGB, color index, stencil and depth-related span functions for
+reading/writing pixels from/to buffers has changed.  Now, all pixels are
+read/written through a set of common renderbuffer functions (methods).
+
+Most device drivers have been updated for these changes, but some haven't.
 
 
-To Do before release
---------------------
- Fix dinoshade bug
+
+To Do (someday) items
+---------------------
  Switch to freeglut
  Increase MAX_DRAWBUFFERS
  driver hooks for BeginQuery/EndQuery
@@ -74,7 +92,7 @@ To Do before release
 Miscellaneous
 -------------
 
-The main/get.c file is now generated with a Python script.
+The main/get.c file is now generated with a Python script (get_gen.py).
 
 
 
@@ -94,4 +112,4 @@ D3D			needs updating
 
 
 ----------------------------------------------------------------------
-$Id: RELNOTES-6.3,v 3.8 2005/01/20 04:03:37 brianp Exp $
+$Id: RELNOTES-6.3,v 3.12 2005/07/20 18:07:11 brianp Exp $

docs/VERSIONS

@@ -1308,24 +1308,45 @@ Mesa Version History
 	- 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
+	- paletted textures failed if the palette had fewer than 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
+6.3  July 20, 2004
     New:
+	- GL_EXT_framebuffer_object extension
 	- GL_ARB_draw_buffers extension
 	- GL_ARB_pixel_buffer_object extension
 	- GL_OES_read_format extension (Ian Romanick)
 	- DirectFB driver (Claudio Ciccani)
+	- x86_64 vertex transformation code (Mikko T.)
+	- Updated GL/glext.h to version 29
     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
+	- assorted 64-bit clean-ups fixes (x86_64 and Win64)
+	- lots of internal changes for GL_EXT_framebuffer_object
     Bug fixes:
 	- some functions didn't support PBO functionality
 	- glGetTexImage didn't convert color index images to RGBA as required
-
+	- fragment program texcoords were sometimes wrong for points and lines
+	- fixed problem with negative dot product in arbfplight, fplight demos
+	- fixed bug in perspective correction of antialiased, textured lines
+	- querying GL_POST_CONVOLUTION_ALPHA_BIAS_EXT returned wrong value
+	- fixed a couple per-pixel fog bugs (Soju Matsumoto)
+	- glGetBooleanv(GL_FRAGMENT_PROGRAM_BINDING_NV) was broken
+	- fixed float parsing bug in ARB frag/vert programs (bug 2520)
+	- XMesaGetDepthBuffer() returned incorrect value for bytesPerValue
+	- GL_COLOR_MATERIAL with glColor3 didn't properly set diffuse alpha
+	- glXChooseFBConfig() crashed if attribList pointer was NULL
+	- program state.light[n].spot.direction.w was wrong value (bug 3083)
+	- fragment program fog option required glEnable(GL_FOG) - wrong.
+	- glColorTable() could produce a Mesa implementation error (bug 3135)
+	- RasterPos could get corrupted by color index rendering path
+	- Removed bad XTranslateCoordinates call when rendering to Pixmaps
+	- glPopAttrib() didn't properly restore GL_TEXTURE_GEN enable state
+	- fixed a few Darwin compilation problems

docs/banner.html

@@ -1,15 +1,27 @@
-<HTML>
-
-<title>Banner</title>
-
-
-<body text="#ffffff" bgcolor="#aa4444">
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>Banner</title>
+</head>
+<body bgcolor="#000000" text="#ffffff">
 <center>
-<p>
-<font size="5">The Mesa 3D Graphics Library</font>
-</p>
+<table style="width: 95%; text-align: left;" border="0" cellpadding="2"
+ cellspacing="2">
+  <tbody>
+    <tr>
+      <td style="vertical-align: top;">
+      <p><img src="gears.png"> </p>
+      </td>
+      <td style="text-align: center;"><font face="sans-serif" size="5">The
+Mesa 3D Graphics Library</font></td>
+      <td style="vertical-align: top; text-align: right;">
+      <p><img src="gears.png"> </p>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<p><font face="sans-serif" size="5"><br>
+</font></p>
 </center>
-
 </body>
-</html>
+</html>

docs/contents.html

@@ -4,20 +4,18 @@
 
 <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;
+	background-color: #cccccc;
+	color: black;
 }
 a:link {
-	color: #fff;
+	color: #000;
 }
 a:visited {
-	color: #ccc;
+	color: #000;
 }
 -->
 </style>
@@ -40,6 +38,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">Devel Release (6.3)</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>

docs/cvs_access.html

@@ -67,9 +67,11 @@ Here are the basic instructions for Unix systems:
 Mesa developers working with the Mesa CVS repository need to first
 have an account on <a href="http://www.freedesktop.org" target="_parent">
 freedesktop.org</a>.
-You can request an account from either
-<a href="mailto:dstone@trinity.unimelb.edu.au">Daniel Stone</a> or
-<a href="mailto:eta@lclark.edu">Eric Anholt</a>.
+To get an account, please ask Brian or the other Mesa developers for
+permission.
+Then, if there are no objections, follow this
+<a href="http://www.freedesktop.org/wiki/AccountRequests" target="_parent">
+procedure</a>.
 </p>
 
 <p>

docs/helpwanted.html

@@ -9,54 +9,64 @@
 <H1>Help Wanted</H1>
 
 <p>
-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.
+We can always use more help with the Mesa project.
+Here are some specific ideas and areas where help would be appreciated:
 </p>
 
-<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>
+<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>
 
 
 <p>
 If you want to help with Mesa, first join the Mesa developer's
-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.
+mailing list.
+Then post a message to propose what you want to do, just to make sure
+there's no issues.
 </p>
 
 </p>
-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.
+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.
 </p>
 
 <p>
-Unfortunately, all the easy work in Mesa was done years ago.  Nowadays, the
-work is rather complicated and not suited to beginners.
-</p>
+Finally:
+<p>
 
-<p>
-If you're contribution code to the Mesa library itself:
-<p>
 <ol>
-<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.
+<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.
 </ol>
 
 

docs/index.html

@@ -1,20 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN">
 <html>
 
-<title>Mesa Home Page</title></head>
+<head>
+<title>Mesa Home Page</title>
+</head>
 
+<frameset rows="80,*" border="0" frameborder="yes">
 
-<frameset rows="50,100% " border="1" framespacing="1" frameborder="yes">
-<frame src="banner.html" name="BannerFrame" scrolling="no" marginwidth="1" marginheight="1" resize="">
-<frameset cols="28%,72% " border="1" framespacing="1" frameborder="yes">
-<frame src="contents.html" name="ContentsFrame" marginwidth="2" marginheight="1" resize="">
-<frame src="news.html" name="MainFrame" marginwidth="3" marginheight="1" resize="">
-</frameset>
-</frameset>
+  <frame src="banner.html" name="BannerFrame"
+   scrolling="no" marginwidth="1" marginheight="1">
+
+  <frameset cols="28%,72% " border="1" frameborder="yes">
+
+    <frame src="contents.html" name="ContentsFrame"
+     marginwidth="2" marginheight="1" noresize="noresize">
+
+    <frame src="news.html" name="MainFrame"
+     marginwidth="3" marginheight="1" noresize="noresize">
+
+  </frameset>
 
 <noframes>
-
-<body>
-</body>
-
+<p>Sorry, this site requires frame support</p>
 </noframes>
-</html>
+
+</frameset>
+
+</html>

docs/intro.html

@@ -82,7 +82,7 @@ my work hours at the Space Science and Engineering Center at the University
 of Wisconsin in Madison.  My supervisor, Bill Hibbard, lets me do this because
 Mesa is now being using for the <a href="http://www.ssec.wisc.edu/%7Ebillh/vis.html" target="_parent">Vis5D</a> project.
 </p><p>
-October 1996: Mesa 2.0 is released.  It implementes the OpenGL 1.1 specification.
+October 1996: Mesa 2.0 is released.  It implements the OpenGL 1.1 specification.
 </p>
 
 <p>
@@ -134,8 +134,8 @@ GL_ARB_fragment_program extensions.
 
 
 <p>
-Ongoing: Mesa is used as the core of many hardware OpenGL drivers for XFree86
-within the
+Ongoing: Mesa is used as the core of many hardware OpenGL drivers for
+the XFree86 X.org X servers within the
 <A href="http://dri.sourceforge.net/" target="_parent">DRI project</A>.
 I continue to enhance Mesa with new extensions and features.
 </p>

docs/mesa.css

@@ -1,20 +1,18 @@
 /* Mesa CSS */
 body {
-	background-color: #55bbff;
+	background-color: #ffffff;
 	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;

docs/news.html

@@ -2,13 +2,58 @@
 
 <TITLE>Mesa News</TITLE>
 
-<link rel="stylesheet" type="text/css" href="mesa.css"></head>
+<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
 
 <BODY>
 
+<body bgcolor="#eeeeee">
+
 <H1>News</H1>
 
 
+<h2>July 20, 2005</h2>
+<p>
+Mesa 6.3 has been released.
+This is a development release with new features, changes and bug fixes.
+</p>
+<pre>
+    New:
+	- GL_EXT_framebuffer_object extension
+	- GL_ARB_draw_buffers extension
+	- GL_ARB_pixel_buffer_object extension
+	- GL_OES_read_format extension (Ian Romanick)
+	- DirectFB driver (Claudio Ciccani)
+	- x86_64 vertex transformation code (Mikko T.)
+    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
+	- assorted 64-bit clean-ups fixes (x86_64 and Win64)
+	- lots of internal changes for GL_EXT_framebuffer_object
+    Bug fixes:
+	- some functions didn't support PBO functionality
+	- glGetTexImage didn't convert color index images to RGBA as required
+	- fragment program texcoords were sometimes wrong for points and lines
+	- fixed problem with negative dot product in arbfplight, fplight demos
+	- fixed bug in perspective correction of antialiased, textured lines
+	- querying GL_POST_CONVOLUTION_ALPHA_BIAS_EXT returned wrong value
+	- fixed a couple per-pixel fog bugs (Soju Matsumoto)
+	- glGetBooleanv(GL_FRAGMENT_PROGRAM_BINDING_NV) was broken
+	- fixed float parsing bug in ARB frag/vert programs (bug 2520)
+	- XMesaGetDepthBuffer() returned incorrect value for bytesPerValue
+	- GL_COLOR_MATERIAL with glColor3 didn't properly set diffuse alpha
+	- glXChooseFBConfig() crashed if attribList pointer was NULL
+	- program state.light[n].spot.direction.w was wrong value (bug 3083)
+	- fragment program fog option required glEnable(GL_FOG) - wrong.
+	- glColorTable() could produce a Mesa implementation error (bug 3135)
+	- RasterPos could get corrupted by color index rendering path
+	- Removed bad XTranslateCoordinates call when rendering to Pixmaps
+	- glPopAttrib() didn't properly restore GL_TEXTURE_GEN enable state
+	- fixed a few Darwin compilation problems
+</pre>
+
+
 <h2>December 9, 2004</h2>
 <p>
 Mesa 6.2.1 has been released.
@@ -25,7 +70,7 @@ This is a stable release which just fixes bugs since the 6.2 release.
 	- 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
+	- paletted textures failed if the palette had fewer than 256 entries
     Changes:
 	- fixed a bunch of compiler warnings found with gcc 3.4
 	- bug reports should to go bugzilla.freedesktop.org
@@ -960,6 +1005,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.21 2005/07/20 18:07:11 brianp Exp $
 </body>
-</html>
+</html>

docs/thanks.html

@@ -13,6 +13,7 @@
 
 The following individuals and groups are to be acknowledged for their
 contributions to Mesa over the years.
+This list is far from complete and somewhat dated, unfortunately.
 
 
 <ul>
@@ -32,14 +33,21 @@ substantial piece of work.
 Tungsten Graphics, Inc. have supported the ongoing development of Mesa.
 <br>
 <br>
-<li>The <A HREF="http://sourceforge.net/projects/mesa3d"
-target="_parent">Mesa</A>
-project is hosted by<A HREF="http://sourceforge.net"
-target="_parent"><IMG SRC="http://sourceforge.net/sflogo.php?group_id=3&type=1"
+<li>The
+<A HREF="http://sourceforge.net/projects/mesa3d" target="_parent">Mesa</A>
+website is hosted by
+<A HREF="http://sourceforge.net" target="_parent">
+<IMG SRC="http://sourceforge.net/sflogo.php?group_id=3&type=1"
 WIDTH="88" HEIGHT="31" ALIGN="BOTTOM" ALT="Sourceforge.net" BORDER="0"></A>
 <br>
 <br>
 
+<li>The Mesa CVS repository is hosted by
+<a href="http://freedesktop.org/" target="_parent">freedesktop.org</a>.
+<br>
+<br>
+
+
 <li><a href="http://www.altsoftware.com/"
 target="_parent">alt.software</a> contributed the Direct3D driver.
 

include/GL/gl.h

@@ -2,7 +2,7 @@
  * Mesa 3-D graphics library
  * Version:  6.3
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2005  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"),
@@ -62,6 +62,9 @@
 #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")))
+#  define GLAPIENTRY
 #endif /* WIN32 && !CYGWIN */
 
 #if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
@@ -101,7 +104,7 @@
 #define APIENTRY GLAPIENTRY
 #endif
 
-/* "P" suffix for when function returns a pointer */
+/* "P" suffix to be used for a pointer to a function */
 #ifndef APIENTRYP
 #define APIENTRYP APIENTRY *
 #endif
@@ -850,7 +853,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 );
 
@@ -2210,13 +2213,9 @@ GLAPI void GLAPIENTRY glTracePointerRangeMESA( const GLvoid* first, const GLvoid
 
 typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data);
 
-extern void
-glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback,
-                      GLvoid *data);
+GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data);
 
-extern void
-glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name,
-                           GLfloat *v);
+GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v);
 
 #endif /* GL_MESA_program_debug */
 

include/GL/gl_mangle.h

@@ -62,11 +62,13 @@
 #define glBindBufferARB		MANGLE(BindBufferARB)
 #define glBindBuffer		MANGLE(BindBuffer)
 #define glBindFragmentShaderATI		MANGLE(BindFragmentShaderATI)
+#define glBindFramebufferEXT		MANGLE(BindFramebufferEXT)
 #define glBindLightParameterEXT		MANGLE(BindLightParameterEXT)
 #define glBindMaterialParameterEXT		MANGLE(BindMaterialParameterEXT)
 #define glBindParameterEXT		MANGLE(BindParameterEXT)
 #define glBindProgramARB		MANGLE(BindProgramARB)
 #define glBindProgramNV		MANGLE(BindProgramNV)
+#define glBindRenderbufferEXT		MANGLE(BindRenderbufferEXT)
 #define glBindTexGenParameterEXT		MANGLE(BindTexGenParameterEXT)
 #define glBindTextureEXT		MANGLE(BindTextureEXT)
 #define glBindTexture		MANGLE(BindTexture)
@@ -102,6 +104,7 @@
 #define glBufferSubData		MANGLE(BufferSubData)
 #define glCallList		MANGLE(CallList)
 #define glCallLists		MANGLE(CallLists)
+#define glCheckFramebufferStatusEXT		MANGLE(CheckFramebufferStatusEXT)
 #define glClampColorARB		MANGLE(ClampColorARB)
 #define glClearAccum		MANGLE(ClearAccum)
 #define glClearColor		MANGLE(ClearColor)
@@ -244,6 +247,7 @@
 #define glDeleteFencesAPPLE		MANGLE(DeleteFencesAPPLE)
 #define glDeleteFencesNV		MANGLE(DeleteFencesNV)
 #define glDeleteFragmentShaderATI		MANGLE(DeleteFragmentShaderATI)
+#define glDeleteFramebuffersEXT		MANGLE(DeleteFramebuffersEXT)
 #define glDeleteLists		MANGLE(DeleteLists)
 #define glDeleteObjectARB		MANGLE(DeleteObjectARB)
 #define glDeleteOcclusionQueriesNV		MANGLE(DeleteOcclusionQueriesNV)
@@ -252,6 +256,7 @@
 #define glDeleteProgramsNV		MANGLE(DeleteProgramsNV)
 #define glDeleteQueriesARB		MANGLE(DeleteQueriesARB)
 #define glDeleteQueries		MANGLE(DeleteQueries)
+#define glDeleteRenderbuffersEXT		MANGLE(DeleteRenderbuffersEXT)
 #define glDeleteShader		MANGLE(DeleteShader)
 #define glDeleteTexturesEXT		MANGLE(DeleteTexturesEXT)
 #define glDeleteTextures		MANGLE(DeleteTextures)
@@ -365,6 +370,10 @@
 #define glFragmentMaterialfvSGIX		MANGLE(FragmentMaterialfvSGIX)
 #define glFragmentMaterialiSGIX		MANGLE(FragmentMaterialiSGIX)
 #define glFragmentMaterialivSGIX		MANGLE(FragmentMaterialivSGIX)
+#define glFramebufferRenderbufferEXT		MANGLE(FramebufferRenderbufferEXT)
+#define glFramebufferTexture1DEXT		MANGLE(FramebufferTexture1DEXT)
+#define glFramebufferTexture2DEXT		MANGLE(FramebufferTexture2DEXT)
+#define glFramebufferTexture3DEXT		MANGLE(FramebufferTexture3DEXT)
 #define glFrameZoomSGIX		MANGLE(FrameZoomSGIX)
 #define glFreeObjectBufferATI		MANGLE(FreeObjectBufferATI)
 #define glFrontFace		MANGLE(FrontFace)
@@ -372,15 +381,18 @@
 #define glGenAsyncMarkersSGIX		MANGLE(GenAsyncMarkersSGIX)
 #define glGenBuffersARB		MANGLE(GenBuffersARB)
 #define glGenBuffers		MANGLE(GenBuffers)
+#define glGenerateMipmapEXT		MANGLE(GenerateMipmapEXT)
 #define glGenFencesAPPLE		MANGLE(GenFencesAPPLE)
 #define glGenFencesNV		MANGLE(GenFencesNV)
 #define glGenFragmentShadersATI		MANGLE(GenFragmentShadersATI)
+#define glGenFramebuffersEXT		MANGLE(GenFramebuffersEXT)
 #define glGenLists		MANGLE(GenLists)
 #define glGenOcclusionQueriesNV		MANGLE(GenOcclusionQueriesNV)
 #define glGenProgramsARB		MANGLE(GenProgramsARB)
 #define glGenProgramsNV		MANGLE(GenProgramsNV)
 #define glGenQueriesARB		MANGLE(GenQueriesARB)
 #define glGenQueries		MANGLE(GenQueries)
+#define glGenRenderbuffersEXT		MANGLE(GenRenderbuffersEXT)
 #define glGenSymbolsEXT		MANGLE(GenSymbolsEXT)
 #define glGenTexturesEXT		MANGLE(GenTexturesEXT)
 #define glGenTextures		MANGLE(GenTextures)
@@ -438,6 +450,7 @@
 #define glGetFragmentLightivSGIX		MANGLE(GetFragmentLightivSGIX)
 #define glGetFragmentMaterialfvSGIX		MANGLE(GetFragmentMaterialfvSGIX)
 #define glGetFragmentMaterialivSGIX		MANGLE(GetFragmentMaterialivSGIX)
+#define glGetFramebufferAttachmentParameterivEXT		MANGLE(GetFramebufferAttachmentParameterivEXT)
 #define glGetHandleARB		MANGLE(GetHandleARB)
 #define glGetHistogramEXT		MANGLE(GetHistogramEXT)
 #define glGetHistogram		MANGLE(GetHistogram)
@@ -502,6 +515,7 @@
 #define glGetProgramNamedParameterfvNV		MANGLE(GetProgramNamedParameterfvNV)
 #define glGetProgramParameterdvNV		MANGLE(GetProgramParameterdvNV)
 #define glGetProgramParameterfvNV		MANGLE(GetProgramParameterfvNV)
+#define glGetProgramRegisterfvMESA		MANGLE(GetProgramRegisterfvMESA)
 #define glGetProgramStringARB		MANGLE(GetProgramStringARB)
 #define glGetProgramStringNV		MANGLE(GetProgramStringNV)
 #define glGetQueryivARB		MANGLE(GetQueryivARB)
@@ -510,6 +524,7 @@
 #define glGetQueryObjectiv		MANGLE(GetQueryObjectiv)
 #define glGetQueryObjectuivARB		MANGLE(GetQueryObjectuivARB)
 #define glGetQueryObjectuiv		MANGLE(GetQueryObjectuiv)
+#define glGetRenderbufferParameterivEXT		MANGLE(GetRenderbufferParameterivEXT)
 #define glGetSeparableFilterEXT		MANGLE(GetSeparableFilterEXT)
 #define glGetSeparableFilter		MANGLE(GetSeparableFilter)
 #define glGetShaderInfoLog		MANGLE(GetShaderInfoLog)
@@ -601,6 +616,7 @@
 #define glIsEnabled		MANGLE(IsEnabled)
 #define glIsFenceAPPLE		MANGLE(IsFenceAPPLE)
 #define glIsFenceNV		MANGLE(IsFenceNV)
+#define glIsFramebufferEXT		MANGLE(IsFramebufferEXT)
 #define glIsList		MANGLE(IsList)
 #define glIsObjectBufferATI		MANGLE(IsObjectBufferATI)
 #define glIsOcclusionQueryNV		MANGLE(IsOcclusionQueryNV)
@@ -609,6 +625,7 @@
 #define glIsProgramNV		MANGLE(IsProgramNV)
 #define glIsQueryARB		MANGLE(IsQueryARB)
 #define glIsQuery		MANGLE(IsQuery)
+#define glIsRenderbufferEXT		MANGLE(IsRenderbufferEXT)
 #define glIsShader		MANGLE(IsShader)
 #define glIsTextureEXT		MANGLE(IsTextureEXT)
 #define glIsTexture		MANGLE(IsTexture)
@@ -836,6 +853,7 @@
 #define glPrimitiveRestartNV		MANGLE(PrimitiveRestartNV)
 #define glPrioritizeTexturesEXT		MANGLE(PrioritizeTexturesEXT)
 #define glPrioritizeTextures		MANGLE(PrioritizeTextures)
+#define glProgramCallbackMESA		MANGLE(ProgramCallbackMESA)
 #define glProgramEnvParameter4dARB		MANGLE(ProgramEnvParameter4dARB)
 #define glProgramEnvParameter4dvARB		MANGLE(ProgramEnvParameter4dvARB)
 #define glProgramEnvParameter4fARB		MANGLE(ProgramEnvParameter4fARB)
@@ -895,6 +913,7 @@
 #define glRects		MANGLE(Rects)
 #define glRectsv		MANGLE(Rectsv)
 #define glReferencePlaneSGIX		MANGLE(ReferencePlaneSGIX)
+#define glRenderbufferStorageEXT		MANGLE(RenderbufferStorageEXT)
 #define glRenderMode		MANGLE(RenderMode)
 #define glReplacementCodePointerSUN		MANGLE(ReplacementCodePointerSUN)
 #define glReplacementCodeubSUN		MANGLE(ReplacementCodeubSUN)
@@ -1003,6 +1022,7 @@
 #define glStencilOpSeparateATI		MANGLE(StencilOpSeparateATI)
 #define glStencilOpSeparate		MANGLE(StencilOpSeparate)
 #define glStopInstrumentsSGIX		MANGLE(StopInstrumentsSGIX)
+#define glStringMarkerGREMEDY		MANGLE(StringMarkerGREMEDY)
 #define glSwizzleEXT		MANGLE(SwizzleEXT)
 #define glTagSampleBufferSGIX		MANGLE(TagSampleBufferSGIX)
 #define glTangent3bEXT		MANGLE(Tangent3bEXT)

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 2005/06/20 */
 /* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */
-#define GL_GLEXT_VERSION 26
+#define GL_GLEXT_VERSION 29
 
 #ifndef GL_VERSION_1_2
 #define GL_UNSIGNED_BYTE_3_3_2            0x8032
@@ -2980,6 +2980,64 @@ extern "C" {
 /* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
 #endif
 
+#ifndef GL_EXT_framebuffer_object
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
+#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
+#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
+#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_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_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
+#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_EXT                0x8D40
+#define GL_RENDERBUFFER_EXT               0x8D41
+#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
+#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_RED_SIZE_EXT      0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
+#endif
+
+#ifndef GL_GREMEDY_string_marker
+#endif
+
 
 /*************************************************************/
 
@@ -6381,6 +6439,54 @@ typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLen
 #define GL_NV_vertex_program3 1
 #endif
 
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint);
+GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *);
+GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint);
+GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *);
+GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum);
+GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGenerateMipmapEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
+#endif
+
+#ifndef GL_GREMEDY_string_marker
+#define GL_GREMEDY_string_marker 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
+#endif
+
 
 #ifdef __cplusplus
 }

include/GL/glfbdev.h

@@ -62,7 +62,10 @@ extern const char *
 glFBDevGetString( int str );
 
 
-extern const void *
+typedef void (*GLFBDevProc)();
+
+
+extern const GLFBDevProc
 glFBDevGetProcAddress( const char *procName );
 
 

include/GL/glut.h

@@ -193,13 +193,11 @@ 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
+#  define GLUTAPIENTRY GLAPIENTRY
 #  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
 
 
@@ -747,26 +745,4 @@ 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__ */

include/GL/glx.h

@@ -482,6 +482,21 @@ 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
  */
@@ -506,6 +521,28 @@ extern Bool glXDrawableAttribARB(Display *dpy, GLXDrawable draw, const int *attr
 #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
 }

include/GL/miniglx.h

@@ -52,14 +52,20 @@ 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.
@@ -67,7 +73,7 @@ typedef struct MiniGLXColormapRec *Colormap;
 typedef struct MiniGLXSetWindowAttributesRec {
    int background_pixel; /**< \brief background pixel */
    int border_pixel;     /**< \brief border pixel value */
-   Colormap colormap;    /**< \brief color map to be associated with window */
+   MINI_Colormap colormap;    /**< \brief color map to be associated with window */
    int event_mask;       /**< \brief set of events that should be saved */
 } XSetWindowAttributes;
 
@@ -85,10 +91,13 @@ typedef struct MiniGLXVisualRec Visual;
  *
  * \sa \ref datatypes.
  */
-typedef unsigned int VisualID;
+#ifndef MINIGLX_NO_XTYPES
+typedef unsigned long VisualID;
+#endif
+typedef unsigned long MINI_VisualID;
 typedef struct MiniGLXXVisualInfoRec {
    Visual *visual;	/**< \brief pointer to the GLX Visual */
-   VisualID visualid;	/**< \brief visual ID */
+   MINI_VisualID visualid;	/**< \brief visual ID */
    int screen;		/**< \brief screen number */
    int depth;		/**< \brief bit depth */
 #if defined(__cplusplus) || defined(c_plusplus)
@@ -115,7 +124,10 @@ typedef struct MiniGLXFBConfigRec {
  *
  * \sa \ref datatypes.
  */
+#ifndef MINIGLX_NO_XTYPES
 typedef struct MiniGLXDisplayRec   Display;
+#endif
+typedef struct MiniGLXDisplayRec   MINI_Display;
 
 /**
  * \brief Window handle.
@@ -124,7 +136,10 @@ typedef struct MiniGLXDisplayRec   Display;
  *
  * \sa \ref datatypes.
  */
+#ifndef MINIGLX_NO_XTYPES
 typedef struct MiniGLXWindowRec   *Window;
+#endif
+typedef struct MiniGLXWindowRec   *MINI_Window;
 
 /**
  * \brief Drawable.
@@ -136,7 +151,10 @@ typedef struct MiniGLXWindowRec   *Window;
  *
  * \sa \ref datatypes.
  */
+#ifndef MINIGLX_NO_XTYPES
 typedef struct MiniGLXWindowRec   *Drawable;
+#endif
+typedef struct MiniGLXWindowRec   *MINI_Drawable;
 
 /**
  * \brief GLX drawable.
@@ -174,9 +192,9 @@ typedef struct MiniGLXContextRec  *GLXContext;
 typedef struct {
 	int type;
 	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window window;
+	MINI_Bool send_event;	/* true if this came from a SendEvent request */
+	MINI_Display *display;	/* Display the event was read from */
+	MINI_Window window;
 	int x, y;
 	int width, height;
 	int count;		/* if non-zero, at least this many more */
@@ -185,53 +203,53 @@ typedef struct {
 typedef struct {
 	int type;
 	unsigned long serial;	/* # of last request processed by server */
-	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 */
+	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 */
 	int x, y;		/* window location */
 	int width, height;	/* size of window */
 	int border_width;	/* border width */
-	Bool override_redirect;	/* creation should be overridden */
+	MINI_Bool override_redirect;	/* creation should be overridden */
 } XCreateWindowEvent;
 
 typedef struct {
 	int type;
 	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window event;
-	Window window;
+	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;
 } XDestroyWindowEvent;
 
 typedef struct {
 	int type;
 	unsigned long serial;	/* # of last request processed by server */
-	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;
+	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;
 } XUnmapEvent;
 
 typedef struct {
 	int type;
 	unsigned long serial;	/* # of last request processed by server */
-	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... */
+	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... */
 } XMapEvent;
 
 
 typedef struct {
 	int type;
 	unsigned long serial;	/* # of last request processed by server */
-	Bool send_event;	/* true if this came from a SendEvent request */
-	Display *display;	/* Display the event was read from */
-	Window parent;
-	Window window;
+	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;
 } XMapRequestEvent;
 
 typedef union _XEvent {
@@ -263,6 +281,7 @@ 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
@@ -318,11 +337,11 @@ typedef union _XEvent {
 /**
  * \name Server-specific functions
  */
-extern Display *
+extern MINI_Display *
 __miniglx_StartServer( const char *display_name );
 
 extern int
-__miniglx_Select( Display *dpy, int maxfd,
+__miniglx_Select( MINI_Display *dpy, int maxfd,
 		  fd_set *rfds, fd_set *wfds, fd_set *xfds,
 		  struct timeval *tv );
 
@@ -331,25 +350,25 @@ __miniglx_Select( Display *dpy, int maxfd,
  * \name Simulated Xlib functions
  */
 /*@{*/
-extern Display *
+extern MINI_Display *
 XOpenDisplay( const char *dpy_name );
 
 
 extern void
-XCloseDisplay( Display *display );
+XCloseDisplay( MINI_Display *display );
 
-extern Window
-XCreateWindow( Display *display, Window parent, int x, int y,
+extern MINI_Window
+XCreateWindow( MINI_Display *display, MINI_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(Display *display, XEvent *event_return);
+XNextEvent(MINI_Display *display, XEvent *event_return);
 
-extern Bool 
-XCheckMaskEvent( Display *dpy, long event_mask, XEvent *event_return );
+extern MINI_Bool 
+XCheckMaskEvent( MINI_Display *dpy, long event_mask, XEvent *event_return );
 
 /**
  * \brief Return the root window.
@@ -365,27 +384,27 @@ XCheckMaskEvent( Display *dpy, long event_mask, XEvent *event_return );
 #define DefaultScreen(dpy)  0
 
 extern void
-XDestroyWindow( Display *display, Window w );
+XDestroyWindow( MINI_Display *display, MINI_Window w );
 
 extern void
-XMapWindow( Display *display, Window w );
+XMapWindow( MINI_Display *display, MINI_Window w );
 
 /* Should clients have access to this?
  */
 extern void
-XUnmapWindow( Display *display, Window w );
+XUnmapWindow( MINI_Display *display, MINI_Window w );
 
-extern Colormap
-XCreateColormap( Display *display, Window w, Visual *visual, int alloc );
+extern MINI_Colormap
+XCreateColormap( MINI_Display *display, MINI_Window w, Visual *visual, int alloc );
 
 extern void
-XFreeColormap( Display *display, Colormap cmap );
+XFreeColormap( MINI_Display *display, MINI_Colormap cmap );
 
 extern void
 XFree( void *data );
 
 extern XVisualInfo *
-XGetVisualInfo( Display *display, long vinfo_mask,
+XGetVisualInfo( MINI_Display *display, long vinfo_mask,
                 XVisualInfo *vinfo_template, int *nitems_return );
 /*@}*/
 
@@ -396,23 +415,23 @@ XGetVisualInfo( Display *display, long vinfo_mask,
  */
 /*@{*/
 extern XVisualInfo*
-glXChooseVisual( Display *dpy, int screen, int *attribList );
+glXChooseVisual( MINI_Display *dpy, int screen, int *attribList );
 
 extern int
-glXGetConfig( Display *dpy, XVisualInfo *vis, int attrib, int *value );
+glXGetConfig( MINI_Display *dpy, XVisualInfo *vis, int attrib, int *value );
 
 extern GLXContext
-glXCreateContext( Display *dpy, XVisualInfo *vis,
-                  GLXContext shareList, Bool direct );
+glXCreateContext( MINI_Display *dpy, XVisualInfo *vis,
+                  GLXContext shareList, MINI_Bool direct );
 
 extern void
-glXDestroyContext( Display *dpy, GLXContext ctx );
+glXDestroyContext( MINI_Display *dpy, GLXContext ctx );
 
-extern Bool
-glXMakeCurrent( Display *dpy, GLXDrawable drawable, GLXContext ctx);
+extern MINI_Bool
+glXMakeCurrent( MINI_Display *dpy, GLXDrawable drawable, GLXContext ctx);
 
 extern void
-glXSwapBuffers( Display *dpy, GLXDrawable drawable );
+glXSwapBuffers( MINI_Display *dpy, GLXDrawable drawable );
 
 extern GLXContext
 glXGetCurrentContext( void );
@@ -423,22 +442,35 @@ glXGetCurrentDrawable( void );
 extern void 
 (*glXGetProcAddress(const GLubyte *procname))( void );
 
-extern Bool
-glXQueryVersion( Display *dpy, int *major, int *minor );
+extern MINI_Bool
+glXQueryVersion( MINI_Display *dpy, int *major, int *minor );
 
 /* Added in MiniGLX 1.1 */
 extern GLXPbuffer
-glXCreatePbuffer( Display *dpy, GLXFBConfig config, const int *attribList );
+glXCreatePbuffer( MINI_Display *dpy, GLXFBConfig config, const int *attribList );
 
 extern void
-glXDestroyPbuffer( Display *dpy, GLXPbuffer pbuf );
+glXDestroyPbuffer( MINI_Display *dpy, GLXPbuffer pbuf );
 
 extern GLXFBConfig *
-glXChooseFBConfig( Display *dpy, int screen, const int *attribList,
+glXChooseFBConfig( MINI_Display *dpy, int screen, const int *attribList,
                    int *nitems );
 
 extern XVisualInfo *
-glXGetVisualFromFBConfig( Display *dpy, GLXFBConfig config );
+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 );
 
 /*@}*/
 

include/GLES/egl.h

@@ -0,0 +1,274 @@
+#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.
+*/
+
+#if 0/*XXX TEMPORARY HACK*/
+#include <GLES/gl.h>
+#else
+#include <GL/gl.h>
+#endif
+#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))(void);
+
+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);
+
+
+
+/* EGL_MESA_screen extension  >>> PRELIMINARY <<< */
+#ifndef EGL_MESA_screen_surface
+#define EGL_MESA_screen_surface 1
+
+#define EGL_BAD_SCREEN_MESA        0x4000
+#define EGL_BAD_MODE_MESA          0x4001
+#define EGL_SCREEN_COUNT_MESA      0x4002
+#define EGL_SCREEN_POSITION_MESA   0x4003
+#define EGL_MODE_ID_MESA           0x4004
+#define EGL_REFRESH_RATE_MESA      0x4005
+#define EGL_OPTIMAL_MODE_MESA      0x4006
+#define EGL_SCREEN_BIT_MESA        0x08
+
+GLAPI EGLBoolean APIENTRY eglChooseModeMESA(EGLDisplay dpy, EGLScreenMESA screen, const EGLint *attrib_list, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);
+GLAPI EGLBoolean APIENTRY eglGetModesMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *modes, EGLint modes_size, EGLint *num_modes);
+GLAPI EGLBoolean APIENTRY eglGetModeAttribMESA(EGLDisplay dpy, EGLModeMESA mode, EGLint attribute, EGLint *value);
+GLAPI EGLBoolean APIENTRY eglGetScreensMESA(EGLDisplay dpy, EGLScreenMESA *screens, EGLint max_screens, EGLint *num_screens);
+GLAPI EGLSurface APIENTRY eglCreateScreenSurfaceMESA(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);
+GLAPI EGLBoolean APIENTRY eglShowSurfaceMESA(EGLDisplay dpy, EGLint screen, EGLSurface surface, EGLModeMESA mode);
+GLAPI EGLBoolean APIENTRY eglScreenPositionMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLint x, EGLint y);
+GLAPI EGLBoolean APIENTRY eglQueryScreenMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLint attribute, EGLint *value);
+GLAPI EGLBoolean APIENTRY eglQueryScreenSurfaceMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLSurface *surface);
+GLAPI EGLBoolean APIENTRY eglQueryScreenModeMESA(EGLDisplay dpy, EGLScreenMESA screen, EGLModeMESA *mode);
+GLAPI const char * APIENTRY eglQueryModeStringMESA(EGLDisplay dpy, EGLModeMESA mode);
+
+#endif /* EGL_MESA_screen_surface */
+
+
+#ifndef EGL_MESA_copy_context
+#define EGL_MESA_copy_context 1
+
+GLAPI EGLBoolean APIENTRY eglCopyContextMESA(EGLDisplay dpy, EGLContext source, EGLContext dest, EGLint mask);
+
+#endif /* EGL_MESA_copy_context */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _EGL_H */

include/GLES/egltypes.h

@@ -0,0 +1,45 @@
+/*
+** egltypes.h for Mesa
+**
+** ONLY egl.h SHOULD INCLUDE THIS FILE!
+**
+** See comments about egltypes.h in the standard egl.h file.
+*/
+
+
+#include <sys/types.h>
+
+
+/*
+** These opaque EGL types are implemented as unsigned 32-bit integers:
+*/
+typedef u_int32_t EGLDisplay;
+typedef u_int32_t EGLConfig;
+typedef u_int32_t EGLSurface;
+typedef u_int32_t EGLContext;
+
+/* EGL_MESA_screen_surface */
+typedef u_int32_t EGLModeMESA;
+typedef u_int32_t EGLScreenMESA;
+
+
+/*
+** Other basic EGL types:
+*/
+typedef u_int8_t EGLBoolean;
+typedef int32_t EGLint;
+
+typedef void * NativeDisplayType;
+typedef int NativePixmapType;
+typedef int NativeWindowType;
+
+/*
+** EGL and native handle null 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)
+
+/* EGL_MESA_screen_surface */
+#define EGL_NO_MODE_MESA ((EGLModeMESA) 0)

progs/demos/Makefile

@@ -36,7 +36,6 @@ PROGS = \
 	morph3d \
 	multiarb \
 	occlude \
-	osdemo \
 	paltex \
 	pixeltex \
 	pointblast \
@@ -110,21 +109,7 @@ shadowtex: shadowtex.o showbuffer.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 $@
-
-
-
 clean:
 	-rm -f $(PROGS)
 	-rm -f *.o *~
-	-rm -f readtex.[ch]
+	-rm -f readtex.[ch] showbuffer.[ch]

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);
    }
 
@@ -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
@@ -371,11 +365,9 @@ static void Init( void )
    {
       /* Green-ish fog color */
       static const GLfloat fogColor[4] = {0.5, 1.0, 0.5, 0};
-      glFogi(GL_FOG_MODE, GL_LINEAR);
       glFogfv(GL_FOG_COLOR, fogColor);
       glFogf(GL_FOG_START, 5.0);
       glFogf(GL_FOG_END, 25.0);
-      glEnable(GL_FOG);
    }
 #endif
 

progs/demos/descrip.mms

@@ -1,6 +1,6 @@
 # Makefile for GLUT-based demo programs for VMS
-# contributed by Jouk Jansen  joukj@crys.chem.uva.nl
-
+# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
+# Last update : 20 May 2005
 
 .first
 	define gl [--.include.gl]
@@ -22,7 +22,7 @@ LIB_DEP = [--.lib]$(GL_LIB) [--.lib]$(GLU_LIB) [--.lib]$(GLUT_LIB)
 
 
 PROGS = bounce.exe;,clearspd.exe;,drawpix.exe;,gamma.exe;,gears.exe;,\
-	glinfo.exe;,glutfx.exe;,isosurf.exe;,morph3d.exe;,osdemo.exe;,\
+	glinfo.exe;,glutfx.exe;,isosurf.exe;,morph3d.exe;,\
 	paltex.exe;,pointblast.exe;,reflect.exe;,spectex.exe;,stex3d.exe;,\
 	tessdemo.exe;,texcyl.exe;,texobj.exe;,trispd.exe;,winpos.exe;
 
@@ -53,7 +53,6 @@ glutfx.exe; : glutfx.obj $(LIB_DEP)
 isosurf.exe; : isosurf.obj $(LIB_DEP) [-.util]readtex.obj
 	cxxlink $(MMS$TARGET_NAME),[-.util]readtex.obj,$(GL_LIBS)
 morph3d.exe; : morph3d.obj $(LIB_DEP)
-osdemo.exe; : osdemo.obj $(LIB_DEP)
 paltex.exe; : paltex.obj $(LIB_DEP)
 pointblast.exe; : pointblast.obj $(LIB_DEP)
 reflect.exe; : reflect.obj [-.util]readtex.obj [-.util]showbuffer.obj\
@@ -79,7 +78,6 @@ glinfo.obj : glinfo.c
 glutfx.obj : glutfx.c
 isosurf.obj : isosurf.c
 morph3d.obj : morph3d.c
-osdemo.obj : osdemo.c
 paltex.obj : paltex.c
 pointblast.obj : pointblast.c
 reflect.obj : reflect.c

progs/demos/fire.c

@@ -304,7 +304,7 @@ printhelp(void)
    printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Help");
 
    glRasterPos2i(60, 390);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Togle Help");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Toggle Help");
 
    glRasterPos2i(60, 360);
    printstring(GLUT_BITMAP_TIMES_ROMAN_24, "t - Increase particle size");
@@ -317,9 +317,9 @@ printhelp(void)
    printstring(GLUT_BITMAP_TIMES_ROMAN_24, "R - Decrease emission radius");
 
    glRasterPos2i(60, 240);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Togle Fog");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Toggle Fog");
    glRasterPos2i(60, 210);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "s - Togle shadows");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "s - Toggle shadows");
    glRasterPos2i(60, 180);
    printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Arrow Keys - Rotate");
    glRasterPos2i(60, 150);
@@ -330,7 +330,7 @@ printhelp(void)
    glRasterPos2i(60, 90);
    if (joyavailable)
       printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "j - Togle jostick control (Joystick control available)");
+		  "j - Toggle jostick control (Joystick control available)");
    else
       printstring(GLUT_BITMAP_TIMES_ROMAN_24,
 		  "(No Joystick control available)");

progs/demos/rain.cxx

@@ -146,10 +146,10 @@ static void printhelp(void)
   printstring(GLUT_BITMAP_TIMES_ROMAN_24,"Help");
 
   glRasterPos2i(60,390);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"h - Togle Help");
+  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"h - Toggle Help");
 
   glRasterPos2i(60,360);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"f - Togle Fog");
+  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"f - Toggle Fog");
   glRasterPos2i(60,330);
   printstring(GLUT_BITMAP_TIMES_ROMAN_24,"Arrow Keys - Rotate");
   glRasterPos2i(60,300);

progs/demos/ray.c

@@ -269,13 +269,13 @@ printhelp(void)
    printstring(GLUT_BITMAP_HELVETICA_18, "Help");
 
    glRasterPos2i(60, 390);
-   printstring(GLUT_BITMAP_HELVETICA_12, "h - Togle Help");
+   printstring(GLUT_BITMAP_HELVETICA_12, "h - Toggle Help");
    glRasterPos2i(60, 370);
-   printstring(GLUT_BITMAP_HELVETICA_12, "f - Togle Fog");
+   printstring(GLUT_BITMAP_HELVETICA_12, "f - Toggle Fog");
    glRasterPos2i(60, 350);
-   printstring(GLUT_BITMAP_HELVETICA_12, "b - Togle Back face culling");
+   printstring(GLUT_BITMAP_HELVETICA_12, "b - Toggle Back face culling");
    glRasterPos2i(60, 330);
-   printstring(GLUT_BITMAP_HELVETICA_12, "p - Togle Wire frame");
+   printstring(GLUT_BITMAP_HELVETICA_12, "p - Toggle Wire frame");
    glRasterPos2i(60, 310);
    printstring(GLUT_BITMAP_HELVETICA_12, "Arrow Keys - Rotate");
    glRasterPos2i(60, 290);
@@ -286,7 +286,7 @@ printhelp(void)
    glRasterPos2i(60, 250);
    if (joyavailable)
       printstring(GLUT_BITMAP_HELVETICA_12,
-		  "j - Togle jostick control (Joystick control available)");
+		  "j - Toggle jostick control (Joystick control available)");
    else
       printstring(GLUT_BITMAP_HELVETICA_12,
 		  "(No Joystick control available)");
@@ -300,11 +300,11 @@ printhelp(void)
 
    glRasterPos2i(60, 190);
    printstring(GLUT_BITMAP_HELVETICA_12,
-	       "1 - Togle the plane texture map window");
+	       "1 - Toggle the plane texture map window");
 
    glRasterPos2i(60, 170);
    printstring(GLUT_BITMAP_HELVETICA_12,
-	       "2 - Togle the sphere texture map window");
+	       "2 - Toggle the sphere texture map window");
 }
 
 static GLboolean

progs/demos/readpix.c

@@ -39,6 +39,10 @@ static GLenum ReadType = GL_UNSIGNED_BYTE;
 #endif
 #if 0
 static GLenum ReadFormat = GL_RGB;
+static GLenum ReadType = GL_UNSIGNED_BYTE;
+#endif
+#if 0
+static GLenum ReadFormat = GL_RGB;
 static GLenum ReadType = GL_UNSIGNED_SHORT_5_6_5;
 #endif
 #if 0
@@ -96,6 +100,45 @@ SetupPixelTransfer(GLboolean invert)
 }
 
 
+/**
+ * Exercise Pixel Pack parameters by reading the image in four pieces.
+ */
+static void
+ComplexReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
+                  GLenum format, GLenum type, GLvoid *pixels)
+{
+   const GLsizei width0 = width / 2;
+   const GLsizei width1 = width - width0;
+   const GLsizei height0 = height / 2;
+   const GLsizei height1 = height - height0;
+
+   glPixelStorei(GL_PACK_ROW_LENGTH, width);
+
+   /* lower-left quadrant */
+   glReadPixels(x, y, width0, height0, format, type, pixels);
+
+   /* lower-right quadrant */
+   glPixelStorei(GL_PACK_SKIP_PIXELS, width0);
+   glReadPixels(x + width0, y, width1, height0, format, type, pixels);
+
+   /* upper-left quadrant */
+   glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
+   glPixelStorei(GL_PACK_SKIP_ROWS, height0);
+   glReadPixels(x, y + height0, width0, height1, format, type, pixels);
+
+   /* upper-right quadrant */
+   glPixelStorei(GL_PACK_SKIP_PIXELS, width0);
+   glPixelStorei(GL_PACK_SKIP_ROWS, height0);
+   glReadPixels(x + width0, y + height0, width1, height1, format, type, pixels);
+
+   /* restore defaults */
+   glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
+   glPixelStorei(GL_PACK_SKIP_ROWS, 0);
+   glPixelStorei(GL_PACK_ROW_LENGTH, ImgWidth);
+}
+
+
+
 static void
 Display( void )
 {
@@ -111,8 +154,13 @@ Display( void )
    glRasterPos2i(APosX, APosY);
    glEnable(GL_DITHER);
    SetupPixelTransfer(GL_FALSE);
+   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
    glDrawPixels(ImgWidth, ImgHeight, ImgFormat, GL_UNSIGNED_BYTE, Image);
 
+   /* might try alignment=4 here for testing */
+   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+   glPixelStorei(GL_PACK_ALIGNMENT, 1);
+
    /* do readpixels, drawpixels */
    glRasterPos2i(BPosX, 5);
    PrintString("Read/DrawPixels");
@@ -138,8 +186,14 @@ Display( void )
    else {
       /* clear the temporary image to white (helpful for debugging */
       memset(TempImage, 255, ImgWidth * ImgHeight * 4);
+#if 0
+      /* you might use this when debugging */
       glReadPixels(APosX, APosY, ImgWidth, ImgHeight,
                    ReadFormat, ReadType, TempImage);
+#else
+      ComplexReadPixels(APosX, APosY, ImgWidth, ImgHeight,
+                        ReadFormat, ReadType, TempImage);
+#endif
    }
    glRasterPos2i(BPosX, BPosY);
    glDisable(GL_DITHER);
@@ -253,14 +307,14 @@ Init( GLboolean ciMode )
 
    printf("Loaded %d by %d image\n", ImgWidth, ImgHeight );
 
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
    glPixelStorei(GL_UNPACK_ROW_LENGTH, ImgWidth);
-   glPixelStorei(GL_PACK_ALIGNMENT, 1);
    glPixelStorei(GL_PACK_ROW_LENGTH, ImgWidth);
 
    Reset();
 
-   TempImage = (GLubyte *) malloc(ImgWidth * ImgHeight * 4 * sizeof(GLubyte));
+   /* allocate an extra 1KB in case we're tinkering with pack alignment */
+   TempImage = (GLubyte *) malloc(ImgWidth * ImgHeight * 4 * sizeof(GLubyte)
+                                  + 1000);
    assert(TempImage);
 }
 

progs/demos/reflect.c

@@ -389,7 +389,7 @@ static void SpecialKey( int key, int x, int y )
 int main( int argc, char *argv[] )
 {
    glutInit(&argc, argv);
-   glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL);
+   glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL | GLUT_ALPHA);
    glutInitWindowPosition( 0, 0 );
    glutInitWindowSize( Width, Height );
    glutCreateWindow(argv[0]);

progs/demos/spectex.c

@@ -33,6 +33,7 @@ static GLint Mode = 4;
 static GLfloat Black[4] = {0.0, 0.0, 0.0, 1.0};
 static GLfloat White[4] = {1.0, 1.0, 1.0, 1.0};
 
+static GLboolean smooth = 1;
 
 static void
 Idle(void)
@@ -143,9 +144,16 @@ static void Key( unsigned char key, int x, int y )
    (void) x;
    (void) y;
    switch (key) {
-      case 27:
-         exit(0);
-         break;
+   case 27:
+      exit(0);
+      break;
+   case 's':
+      smooth = !smooth;
+      if (smooth)
+         glShadeModel(GL_SMOOTH);
+      else
+         glShadeModel(GL_FLAT);
+      break;
    }
    glutPostRedisplay();
 }
@@ -175,6 +183,8 @@ static void Init( void )
    glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
    glLightModelfv(GL_LIGHT_MODEL_AMBIENT, Black);
 
+   glShadeModel(GL_SMOOTH);
+
    glMaterialfv(GL_FRONT, GL_DIFFUSE, White);
    glMaterialfv(GL_FRONT, GL_SPECULAR, White);
    glMaterialf(GL_FRONT, GL_SHININESS, 20.0);

progs/demos/teapot.c

@@ -250,13 +250,13 @@ static void printhelp(void)
   printstring(GLUT_BITMAP_TIMES_ROMAN_24,"Help");
 
   glRasterPos2i(60,390);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"h - Togle Help");
+  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"h - Toggle Help");
   glRasterPos2i(60,360);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"t - Togle Textures");
+  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"t - Toggle Textures");
   glRasterPos2i(60,330);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"f - Togle Fog");
+  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"f - Toggle Fog");
   glRasterPos2i(60,300);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"b - Togle Back face culling");
+  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"b - Toggle Back face culling");
   glRasterPos2i(60,270);
   printstring(GLUT_BITMAP_TIMES_ROMAN_24,"Arrow Keys - Rotate");
   glRasterPos2i(60,240);
@@ -266,7 +266,7 @@ static void printhelp(void)
 
   glRasterPos2i(60,180);
   if(joyavailable)
-    printstring(GLUT_BITMAP_TIMES_ROMAN_24,"j - Togle jostick control (Joystick control available)");
+    printstring(GLUT_BITMAP_TIMES_ROMAN_24,"j - Toggle jostick control (Joystick control available)");
   else
     printstring(GLUT_BITMAP_TIMES_ROMAN_24,"(No Joystick control available)");
 }

progs/demos/terrain.c

@@ -229,15 +229,15 @@ printhelp(void)
    printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Help");
 
    glRasterPos2i(60, 390);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Togle Help");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Toggle Help");
    glRasterPos2i(60, 360);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "t - Togle Textures");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "t - Toggle Textures");
    glRasterPos2i(60, 330);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Togle Fog");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Toggle Fog");
    glRasterPos2i(60, 300);
    printstring(GLUT_BITMAP_TIMES_ROMAN_24, "p - Wire frame");
    glRasterPos2i(60, 270);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "b - Togle Back face culling");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "b - Toggle Back face culling");
    glRasterPos2i(60, 240);
    printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Arrow Keys - Rotate");
    glRasterPos2i(60, 210);
@@ -248,7 +248,7 @@ printhelp(void)
    glRasterPos2i(60, 150);
    if (joyavailable)
       printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "j - Togle jostick control (Joystick control available)");
+		  "j - Toggle jostick control (Joystick control available)");
    else
       printstring(GLUT_BITMAP_TIMES_ROMAN_24,
 		  "(No Joystick control available)");

progs/demos/texdown.c

@@ -47,7 +47,6 @@ static GLdouble DownloadRate = 0.0;  /* texels/sec */
 static GLuint Mode = 0;
 
 
-#define NUM_FORMATS 4
 struct FormatRec {
    GLenum Format;
    GLenum Type;
@@ -56,15 +55,20 @@ struct FormatRec {
 };
 
 
-static const struct FormatRec FormatTable[NUM_FORMATS] = {
+static const struct FormatRec FormatTable[] = {
   /* Format   Type                         IntFormat   TexelSize */
+   { GL_BGRA, GL_UNSIGNED_BYTE,            GL_RGBA,        4    },
    { GL_RGB,  GL_UNSIGNED_BYTE,            GL_RGB,         3    },
    { GL_RGBA, GL_UNSIGNED_BYTE,            GL_RGBA,        4    },
    { GL_RGBA, GL_UNSIGNED_BYTE,            GL_RGB,         4    },
    { GL_RGB,  GL_UNSIGNED_SHORT_5_6_5,     GL_RGB,         2    },
+   { GL_LUMINANCE, GL_UNSIGNED_BYTE,       GL_LUMINANCE,   1    },
+   { GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, GL_LUMINANCE_ALPHA,   2    },
+   { GL_ALPHA, GL_UNSIGNED_BYTE,           GL_ALPHA,       1    },
 };
 static GLint Format;
 
+#define NUM_FORMATS (sizeof(FormatTable)/sizeof(FormatTable[0]))
 
 static int
 BytesPerTexel(GLint format)
@@ -81,6 +85,14 @@ FormatStr(GLenum format)
          return "GL_RGB";
       case GL_RGBA:
          return "GL_RGBA";
+      case GL_BGRA:
+         return "GL_BGRA";
+      case GL_LUMINANCE:
+         return "GL_LUMINANCE";
+      case GL_LUMINANCE_ALPHA:
+         return "GL_LUMINANCE_ALPHA";
+      case GL_ALPHA:
+         return "GL_ALPHA";
       default:
          return "";
    }
@@ -314,6 +326,11 @@ Key(unsigned char key, int x, int y)
          Format = (Format + 1) % NUM_FORMATS;
          Mode = 0;
          break;
+      case 'F':
+         /* change format */
+         Format = (Format - 1) % NUM_FORMATS;
+         Mode = 0;
+         break;
       case 'p':
          /* toggle border */
          ScaleAndBias = !ScaleAndBias;

progs/demos/tunnel.c

@@ -300,15 +300,15 @@ printhelp(void)
    printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Help");
 
    glRasterPos2i(60, 390);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Togle Help");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Toggle Help");
    glRasterPos2i(60, 360);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "t - Togle Textures");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "t - Toggle Textures");
    glRasterPos2i(60, 330);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Togle Fog");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Toggle Fog");
    glRasterPos2i(60, 300);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "m - Togle strips");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "m - Toggle strips");
    glRasterPos2i(60, 270);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "b - Togle Back face culling");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "b - Toggle Back face culling");
    glRasterPos2i(60, 240);
    printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Arrow Keys - Rotate");
    glRasterPos2i(60, 210);
@@ -319,7 +319,7 @@ printhelp(void)
    glRasterPos2i(60, 150);
    if (joyavailable)
       printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "j - Togle jostick control (Joystick control available)");
+		  "j - Toggle jostick control (Joystick control available)");
    else
       printstring(GLUT_BITMAP_TIMES_ROMAN_24,
 		  "(No Joystick control available)");

progs/demos/tunnel2.c

@@ -324,15 +324,15 @@ printhelp(void)
    printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Help");
 
    glRasterPos2i(60, 390);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Togle Help");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Toggle Help");
    glRasterPos2i(60, 360);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "t - Togle Textures");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "t - Toggle Textures");
    glRasterPos2i(60, 330);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Togle Fog");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Toggle Fog");
    glRasterPos2i(60, 300);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "m - Togle strips");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "m - Toggle strips");
    glRasterPos2i(60, 270);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "b - Togle Back face culling");
+   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "b - Toggle Back face culling");
    glRasterPos2i(60, 240);
    printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Arrow Keys - Rotate");
    glRasterPos2i(60, 210);
@@ -343,7 +343,7 @@ printhelp(void)
    glRasterPos2i(60, 150);
    if (joyavailable)
       printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "j - Togle jostick control (Joystick control available)");
+		  "j - Toggle jostick control (Joystick control available)");
    else
       printstring(GLUT_BITMAP_TIMES_ROMAN_24,
 		  "(No Joystick control available)");

progs/egl/Makefile

@@ -0,0 +1,65 @@
+# progs/egl/Makefile
+
+TOP = ../..
+include $(TOP)/configs/current
+
+
+INCLUDE_DIRS = -I$(TOP)/include
+
+HEADERS = $(TOP)/include/GLES/egl.h
+
+PROGRAMS = \
+	demo1 \
+	demo2 \
+	demo3 \
+	eglinfo \
+	eglgears
+
+
+.c.o:
+	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+
+
+
+default: $(PROGRAMS)
+
+
+demo1: demo1.o $(LIB_DIR)/libEGL.so
+	$(CC) demo1.o -L$(LIB_DIR) -lEGL -o $@
+
+demo1.o: demo1.c $(HEADERS)
+	$(CC) -c $(CFLAGS) -I$(TOP)/include demo1.c
+
+
+demo2: demo2.o $(LIB_DIR)/libEGL.so
+	$(CC) demo2.o -L$(LIB_DIR) -lEGL $(APP_LIB_DEPS) -o $@
+
+demo2.o: demo2.c $(HEADERS)
+	$(CC) -c $(CFLAGS) -I$(TOP)/include demo2.c
+
+
+demo3: demo3.o $(LIB_DIR)/libEGL.so
+	$(CC) demo3.o -L$(LIB_DIR) -lEGL $(APP_LIB_DEPS) -o $@
+
+demo3.o: demo3.c $(HEADERS)
+	$(CC) -c $(CFLAGS) -I$(TOP)/include demo3.c
+
+
+eglinfo: eglinfo.o $(LIB_DIR)/libEGL.so
+	$(CC) eglinfo.o -L$(LIB_DIR) -lEGL -o $@
+
+eglinfo.o: eglinfo.c $(HEADERS)
+	$(CC) -c $(CFLAGS) -I$(TOP)/include eglinfo.c
+
+
+eglgears: eglgears.o $(LIB_DIR)/libEGL.so
+	$(CC) eglgears.o -L$(LIB_DIR) -lEGL $(APP_LIB_DEPS) -o $@
+
+eglgears.o: eglgears.c $(HEADERS)
+	$(CC) -c $(CFLAGS) -I$(TOP)/include eglgears.c
+
+
+clean:
+	rm -f *.o *~
+	rm -f *.so
+	rm -f $(PROGRAMS)

progs/egl/demo1.c

@@ -0,0 +1,145 @@
+/*
+ * Exercise EGL API functions
+ */
+
+#include <GLES/egl.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+/**
+ * Test EGL_MESA_screen_surface functions
+ */
+static void
+TestScreens(EGLDisplay dpy)
+{
+#define MAX 8
+   EGLScreenMESA screens[MAX];
+   EGLint numScreens;
+   EGLint i;
+
+   eglGetScreensMESA(dpy, screens, MAX, &numScreens);
+   printf("Found %d screens\n", numScreens);
+   for (i = 0; i < numScreens; i++) {
+      printf(" Screen %d handle: %d\n", i, (int) screens[i]);
+   }
+}
+
+/**
+ * Print table of all available configurations.
+ */
+static void
+PrintConfigs(EGLDisplay d)
+{
+   EGLConfig *configs;
+   EGLint numConfigs, i;
+
+   eglGetConfigs(d, NULL, 0, &numConfigs);
+   configs = malloc(sizeof(*configs) *numConfigs);
+   eglGetConfigs(d, configs, numConfigs, &numConfigs);
+
+   printf("Configurations:\n");
+   printf("     bf lv d st colorbuffer dp st   supported \n");
+   printf("  id sz  l b ro  r  g  b  a th cl   surfaces  \n");
+   printf("----------------------------------------------\n");
+   for (i = 0; i < numConfigs; i++) {
+      EGLint id, size, level;
+      EGLint red, green, blue, alpha;
+      EGLint depth, stencil;
+      EGLint surfaces;
+      EGLint doubleBuf = 1, stereo = 0;
+      char surfString[100] = "";
+
+      eglGetConfigAttrib(d, configs[i], EGL_CONFIG_ID, &id);
+      eglGetConfigAttrib(d, configs[i], EGL_BUFFER_SIZE, &size);
+      eglGetConfigAttrib(d, configs[i], EGL_LEVEL, &level);
+
+      eglGetConfigAttrib(d, configs[i], EGL_RED_SIZE, &red);
+      eglGetConfigAttrib(d, configs[i], EGL_GREEN_SIZE, &green);
+      eglGetConfigAttrib(d, configs[i], EGL_BLUE_SIZE, &blue);
+      eglGetConfigAttrib(d, configs[i], EGL_ALPHA_SIZE, &alpha);
+      eglGetConfigAttrib(d, configs[i], EGL_DEPTH_SIZE, &depth);
+      eglGetConfigAttrib(d, configs[i], EGL_STENCIL_SIZE, &stencil);
+      eglGetConfigAttrib(d, configs[i], EGL_SURFACE_TYPE, &surfaces);
+
+      if (surfaces & EGL_WINDOW_BIT)
+         strcat(surfString, "win,");
+      if (surfaces & EGL_PBUFFER_BIT)
+         strcat(surfString, "pb,");
+      if (surfaces & EGL_PIXMAP_BIT)
+         strcat(surfString, "pix,");
+      if (strlen(surfString) > 0)
+         surfString[strlen(surfString) - 1] = 0;
+
+      printf("0x%02x %2d %2d %c  %c %2d %2d %2d %2d %2d %2d   %-12s\n",
+             id, size, level,
+             doubleBuf ? 'y' : '.',
+             stereo ? 'y' : '.',
+             red, green, blue, alpha,
+             depth, stencil, surfString);
+   }
+   free(configs);
+}
+
+
+
+int
+main(int argc, char *argv[])
+{
+   int maj, min;
+   EGLContext ctx;
+   EGLSurface pbuffer;
+   EGLConfig configs[10];
+   EGLBoolean b;
+   const EGLint pbufAttribs[] = {
+      EGL_WIDTH, 500,
+      EGL_HEIGHT, 500,
+      EGL_NONE
+   };
+
+   /*
+   EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+   */
+   EGLDisplay d = eglGetDisplay("!fb_dri");
+   assert(d);
+
+   if (!eglInitialize(d, &maj, &min)) {
+      printf("demo: eglInitialize failed\n");
+      exit(1);
+   }
+
+   printf("EGL version = %d.%d\n", maj, min);
+   printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR));
+
+   PrintConfigs(d);
+
+   ctx = eglCreateContext(d, configs[0], EGL_NO_CONTEXT, NULL);
+   if (ctx == EGL_NO_CONTEXT) {
+      printf("failed to create context\n");
+      return 0;
+   }
+
+   pbuffer = eglCreatePbufferSurface(d, configs[0], pbufAttribs);
+   if (pbuffer == EGL_NO_SURFACE) {
+      printf("failed to create pbuffer\n");
+      return 0;
+   }
+
+   b = eglMakeCurrent(d, pbuffer, pbuffer, ctx);
+   if (!b) {
+      printf("make current failed\n");
+      return 0;
+   }
+
+   b = eglMakeCurrent(d, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+
+   TestScreens(d);
+
+   eglDestroySurface(d, pbuffer);
+   eglDestroyContext(d, ctx);
+   eglTerminate(d);
+
+   return 0;
+}

progs/egl/demo2.c

@@ -0,0 +1,190 @@
+/*
+ * Exercise EGL API functions
+ */
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <GLES/egl.h>
+
+/*#define FRONTBUFFER*/
+
+static void _subset_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
+{
+   glBegin( GL_QUADS );
+   glVertex2f( x1, y1 );
+   glVertex2f( x2, y1 );
+   glVertex2f( x2, y2 );
+   glVertex2f( x1, y2 );
+   glEnd();
+}
+
+
+static void redraw(EGLDisplay dpy, EGLSurface surf, int rot)
+{
+   printf("Redraw event\n");
+
+#ifdef FRONTBUFFER
+    glDrawBuffer( GL_FRONT ); 
+#else
+    glDrawBuffer( GL_BACK );
+#endif
+
+   glClearColor( rand()/(float)RAND_MAX, 
+		 rand()/(float)RAND_MAX, 
+		 rand()/(float)RAND_MAX,
+		 1);
+
+   glClear( GL_COLOR_BUFFER_BIT ); 
+
+   glColor3f( rand()/(float)RAND_MAX, 
+	      rand()/(float)RAND_MAX, 
+	      rand()/(float)RAND_MAX );
+   glPushMatrix();
+   glRotatef(rot, 0, 0, 1);
+   glScalef(.5, .5, .5);
+   _subset_Rectf( -1, -1, 1, 1 );
+   glPopMatrix();
+
+#ifdef FRONTBUFFER
+   glFlush();
+#else
+   eglSwapBuffers( dpy, surf ); 
+#endif
+   glFinish();
+}
+
+
+/**
+ * Test EGL_MESA_screen_surface functions
+ */
+static void
+TestScreens(EGLDisplay dpy)
+{
+#define MAX 8
+   EGLScreenMESA screens[MAX];
+   EGLint numScreens;
+   EGLint i;
+
+   eglGetScreensMESA(dpy, screens, MAX, &numScreens);
+   printf("Found %d screens\n", numScreens);
+   for (i = 0; i < numScreens; i++) {
+      printf(" Screen %d handle: %d\n", i, (int) screens[i]);
+   }
+}
+
+
+int
+main(int argc, char *argv[])
+{
+   int maj, min;
+   EGLContext ctx;
+   EGLSurface pbuffer, screen_surf;
+   EGLConfig configs[10];
+   EGLint numConfigs, i;
+   EGLBoolean b;
+   const EGLint pbufAttribs[] = {
+      EGL_WIDTH, 500,
+      EGL_HEIGHT, 500,
+      EGL_NONE
+   };
+   const EGLint screenAttribs[] = {
+      EGL_WIDTH, 1024,
+      EGL_HEIGHT, 768,
+      EGL_NONE
+   };
+   EGLModeMESA mode;
+   EGLScreenMESA screen;
+   EGLint count;
+
+   /*
+   EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+   */
+   EGLDisplay d = eglGetDisplay("!fb_dri");
+   assert(d);
+
+   if (!eglInitialize(d, &maj, &min)) {
+      printf("demo: eglInitialize failed\n");
+      exit(1);
+   }
+
+   printf("EGL version = %d.%d\n", maj, min);
+   printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR));
+
+   eglGetConfigs(d, configs, 10, &numConfigs);
+   printf("Got %d EGL configs:\n", numConfigs);
+   for (i = 0; i < numConfigs; i++) {
+      EGLint id, red, depth;
+      eglGetConfigAttrib(d, configs[i], EGL_CONFIG_ID, &id);
+      eglGetConfigAttrib(d, configs[i], EGL_RED_SIZE, &red);
+      eglGetConfigAttrib(d, configs[i], EGL_DEPTH_SIZE, &depth);
+      printf("%2d:  Red Size = %d  Depth Size = %d\n", id, red, depth);
+   }
+   
+   eglGetScreensMESA(d, &screen, 1, &count);
+   eglGetModesMESA(d, screen, &mode, 1, &count);
+
+   ctx = eglCreateContext(d, configs[0], EGL_NO_CONTEXT, NULL);
+   if (ctx == EGL_NO_CONTEXT) {
+      printf("failed to create context\n");
+      return 0;
+   }
+
+   pbuffer = eglCreatePbufferSurface(d, configs[0], pbufAttribs);
+   if (pbuffer == EGL_NO_SURFACE) {
+      printf("failed to create pbuffer\n");
+      return 0;
+   }
+
+   b = eglMakeCurrent(d, pbuffer, pbuffer, ctx);
+   if (!b) {
+      printf("make current failed\n");
+      return 0;
+   }
+
+   b = eglMakeCurrent(d, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+
+   screen_surf = eglCreateScreenSurfaceMESA(d, configs[0], screenAttribs);
+   if (screen_surf == EGL_NO_SURFACE) {
+      printf("failed to create screen surface\n");
+      return 0;
+   }
+   
+   eglShowSurfaceMESA(d, screen, screen_surf, mode);
+
+   b = eglMakeCurrent(d, screen_surf, screen_surf, ctx);
+   if (!b) {
+      printf("make current failed\n");
+      return 0;
+   }
+
+   glViewport(0, 0, 1024, 768);
+   glDrawBuffer( GL_FRONT ); 
+
+   glClearColor( 0, 
+		 1.0, 
+		 0,
+		 1);
+
+   glClear( GL_COLOR_BUFFER_BIT ); 
+   
+      
+   TestScreens(d);
+
+   glShadeModel( GL_FLAT );
+   
+   for (i = 0; i < 6; i++) {
+      redraw(d, screen_surf, i*10 );
+
+      printf("sleep(1)\n");   
+      sleep(1);  
+   }
+
+   eglDestroySurface(d, pbuffer);
+   eglDestroyContext(d, ctx);
+   eglTerminate(d);
+
+   return 0;
+}

progs/egl/demo3.c

@@ -0,0 +1,637 @@
+/*
+ * Exercise EGL API functions
+ */
+
+#include <GLES/egl.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+
+#define PIXEL_CENTER(x) ((long)(x) + 0.5)
+
+#define GAP 10
+#define ROWS 3
+#define COLS 4
+
+#define OPENGL_WIDTH 48
+#define OPENGL_HEIGHT 13
+
+
+GLenum rgb, doubleBuffer, windType;
+GLint windW, windH;
+
+GLenum mode1, mode2;
+GLint boxW, boxH;
+GLubyte OpenGL_bits[] = {
+   0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
+   0x7f, 0xfb, 0xff, 0xff, 0xff, 0x01,
+   0x7f, 0xfb, 0xff, 0xff, 0xff, 0x01, 
+   0x00, 0x03, 0x00, 0x00, 0x00, 0x00,
+   0x3e, 0x8f, 0xb7, 0xf9, 0xfc, 0x01, 
+   0x63, 0xdb, 0xb0, 0x8d, 0x0d, 0x00,
+   0x63, 0xdb, 0xb7, 0x8d, 0x0d, 0x00, 
+   0x63, 0xdb, 0xb6, 0x8d, 0x0d, 0x00,
+   0x63, 0x8f, 0xf3, 0xcc, 0x0d, 0x00, 
+   0x63, 0x00, 0x00, 0x0c, 0x4c, 0x0a,
+   0x63, 0x00, 0x00, 0x0c, 0x4c, 0x0e, 
+   0x63, 0x00, 0x00, 0x8c, 0xed, 0x0e,
+   0x3e, 0x00, 0x00, 0xf8, 0x0c, 0x00, 
+};
+
+
+static void Init(void)
+{
+
+    mode1 = GL_TRUE;
+    mode2 = GL_TRUE;
+}
+
+static void Reshape(int width, int height)
+{
+
+    windW = (GLint)width;
+    windH = (GLint)height;
+}
+
+#if 0
+static void RotateColorMask(void)
+{
+    static GLint rotation = 0;
+    
+    rotation = (rotation + 1) & 0x3;
+    switch (rotation) {
+      case 0:
+	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+	glIndexMask( 0xff );
+	break;
+      case 1:
+	glColorMask(GL_FALSE, GL_TRUE, GL_TRUE, GL_TRUE);
+	glIndexMask(0xFE);
+	break;
+      case 2:
+	glColorMask(GL_TRUE, GL_FALSE, GL_TRUE, GL_TRUE);
+	glIndexMask(0xFD);
+	break;
+      case 3:
+	glColorMask(GL_TRUE, GL_TRUE, GL_FALSE, GL_TRUE);
+	glIndexMask(0xFB);
+	break;
+    }
+}
+#endif
+
+static void Viewport(GLint row, GLint column)
+{
+    GLint x, y;
+
+    boxW = (windW - (COLS + 1) * GAP) / COLS;
+    boxH = (windH - (ROWS + 1) * GAP) / ROWS;
+
+    x = GAP + column * (boxW + GAP);
+    y = GAP + row * (boxH + GAP);
+
+    glViewport(x, y, boxW, boxH);
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(-boxW/2, boxW/2, -boxH/2, boxH/2, 0.0, 1.0);
+    glMatrixMode(GL_MODELVIEW);
+
+    glEnable(GL_SCISSOR_TEST);
+    glScissor(x, y, boxW, boxH);
+}
+
+enum {
+    COLOR_BLACK = 0,
+    COLOR_RED,
+    COLOR_GREEN,
+    COLOR_YELLOW,
+    COLOR_BLUE,
+    COLOR_MAGENTA,
+    COLOR_CYAN,
+    COLOR_WHITE
+};
+
+static float RGBMap[9][3] = {
+    {0, 0, 0},
+    {1, 0, 0},
+    {0, 1, 0},
+    {1, 1, 0},
+    {0, 0, 1},
+    {1, 0, 1},
+    {0, 1, 1},
+    {1, 1, 1},
+    {0.5, 0.5, 0.5}
+};
+
+static void SetColor(int c)
+{
+     glColor3fv(RGBMap[c]);
+}
+
+static void Point(void)
+{
+    GLint i;
+
+    glBegin(GL_POINTS);
+	SetColor(COLOR_WHITE);
+	glVertex2i(0, 0);
+	for (i = 1; i < 8; i++) {
+	    GLint j = i * 2;
+	    SetColor(COLOR_BLACK+i);
+	    glVertex2i(-j, -j);
+	    glVertex2i(-j, 0);
+	    glVertex2i(-j, j);
+	    glVertex2i(0, j);
+	    glVertex2i(j, j);
+	    glVertex2i(j, 0);
+	    glVertex2i(j, -j);
+	    glVertex2i(0, -j);
+	}
+    glEnd();
+}
+
+static void Lines(void)
+{
+    GLint i;
+
+    glPushMatrix();
+
+    glTranslatef(-12, 0, 0);
+    for (i = 1; i < 8; i++) {
+	SetColor(COLOR_BLACK+i);
+	glBegin(GL_LINES);
+	    glVertex2i(-boxW/4, -boxH/4);
+	    glVertex2i(boxW/4, boxH/4);
+	glEnd();
+	glTranslatef(4, 0, 0);
+    }
+
+    glPopMatrix();
+
+    glBegin(GL_LINES);
+	glVertex2i(0, 0);
+    glEnd();
+}
+
+static void LineStrip(void)
+{
+
+    glBegin(GL_LINE_STRIP);
+	SetColor(COLOR_RED);
+	glVertex2f(PIXEL_CENTER(-boxW/4), PIXEL_CENTER(-boxH/4));
+	SetColor(COLOR_GREEN);
+	glVertex2f(PIXEL_CENTER(-boxW/4), PIXEL_CENTER(boxH/4));
+	SetColor(COLOR_BLUE);
+	glVertex2f(PIXEL_CENTER(boxW/4), PIXEL_CENTER(boxH/4));
+	SetColor(COLOR_WHITE);
+	glVertex2f(PIXEL_CENTER(boxW/4), PIXEL_CENTER(-boxH/4));
+    glEnd();
+
+    glBegin(GL_LINE_STRIP);
+	glVertex2i(0, 0);
+    glEnd();
+}
+
+static void LineLoop(void)
+{
+
+    glBegin(GL_LINE_LOOP);
+	SetColor(COLOR_RED);
+	glVertex2f(PIXEL_CENTER(-boxW/4), PIXEL_CENTER(-boxH/4));
+	SetColor(COLOR_GREEN);
+	glVertex2f(PIXEL_CENTER(-boxW/4), PIXEL_CENTER(boxH/4));
+	SetColor(COLOR_BLUE);
+	glVertex2f(PIXEL_CENTER(boxW/4), PIXEL_CENTER(boxH/4));
+	SetColor(COLOR_WHITE);
+	glVertex2f(PIXEL_CENTER(boxW/4), PIXEL_CENTER(-boxH/4));
+    glEnd();
+
+    glEnable(GL_LOGIC_OP);
+    glLogicOp(GL_XOR);
+
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_ONE, GL_ONE);
+
+    SetColor(COLOR_MAGENTA);
+    glBegin(GL_LINE_LOOP);
+	glVertex2f(PIXEL_CENTER(-boxW/8), PIXEL_CENTER(-boxH/8));
+	glVertex2f(PIXEL_CENTER(-boxW/8), PIXEL_CENTER(boxH/8));
+    glEnd();
+    glBegin(GL_LINE_LOOP);
+	glVertex2f(PIXEL_CENTER(-boxW/8), PIXEL_CENTER(boxH/8+5));
+	glVertex2f(PIXEL_CENTER(boxW/8), PIXEL_CENTER(boxH/8+5));
+    glEnd();
+    glDisable(GL_LOGIC_OP);
+    glDisable(GL_BLEND);
+
+    SetColor(COLOR_GREEN);
+    glBegin(GL_POINTS);
+	glVertex2i(0, 0);
+    glEnd();
+
+    glBegin(GL_LINE_LOOP);
+	glVertex2i(0, 0);
+    glEnd();
+}
+
+static void Bitmap(void)
+{
+
+    glBegin(GL_LINES);
+	SetColor(COLOR_GREEN);
+	glVertex2i(-boxW/2, 0);
+	glVertex2i(boxW/2, 0);
+	glVertex2i(0, -boxH/2);
+	glVertex2i(0, boxH/2);
+	SetColor(COLOR_RED);
+	glVertex2i(0, -3);
+	glVertex2i(0, -3+OPENGL_HEIGHT);
+	SetColor(COLOR_BLUE);
+	glVertex2i(0, -3);
+	glVertex2i(OPENGL_WIDTH, -3);
+    glEnd();
+
+    SetColor(COLOR_GREEN);
+
+    glPixelStorei(GL_UNPACK_LSB_FIRST, GL_TRUE);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+    glRasterPos2i(0, 0);
+    glBitmap(OPENGL_WIDTH, OPENGL_HEIGHT, 0, 3, 0.0, 0.0, OpenGL_bits);
+}
+
+static void Triangles(void)
+{
+
+    glBegin(GL_TRIANGLES);
+	SetColor(COLOR_GREEN);
+	glVertex2i(-boxW/4, -boxH/4);
+	SetColor(COLOR_RED);
+	glVertex2i(-boxW/8, -boxH/16);
+	SetColor(COLOR_BLUE);
+	glVertex2i(boxW/8, -boxH/16);
+
+	SetColor(COLOR_GREEN);
+	glVertex2i(-boxW/4, boxH/4);
+	SetColor(COLOR_RED);
+	glVertex2i(-boxW/8, boxH/16);
+	SetColor(COLOR_BLUE);
+	glVertex2i(boxW/8, boxH/16);
+    glEnd();
+
+    glBegin(GL_TRIANGLES);
+	glVertex2i(0, 0);
+	glVertex2i(-100, 100);
+    glEnd();
+}
+
+static void TriangleStrip(void)
+{
+
+    glBegin(GL_TRIANGLE_STRIP);
+	SetColor(COLOR_GREEN);
+	glVertex2i(-boxW/4, -boxH/4);
+	SetColor(COLOR_RED);
+	glVertex2i(-boxW/4, boxH/4);
+	SetColor(COLOR_BLUE);
+	glVertex2i(0, -boxH/4);
+	SetColor(COLOR_WHITE);
+	glVertex2i(0, boxH/4);
+	SetColor(COLOR_CYAN);
+	glVertex2i(boxW/4, -boxH/4);
+	SetColor(COLOR_YELLOW);
+	glVertex2i(boxW/4, boxH/4);
+    glEnd();
+
+    glBegin(GL_TRIANGLE_STRIP);
+	glVertex2i(0, 0);
+	glVertex2i(-100, 100);
+    glEnd();
+}
+
+static void TriangleFan(void)
+{
+    GLint vx[8][2];
+    GLint x0, y0, x1, y1, x2, y2, x3, y3;
+    GLint i;
+
+    y0 = -boxH/4;
+    y1 = y0 + boxH/2/3;
+    y2 = y1 + boxH/2/3;
+    y3 = boxH/4;
+    x0 = -boxW/4;
+    x1 = x0 + boxW/2/3;
+    x2 = x1 + boxW/2/3;
+    x3 = boxW/4;
+
+    vx[0][0] = x0; vx[0][1] = y1;
+    vx[1][0] = x0; vx[1][1] = y2;
+    vx[2][0] = x1; vx[2][1] = y3;
+    vx[3][0] = x2; vx[3][1] = y3;
+    vx[4][0] = x3; vx[4][1] = y2;
+    vx[5][0] = x3; vx[5][1] = y1;
+    vx[6][0] = x2; vx[6][1] = y0;
+    vx[7][0] = x1; vx[7][1] = y0;
+
+    glBegin(GL_TRIANGLE_FAN);
+	SetColor(COLOR_WHITE);
+	glVertex2i(0, 0);
+	for (i = 0; i < 8; i++) {
+	    SetColor(COLOR_WHITE-i);
+	    glVertex2iv(vx[i]);
+	}
+    glEnd();
+
+    glBegin(GL_TRIANGLE_FAN);
+	glVertex2i(0, 0);
+	glVertex2i(-100, 100);
+    glEnd();
+}
+
+static void Rect(void)
+{
+
+    SetColor(COLOR_GREEN);
+    glRecti(-boxW/4, -boxH/4, boxW/4, boxH/4);
+}
+
+static void PolygonFunc(void)
+{
+    GLint vx[8][2];
+    GLint x0, y0, x1, y1, x2, y2, x3, y3;
+    GLint i;
+
+    y0 = -boxH/4;
+    y1 = y0 + boxH/2/3;
+    y2 = y1 + boxH/2/3;
+    y3 = boxH/4;
+    x0 = -boxW/4;
+    x1 = x0 + boxW/2/3;
+    x2 = x1 + boxW/2/3;
+    x3 = boxW/4;
+
+    vx[0][0] = x0; vx[0][1] = y1;
+    vx[1][0] = x0; vx[1][1] = y2;
+    vx[2][0] = x1; vx[2][1] = y3;
+    vx[3][0] = x2; vx[3][1] = y3;
+    vx[4][0] = x3; vx[4][1] = y2;
+    vx[5][0] = x3; vx[5][1] = y1;
+    vx[6][0] = x2; vx[6][1] = y0;
+    vx[7][0] = x1; vx[7][1] = y0;
+
+    glBegin(GL_POLYGON);
+	for (i = 0; i < 8; i++) {
+	    SetColor(COLOR_WHITE-i);
+	    glVertex2iv(vx[i]);
+	}
+    glEnd();
+
+    glBegin(GL_POLYGON);
+	glVertex2i(0, 0);
+	glVertex2i(100, 100);
+    glEnd();
+}
+
+static void Quads(void)
+{
+
+    glBegin(GL_QUADS);
+	SetColor(COLOR_GREEN);
+	glVertex2i(-boxW/4, -boxH/4);
+	SetColor(COLOR_RED);
+	glVertex2i(-boxW/8, -boxH/16);
+	SetColor(COLOR_BLUE);
+	glVertex2i(boxW/8, -boxH/16);
+	SetColor(COLOR_WHITE);
+	glVertex2i(boxW/4, -boxH/4);
+
+	SetColor(COLOR_GREEN);
+	glVertex2i(-boxW/4, boxH/4);
+	SetColor(COLOR_RED);
+	glVertex2i(-boxW/8, boxH/16);
+	SetColor(COLOR_BLUE);
+	glVertex2i(boxW/8, boxH/16);
+	SetColor(COLOR_WHITE);
+	glVertex2i(boxW/4, boxH/4);
+    glEnd();
+
+    glBegin(GL_QUADS);
+	glVertex2i(0, 0);
+	glVertex2i(100, 100);
+	glVertex2i(-100, 100);
+    glEnd();
+}
+
+static void QuadStrip(void)
+{
+
+    glBegin(GL_QUAD_STRIP);
+	SetColor(COLOR_GREEN);
+	glVertex2i(-boxW/4, -boxH/4);
+	SetColor(COLOR_RED);
+	glVertex2i(-boxW/4, boxH/4);
+	SetColor(COLOR_BLUE);
+	glVertex2i(0, -boxH/4);
+	SetColor(COLOR_WHITE);
+	glVertex2i(0, boxH/4);
+	SetColor(COLOR_CYAN);
+	glVertex2i(boxW/4, -boxH/4);
+	SetColor(COLOR_YELLOW);
+	glVertex2i(boxW/4, boxH/4);
+    glEnd();
+
+    glBegin(GL_QUAD_STRIP);
+	glVertex2i(0, 0);
+	glVertex2i(100, 100);
+	glVertex2i(-100, 100);
+    glEnd();
+}
+
+static void Draw(EGLDisplay dpy, EGLSurface surf)
+{
+
+    glViewport(0, 0, windW, windH);
+    glDisable(GL_SCISSOR_TEST);
+
+    glPushAttrib(GL_COLOR_BUFFER_BIT);
+
+    glColorMask(1, 1, 1, 1);
+    glIndexMask(~0);
+
+    glClearColor(0.0, 0.0, 0.0, 0.0);
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    glPopAttrib();
+
+    if (mode1) {
+	glShadeModel(GL_SMOOTH);
+    } else {
+	glShadeModel(GL_FLAT);
+    }
+
+    if (mode2) {
+	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+    } else {
+	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+    }
+
+    Viewport(0, 0); Point();
+    Viewport(0, 1); Lines();
+    Viewport(0, 2); LineStrip();
+    Viewport(0, 3); LineLoop();
+
+    Viewport(1, 0); Bitmap();
+
+    Viewport(1, 1); TriangleFan();
+    Viewport(1, 2); Triangles();
+    Viewport(1, 3); TriangleStrip();
+
+    Viewport(2, 0); Rect();
+    Viewport(2, 1); PolygonFunc();
+    Viewport(2, 2); Quads();
+    Viewport(2, 3); QuadStrip();
+
+    glFlush();
+
+    if (doubleBuffer) {
+	eglSwapBuffers(dpy, surf);
+    }
+}
+
+static void
+write_ppm(const char *filename, const GLubyte *buffer, int width, int height)
+{
+   const int binary = 0;
+   FILE *f = fopen( filename, "w" );
+   if (f) {
+      int i, x, y;
+      const GLubyte *ptr = buffer;
+      if (binary) {
+         fprintf(f,"P6\n");
+         fprintf(f,"# ppm-file created by osdemo.c\n");
+         fprintf(f,"%i %i\n", width,height);
+         fprintf(f,"255\n");
+         fclose(f);
+         f = fopen( filename, "ab" );  /* reopen in binary append mode */
+         for (y=height-1; y>=0; y--) {
+            for (x=0; x<width; x++) {
+               i = (y*width + x) * 4;
+               fputc(ptr[i], f);   /* write red */
+               fputc(ptr[i+1], f); /* write green */
+               fputc(ptr[i+2], f); /* write blue */
+            }
+         }
+      }
+      else {
+         /*ASCII*/
+         int counter = 0;
+         fprintf(f,"P3\n");
+         fprintf(f,"# ascii ppm file created by osdemo.c\n");
+         fprintf(f,"%i %i\n", width, height);
+         fprintf(f,"255\n");
+         for (y=height-1; y>=0; y--) {
+            for (x=0; x<width; x++) {
+               i = (y*width + x) * 4;
+               fprintf(f, " %3d %3d %3d", ptr[i], ptr[i+1], ptr[i+2]);
+               counter++;
+               if (counter % 5 == 0)
+                  fprintf(f, "\n");
+            }
+         }
+      }
+      fclose(f);
+   }
+}
+
+#include "../src/egl/main/egldisplay.h"
+
+typedef struct fb_display
+{
+   _EGLDisplay Base;  /* base class/object */
+   void *pFB;
+} fbDisplay;
+
+
+int
+main(int argc, char *argv[])
+{
+   int maj, min;
+   EGLContext ctx;
+   EGLSurface screen_surf;
+   EGLConfig configs[10];
+   EGLScreenMESA screen;
+   EGLModeMESA mode;
+   EGLint numConfigs, count;
+   EGLBoolean b;
+   const EGLint screenAttribs[] = {
+      EGL_WIDTH, 1024,
+      EGL_HEIGHT, 768,
+      EGL_NONE
+   };
+
+   /*
+   EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+   */
+   EGLDisplay d = eglGetDisplay("!fb_dri");
+   assert(d);
+
+   if (!eglInitialize(d, &maj, &min)) {
+      printf("demo: eglInitialize failed\n");
+      exit(1);
+   }
+
+   printf("EGL version = %d.%d\n", maj, min);
+   printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR));
+
+   eglGetConfigs(d, configs, 10, &numConfigs);
+   eglGetScreensMESA(d, &screen, 1, &count);
+   eglGetModesMESA(d, screen, &mode, 1, &count);
+
+   ctx = eglCreateContext(d, configs[0], EGL_NO_CONTEXT, NULL);
+   if (ctx == EGL_NO_CONTEXT) {
+      printf("failed to create context\n");
+      return 0;
+   }
+
+   screen_surf = eglCreateScreenSurfaceMESA(d, configs[0], screenAttribs);
+   if (screen_surf == EGL_NO_SURFACE) {
+      printf("failed to create screen surface\n");
+      return 0;
+   }
+   
+   eglShowSurfaceMESA(d, screen, screen_surf, mode);
+
+   b = eglMakeCurrent(d, screen_surf, screen_surf, ctx);
+   if (!b) {
+      printf("make current failed\n");
+      return 0;
+   }
+
+   Init();   
+   Reshape(1024, 768);
+
+   glDrawBuffer( GL_FRONT ); 
+   glClearColor( 0, 
+		 1.0, 
+		 0,
+		 1);
+
+   glClear( GL_COLOR_BUFFER_BIT ); 
+
+   doubleBuffer = 1;   
+   glDrawBuffer( GL_BACK ); 
+
+   Draw(d, screen_surf);
+   
+   write_ppm("dump.ppm", ((struct fb_display *)_eglLookupDisplay(d))->pFB, 1024, 768);
+   
+   eglDestroySurface(d, screen_surf);
+   eglDestroyContext(d, ctx);
+   eglTerminate(d);
+
+   return 0;
+}

progs/egl/eglgears.c

@@ -0,0 +1,446 @@
+/*
+ * Copyright (C) 1999-2001  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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL 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.
+ */
+
+/*
+ * This is a port of the infamous "glxgears" demo to straight EGL
+ * Port by Dane Rushton 10 July 2005
+ * 
+ * No command line options.
+ * Program runs for 5 seconds then exits, outputing framerate to console
+ */
+
+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <GL/gl.h>
+#include <GLES/egl.h>
+#include <assert.h>
+
+
+#define BENCHMARK
+
+#ifdef BENCHMARK
+
+/* XXX this probably isn't very portable */
+
+#include <sys/time.h>
+#include <unistd.h>
+
+/* return current time (in seconds) */
+static double
+current_time(void)
+{
+   struct timeval tv;
+#ifdef __VMS
+   (void) gettimeofday(&tv, NULL );
+#else
+   struct timezone tz;
+   (void) gettimeofday(&tv, &tz);
+#endif
+   return (double) tv.tv_sec + tv.tv_usec / 1000000.0;
+}
+
+#else /*BENCHMARK*/
+
+/* dummy */
+static double
+current_time(void)
+{
+   /* update this function for other platforms! */
+   static double t = 0.0;
+   static int warn = 1;
+   if (warn) {
+      fprintf(stderr, "Warning: current_time() not implemented!!\n");
+      warn = 0;
+   }
+   return t += 1.0;
+}
+
+#endif /*BENCHMARK*/
+
+
+#ifndef M_PI
+#define M_PI 3.14159265
+#endif
+
+
+static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
+static GLint gear1, gear2, gear3;
+static GLfloat angle = 0.0;
+
+static GLfloat eyesep = 5.0;		/* Eye separation. */
+static GLfloat fix_point = 40.0;	/* Fixation point distance.  */
+static GLfloat left, right, asp;	/* Stereo frustum params.  */
+
+
+/*
+ *
+ *  Draw a gear wheel.  You'll probably want to call this function when
+ *  building a display list since we do a lot of trig here.
+ * 
+ *  Input:  inner_radius - radius of hole at center
+ *          outer_radius - radius at center of teeth
+ *          width - width of gear
+ *          teeth - number of teeth
+ *          tooth_depth - depth of tooth
+ */
+static void
+gear(GLfloat inner_radius, GLfloat outer_radius, GLfloat width,
+     GLint teeth, GLfloat tooth_depth)
+{
+   GLint i;
+   GLfloat r0, r1, r2;
+   GLfloat angle, da;
+   GLfloat u, v, len;
+
+   r0 = inner_radius;
+   r1 = outer_radius - tooth_depth / 2.0;
+   r2 = outer_radius + tooth_depth / 2.0;
+
+   da = 2.0 * M_PI / teeth / 4.0;
+
+   glShadeModel(GL_FLAT);
+
+   glNormal3f(0.0, 0.0, 1.0);
+
+   /* draw front face */
+   glBegin(GL_QUAD_STRIP);
+   for (i = 0; i <= teeth; i++) {
+      angle = i * 2.0 * M_PI / teeth;
+      glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5);
+      glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5);
+      if (i < teeth) {
+	 glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5);
+	 glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da),
+		    width * 0.5);
+      }
+   }
+   glEnd();
+
+   /* draw front sides of teeth */
+   glBegin(GL_QUADS);
+   da = 2.0 * M_PI / teeth / 4.0;
+   for (i = 0; i < teeth; i++) {
+      angle = i * 2.0 * M_PI / teeth;
+
+      glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5);
+      glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), width * 0.5);
+      glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da),
+		 width * 0.5);
+      glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da),
+		 width * 0.5);
+   }
+   glEnd();
+
+   glNormal3f(0.0, 0.0, -1.0);
+
+   /* draw back face */
+   glBegin(GL_QUAD_STRIP);
+   for (i = 0; i <= teeth; i++) {
+      angle = i * 2.0 * M_PI / teeth;
+      glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5);
+      glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5);
+      if (i < teeth) {
+	 glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da),
+		    -width * 0.5);
+	 glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5);
+      }
+   }
+   glEnd();
+
+   /* draw back sides of teeth */
+   glBegin(GL_QUADS);
+   da = 2.0 * M_PI / teeth / 4.0;
+   for (i = 0; i < teeth; i++) {
+      angle = i * 2.0 * M_PI / teeth;
+
+      glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da),
+		 -width * 0.5);
+      glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da),
+		 -width * 0.5);
+      glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), -width * 0.5);
+      glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5);
+   }
+   glEnd();
+
+   /* draw outward faces of teeth */
+   glBegin(GL_QUAD_STRIP);
+   for (i = 0; i < teeth; i++) {
+      angle = i * 2.0 * M_PI / teeth;
+
+      glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5);
+      glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5);
+      u = r2 * cos(angle + da) - r1 * cos(angle);
+      v = r2 * sin(angle + da) - r1 * sin(angle);
+      len = sqrt(u * u + v * v);
+      u /= len;
+      v /= len;
+      glNormal3f(v, -u, 0.0);
+      glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), width * 0.5);
+      glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), -width * 0.5);
+      glNormal3f(cos(angle), sin(angle), 0.0);
+      glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da),
+		 width * 0.5);
+      glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da),
+		 -width * 0.5);
+      u = r1 * cos(angle + 3 * da) - r2 * cos(angle + 2 * da);
+      v = r1 * sin(angle + 3 * da) - r2 * sin(angle + 2 * da);
+      glNormal3f(v, -u, 0.0);
+      glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da),
+		 width * 0.5);
+      glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da),
+		 -width * 0.5);
+      glNormal3f(cos(angle), sin(angle), 0.0);
+   }
+
+   glVertex3f(r1 * cos(0), r1 * sin(0), width * 0.5);
+   glVertex3f(r1 * cos(0), r1 * sin(0), -width * 0.5);
+
+   glEnd();
+
+   glShadeModel(GL_SMOOTH);
+
+   /* draw inside radius cylinder */
+   glBegin(GL_QUAD_STRIP);
+   for (i = 0; i <= teeth; i++) {
+      angle = i * 2.0 * M_PI / teeth;
+      glNormal3f(-cos(angle), -sin(angle), 0.0);
+      glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5);
+      glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5);
+   }
+   glEnd();
+}
+
+
+static void
+draw(void)
+{
+   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+   glPushMatrix();
+   glRotatef(view_rotx, 1.0, 0.0, 0.0);
+   glRotatef(view_roty, 0.0, 1.0, 0.0);
+   glRotatef(view_rotz, 0.0, 0.0, 1.0);
+
+   glPushMatrix();
+   glTranslatef(-3.0, -2.0, 0.0);
+   glRotatef(angle, 0.0, 0.0, 1.0);
+   glCallList(gear1);
+   glPopMatrix();
+
+   glPushMatrix();
+   glTranslatef(3.1, -2.0, 0.0);
+   glRotatef(-2.0 * angle - 9.0, 0.0, 0.0, 1.0);
+   glCallList(gear2);
+   glPopMatrix();
+
+   glPushMatrix();
+   glTranslatef(-3.1, 4.2, 0.0);
+   glRotatef(-2.0 * angle - 25.0, 0.0, 0.0, 1.0);
+   glCallList(gear3);
+   glPopMatrix();
+
+   glPopMatrix();
+}
+
+
+/* new window size or exposure */
+static void
+reshape(int width, int height)
+{
+   glViewport(0, 0, (GLint) width, (GLint) height);
+
+   GLfloat h = (GLfloat) height / (GLfloat) width;
+
+   glMatrixMode(GL_PROJECTION);
+   glLoadIdentity();
+   glFrustum(-1.0, 1.0, -h, h, 5.0, 60.0);
+   
+   glMatrixMode(GL_MODELVIEW);
+   glLoadIdentity();
+   glTranslatef(0.0, 0.0, -40.0);
+}
+   
+
+
+static void
+init(void)
+{
+   static GLfloat pos[4] = { 5.0, 5.0, 10.0, 0.0 };
+   static GLfloat red[4] = { 0.8, 0.1, 0.0, 1.0 };
+   static GLfloat green[4] = { 0.0, 0.8, 0.2, 1.0 };
+   static GLfloat blue[4] = { 0.2, 0.2, 1.0, 1.0 };
+
+   glLightfv(GL_LIGHT0, GL_POSITION, pos);
+   glEnable(GL_CULL_FACE);
+   glEnable(GL_LIGHTING);
+   glEnable(GL_LIGHT0);
+   glEnable(GL_DEPTH_TEST);
+
+   /* make the gears */
+   gear1 = glGenLists(1);
+   glNewList(gear1, GL_COMPILE);
+   glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, red);
+   gear(1.0, 4.0, 1.0, 20, 0.7);
+   glEndList();
+
+   gear2 = glGenLists(1);
+   glNewList(gear2, GL_COMPILE);
+   glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, green);
+   gear(0.5, 2.0, 2.0, 10, 0.7);
+   glEndList();
+
+   gear3 = glGenLists(1);
+   glNewList(gear3, GL_COMPILE);
+   glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, blue);
+   gear(1.3, 2.0, 0.5, 10, 0.7);
+   glEndList();
+
+   glEnable(GL_NORMALIZE);
+}
+
+
+
+
+static void run_gears(EGLDisplay dpy, EGLSurface surf, int ttr)
+{
+	double st = current_time();
+	double ct = st;
+	int frames = 0;
+	while (ct - st < ttr)
+	{
+		double tt = current_time();
+		double dt = tt - ct;
+		ct = tt;
+		
+		/* advance rotation for next frame */
+		angle += 70.0 * dt;  /* 70 degrees per second */
+		if (angle > 3600.0)
+			angle -= 3600.0;
+		
+		draw();
+		
+		// DBR : Swap the Buffers
+		eglSwapBuffers(dpy, surf);
+	
+		
+		frames++;
+	}
+	
+	GLfloat seconds = ct - st;
+	GLfloat fps = frames / seconds;
+	printf("%d frames in %3.1f seconds = %6.3f FPS\n", frames, seconds, fps);
+	
+}
+
+
+int
+main(int argc, char *argv[])
+{
+	int maj, min;
+	EGLContext ctx;
+	EGLSurface screen_surf;
+	EGLConfig configs[10];
+	EGLint numConfigs, i;
+	EGLBoolean b;
+	
+	const EGLint screenAttribs[] = {
+		EGL_WIDTH, 1024,
+		EGL_HEIGHT, 768,
+		EGL_NONE
+	};
+	
+	EGLModeMESA mode;
+	EGLScreenMESA screen;
+	EGLint count;	
+	GLboolean printInfo = GL_FALSE;
+	
+	for (i = 1; i < argc; i++)
+	{
+		if (strcmp(argv[i], "-info") == 0)
+		{
+			printInfo = GL_TRUE;
+		}
+		else
+			printf("Warning: unknown parameter: %s\n", argv[i]);
+	}
+	
+	// DBR : Create EGL context/surface etc
+	EGLDisplay d = eglGetDisplay("!fb_dri");
+	assert(d);
+
+	if (!eglInitialize(d, &maj, &min)) {
+		printf("demo: eglInitialize failed\n");
+		exit(1);
+	}
+	
+	printf("EGL version = %d.%d\n", maj, min);
+	printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR));
+	
+	eglGetConfigs(d, configs, 10, &numConfigs);
+	eglGetScreensMESA(d, &screen, 1, &count);
+	eglGetModesMESA(d, screen, &mode, 1, &count);
+
+	ctx = eglCreateContext(d, configs[0], EGL_NO_CONTEXT, NULL);
+	if (ctx == EGL_NO_CONTEXT) {
+		printf("failed to create context\n");
+		return 0;
+	}
+	
+	screen_surf = eglCreateScreenSurfaceMESA(d, configs[0], screenAttribs);
+	if (screen_surf == EGL_NO_SURFACE) {
+		printf("failed to create screen surface\n");
+		return 0;
+	}
+	
+	eglShowSurfaceMESA(d, screen, screen_surf, mode);
+	
+	b = eglMakeCurrent(d, screen_surf, screen_surf, ctx);
+	if (!b) {
+		printf("make current failed\n");
+		return 0;
+	}
+	// DBR
+	
+	if (printInfo)
+	{
+		printf("GL_RENDERER   = %s\n", (char *) glGetString(GL_RENDERER));
+		printf("GL_VERSION    = %s\n", (char *) glGetString(GL_VERSION));
+		printf("GL_VENDOR     = %s\n", (char *) glGetString(GL_VENDOR));
+		printf("GL_EXTENSIONS = %s\n", (char *) glGetString(GL_EXTENSIONS));
+	}
+	
+	init();			// Initialise the GL visual
+	reshape(1024,768);
+	
+	// DBR : Run the simulation
+	run_gears(d, screen_surf, 5.0);
+	
+	
+	// DBR : Destroy EGL context/surface etc
+	eglDestroySurface(d, screen_surf);
+	eglDestroyContext(d, ctx);
+	eglTerminate(d);
+	// DBR
+	
+	return 0;
+}

progs/egl/eglinfo.c

@@ -0,0 +1,162 @@
+/*
+ * eglinfo - like glxinfo but for EGL
+ *
+ * Brian Paul
+ * 11 March 2005
+ *
+ * Copyright (C) 2005  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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL 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.
+ */
+
+
+#include <GLES/egl.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define MAX_CONFIGS 1000
+#define MAX_MODES 1000
+#define MAX_SCREENS 10
+
+
+/**
+ * Print table of all available configurations.
+ */
+static void
+PrintConfigs(EGLDisplay d)
+{
+   EGLConfig configs[MAX_CONFIGS];
+   EGLint numConfigs, i;
+
+   eglGetConfigs(d, configs, MAX_CONFIGS, &numConfigs);
+
+   printf("Configurations:\n");
+   printf("     bf lv d st colorbuffer dp st   supported \n");
+   printf("  id sz  l b ro  r  g  b  a th cl   surfaces  \n");
+   printf("----------------------------------------------\n");
+   for (i = 0; i < numConfigs; i++) {
+      EGLint id, size, level;
+      EGLint red, green, blue, alpha;
+      EGLint depth, stencil;
+      EGLint surfaces;
+      EGLint doubleBuf = 1, stereo = 0;
+      char surfString[100] = "";
+
+      eglGetConfigAttrib(d, configs[i], EGL_CONFIG_ID, &id);
+      eglGetConfigAttrib(d, configs[i], EGL_BUFFER_SIZE, &size);
+      eglGetConfigAttrib(d, configs[i], EGL_LEVEL, &level);
+
+      eglGetConfigAttrib(d, configs[i], EGL_RED_SIZE, &red);
+      eglGetConfigAttrib(d, configs[i], EGL_GREEN_SIZE, &green);
+      eglGetConfigAttrib(d, configs[i], EGL_BLUE_SIZE, &blue);
+      eglGetConfigAttrib(d, configs[i], EGL_ALPHA_SIZE, &alpha);
+      eglGetConfigAttrib(d, configs[i], EGL_DEPTH_SIZE, &depth);
+      eglGetConfigAttrib(d, configs[i], EGL_STENCIL_SIZE, &stencil);
+      eglGetConfigAttrib(d, configs[i], EGL_SURFACE_TYPE, &surfaces);
+
+      if (surfaces & EGL_WINDOW_BIT)
+         strcat(surfString, "win,");
+      if (surfaces & EGL_PBUFFER_BIT)
+         strcat(surfString, "pb,");
+      if (surfaces & EGL_PIXMAP_BIT)
+         strcat(surfString, "pix,");
+      if (strlen(surfString) > 0)
+         surfString[strlen(surfString) - 1] = 0;
+
+      printf("0x%02x %2d %2d %c  %c %2d %2d %2d %2d %2d %2d   %-12s\n",
+             id, size, level,
+             doubleBuf ? 'y' : '.',
+             stereo ? 'y' : '.',
+             red, green, blue, alpha,
+             depth, stencil, surfString);
+   }
+}
+
+
+/**
+ * Print table of all available configurations.
+ */
+static void
+PrintModes(EGLDisplay d)
+{
+#ifdef EGL_MESA_screen_surface
+   const char *extensions = eglQueryString(d, EGL_EXTENSIONS);
+   if (strstr(extensions, "EGL_MESA_screen_surface")) {
+      EGLScreenMESA screens[MAX_SCREENS];
+      EGLint numScreens = 1, scrn;
+      EGLModeMESA modes[MAX_MODES];
+
+      eglGetScreensMESA(d, screens, MAX_SCREENS, &numScreens);
+      printf("Number of Screens: %d\n\n", numScreens);
+
+      for (scrn = 0; scrn < numScreens; scrn++) {
+         EGLint numModes, i;
+
+         eglGetModesMESA(d, screens[scrn], modes, MAX_MODES, &numModes);
+
+         printf("Screen %d Modes:\n", scrn);
+         printf("  id  width height refresh  name\n");
+         printf("-----------------------------------------\n");
+         for (i = 0; i < numModes; i++) {
+            EGLint id, w, h, r;
+            const char *str;
+            eglGetModeAttribMESA(d, modes[i], EGL_MODE_ID_MESA, &id);
+            eglGetModeAttribMESA(d, modes[i], EGL_WIDTH, &w);
+            eglGetModeAttribMESA(d, modes[i], EGL_HEIGHT, &h);
+            eglGetModeAttribMESA(d, modes[i], EGL_REFRESH_RATE_MESA, &r);
+            str = eglQueryModeStringMESA(d, modes[i]);
+            printf("0x%02x %5d  %5d   %.3f  %s\n", id, w, h, r / 1000.0, str);
+         }
+      }
+   }
+#endif
+}
+
+
+
+int
+main(int argc, char *argv[])
+{
+   int maj, min;
+   /*EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY);*/
+   EGLDisplay d = eglGetDisplay("!fb_dri");
+
+   if (!eglInitialize(d, &maj, &min)) {
+      printf("eglinfo: eglInitialize failed\n");
+      exit(1);
+   }
+
+   printf("EGL API version: %d.%d\n", maj, min);
+   printf("EGL vendor string: %s\n", eglQueryString(d, EGL_VENDOR));
+   printf("EGL version string: %s\n", eglQueryString(d, EGL_VERSION));
+   printf("EGL extensions string:\n");
+   printf("    %s\n", eglQueryString(d, EGL_EXTENSIONS));
+   printf("\n");
+
+   PrintConfigs(d);
+
+   printf("\n");
+
+   PrintModes(d);
+
+   eglTerminate(d);
+
+   return 0;
+}

progs/fbdev/Makefile

@@ -0,0 +1,53 @@
+# Makefile for miniglx demo programs
+
+TOP = ../..
+
+include $(TOP)/configs/current
+
+
+SOURCES = glfbdevtest.c
+
+OBJECTS = $(SOURCES:.c=.o)
+
+PROGS = $(SOURCES:%.c=%)
+
+INCLUDES = \
+	-I. \
+	-I$(TOP)/include
+
+
+##### RULES #####
+
+.SUFFIXES:
+.SUFFIXES: .c
+
+.c:
+	$(CC) $(INCLUDES) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
+
+.c.o:
+	$(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@
+
+.S.o:
+	$(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@
+
+
+##### TARGETS #####
+
+default:  depend $(PROGS)
+
+clean:
+	rm -f $(PROGS)
+	rm -f *.o
+
+
+depend: $(SOURCES)
+	touch depend
+	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
+
+
+# Emacs tags
+tags:
+	etags `find . -name \*.[ch]` `find ../include`
+
+
+include depend

progs/osdemos/Makefile

@@ -0,0 +1,73 @@
+# progs/demos/Makefile
+
+TOP = ../..
+include $(TOP)/configs/current
+
+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 = \
+	osdemo 
+
+
+##### RULES #####
+
+.SUFFIXES:
+.SUFFIXES: .c
+
+
+# make executable from .c file:
+.c: $(LIB_DEP) readtex.o
+	$(CC) -I$(INCDIR) $(CFLAGS) $< readtex.o $(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
+
+
+# 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 $@
+
+
+
+clean:
+	-rm -f $(PROGS)
+	-rm -f *.o *~
+	-rm -f readtex.[ch] showbuffer.[ch]

progs/samples/Makefile

@@ -45,3 +45,4 @@ readtex.o: readtex.c readtex.h
 clean:
 	-rm -f $(PROGS)
 	-rm -f *.o *~
+	-rm -f readtex.c readtex.h

progs/samples/Makefile.DJ

@@ -31,8 +31,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	CPU		optimize for the given processor.
-#			default = pentium
 #	GLIDE		path to Glide3 SDK; used with FX.
 #			default = $(TOP)/glide3
 #	FX=1		build for 3dfx Glide3. Note that this disables
@@ -54,12 +52,11 @@
 .SECONDARY: ../util/readtex.o ../util/showbuffer.o
 
 TOP = ../..
-CPU ?= pentium
 GLIDE ?= $(TOP)/glide3
 
 CC = gcc
 CFLAGS = -Wall -W -pedantic
-CFLAGS += -O2 -ffast-math -mtune=$(CPU)
+CFLAGS += -O2 -ffast-math
 CFLAGS += -I$(TOP)/include -I../util
 CFLAGS += -DGLUT_IMPORT_LIB
 ifeq ($(FX),1)

progs/samples/Makefile.mgw

@@ -31,8 +31,6 @@
 #  Available options:
 #
 #    Environment variables:
-#	CPU		optimize for the given processor.
-#			default = pentium
 #
 #    Targets:
 #	<file.exe>	build a specific file
@@ -45,11 +43,10 @@
 .SECONDARY: ../util/readtex.o ../util/showbuffer.o
 
 TOP = ../..
-CPU ?= pentium
 
 CC = mingw32-gcc
 CFLAGS = -Wall -W -pedantic
-CFLAGS += -O2 -ffast-math -mtune=$(CPU)
+CFLAGS += -O2 -ffast-math
 CFLAGS += -I$(TOP)/include -I../util
 ifeq ($(FX),1)
 CFLAGS += -DFX

progs/samples/blendxor.c

@@ -14,7 +14,9 @@
 #include <windows.h>
 #endif
 #define GL_GLEXT_LEGACY
+#define GL_GLEXT_PROTOTYPES
 #include <GL/glut.h>
+#include <GL/glext.h>
 
 
 GLenum doubleBuffer;

progs/samples/loadppm.c

@@ -37,7 +37,7 @@ static PPMImage *LoadPPM(const char *filename)
 	exit(1);
     }
 
-    if (fscanf(fp, "%d %d", &result->sizeX, &result->sizeY) != 2)
+    if (fscanf(fp, "%lu %lu", &result->sizeX, &result->sizeY) != 2)
     {
 	fprintf(stderr, "Error loading image `%s'\n", filename);
 	exit(1);

progs/tests/.cvsignore

@@ -0,0 +1,2 @@
+.cvsignore
+getproclist.h

progs/tests/Makefile

@@ -22,13 +22,18 @@ SOURCES = antialias.c \
 	blendminmax.c \
 	blendsquare.c \
 	bufferobj.c \
+	bug_3101.c \
+	crossbar.c \
 	cva.c \
 	dinoshade.c \
 	floattex.c \
+	fbotest1.c \
+	fbotexture.c \
 	fogcoord.c \
 	fptest1.c \
 	fptexture.c \
 	getprocaddress.c \
+	invert.c \
 	manytex.c \
 	multipal.c \
 	no_s3tc.c \
@@ -99,6 +104,12 @@ texrect: texrect.o readtex.o
 texrect.o: texrect.c readtex.h
 	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 
+invert: invert.o readtex.o
+	$(CC) invert.o readtex.o $(LIBS) -o $@
+
+invert.o: invert.c readtex.h
+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+
 readtex.o: readtex.c
 	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 

progs/tests/api_speed.c

@@ -83,8 +83,8 @@ static void Display( void )
    DO_FUNC( glTexCoord3fv, (v) );
    DO_FUNC( glMultiTexCoord2fv, (GL_TEXTURE0, v) );
    DO_FUNC( glMultiTexCoord2f, (GL_TEXTURE0, 0.0, 0.0) );
-   DO_FUNC( glFogCoordfv, (v) );
-   DO_FUNC( glFogCoordf, (0.5) );
+   DO_FUNC( glFogCoordfvEXT, (v) );
+   DO_FUNC( glFogCoordfEXT, (0.5) );
 
    glEnd();
 

progs/tests/bug_3101.c

@@ -0,0 +1,128 @@
+/*
+ * (C) Copyright IBM Corporation 2005
+ * 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
+ * on 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
+ * VA LINUX SYSTEM, IBM AND/OR THEIR 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.
+ */
+
+/**
+ * \file bug_3101.c
+ *
+ * Simple regression test for bug #3101.  Attempt to draw a single square.
+ * After emiting the first vertex, call \c glEdgeFlag to change the vertex
+ * format.  If the bug still exists, this will cause a segfault.
+ *
+ * \author Ian Romanick <idr@us.ibm.com>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <GL/glut.h>
+
+static int Width = 400;
+static int Height = 200;
+static const GLfloat Near = 5.0, Far = 25.0;
+
+
+static void Display( void )
+{
+   glClearColor(0.2, 0.2, 0.8, 0);
+   glClear( GL_COLOR_BUFFER_BIT );
+
+   glPushMatrix();
+
+   /* This is the "reference" square.
+    */
+
+   glTranslatef(-4.5, 0, 0);
+   glBlendEquation( GL_FUNC_ADD );
+   glBlendFunc( GL_ONE, GL_ZERO );
+   glBegin(GL_QUADS);
+   glColor3f( 0.5, 0.5, 0.5 );
+   glVertex2f(-1, -1);
+   glVertex2f( 1, -1);
+   glEdgeFlag(GL_TRUE);
+   glVertex2f( 1,  1);
+   glVertex2f(-1,  1);
+   glEnd();
+
+   glPopMatrix();
+
+   glutSwapBuffers();
+}
+
+
+static void Reshape( int width, int height )
+{
+   GLfloat ar = (float) width / (float) height;
+   Width = width;
+   Height = height;
+   glViewport( 0, 0, width, height );
+   glMatrixMode( GL_PROJECTION );
+   glLoadIdentity();
+   glFrustum( -ar, ar, -1.0, 1.0, Near, Far );
+   glMatrixMode( GL_MODELVIEW );
+   glLoadIdentity();
+   glTranslatef( 0.0, 0.0, -15.0 );
+}
+
+
+static void Key( unsigned char key, int x, int y )
+{
+   (void) x;
+   (void) y;
+   switch (key) {
+      case 27:
+         exit(0);
+         break;
+   }
+   glutPostRedisplay();
+}
+
+
+static void Init( void )
+{
+   const char * const ver_string = (const char * const)
+       glGetString( GL_VERSION );
+
+   printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
+   printf("GL_VERSION = %s\n", ver_string);
+
+   printf("\nThis program should draw a single square, but not crash.\n");
+   printf("This is a regression test for bug #3101.\n");
+   printf("https://bugs.freedesktop.org/show_bug.cgi?id=3101\n");
+   glEnable( GL_BLEND );
+}
+
+
+int main( int argc, char *argv[] )
+{
+   glutInit( &argc, argv );
+   glutInitWindowPosition( 0, 0 );
+   glutInitWindowSize( Width, Height );
+   glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
+   glutCreateWindow( "Bug #3101 Test" );
+   glutReshapeFunc( Reshape );
+   glutKeyboardFunc( Key );
+   glutDisplayFunc( Display );
+   Init();
+   glutMainLoop();
+   return 0;
+}

progs/tests/crossbar.c

@@ -0,0 +1,235 @@
+/*
+ * (C) Copyright IBM Corporation 2005
+ * 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
+ * on 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
+ * VA LINUX SYSTEM, IBM AND/OR THEIR 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.
+ */
+
+/**
+ * \file crossbar.c
+ * 
+ * Simple test of GL_ARB_texture_env_crossbar functionality.  Several squares
+ * are drawn with different texture combine modes, but all should be rendered
+ * with the same final color.
+ *
+ * \author Ian Romanick <idr@us.ibm.com>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <GL/glut.h>
+
+static const GLint tests[][8] = {
+   { 1, GL_REPLACE,  GL_PRIMARY_COLOR, GL_PRIMARY_COLOR,
+     2, GL_REPLACE,  GL_TEXTURE,       GL_PRIMARY_COLOR },
+   { 3, GL_REPLACE,  GL_PRIMARY_COLOR, GL_PRIMARY_COLOR,
+     2, GL_SUBTRACT, GL_TEXTURE0,      GL_TEXTURE1 },
+   { 2, GL_REPLACE,  GL_PRIMARY_COLOR, GL_PRIMARY_COLOR,
+     2, GL_REPLACE,  GL_TEXTURE0,      GL_TEXTURE0 },
+   { 2, GL_REPLACE,  GL_PRIMARY_COLOR, GL_PRIMARY_COLOR,
+     1, GL_SUBTRACT, GL_TEXTURE0,      GL_TEXTURE1 },
+   { 3, GL_ADD,      GL_TEXTURE1,      GL_TEXTURE1,
+     2, GL_MODULATE, GL_TEXTURE1,      GL_PREVIOUS },
+   { 3, GL_ADD,      GL_TEXTURE1,      GL_TEXTURE1,
+     4, GL_MODULATE, GL_TEXTURE0,      GL_PREVIOUS },
+};
+
+#define NUM_TESTS (sizeof(tests) / sizeof(tests[0]))
+
+static int Width = 100 * (NUM_TESTS + 1);
+static int Height = 200;
+static const GLfloat Near = 5.0, Far = 25.0;
+
+
+static void Display( void )
+{
+   unsigned i;
+
+
+   glClearColor(0.2, 0.2, 0.8, 0);
+   glClear( GL_COLOR_BUFFER_BIT );
+
+   glPushMatrix();
+
+   /* This is the "reference" square.
+    */
+
+   glActiveTexture( GL_TEXTURE0 );
+   glDisable( GL_TEXTURE_2D );
+   glActiveTexture( GL_TEXTURE1 );
+   glDisable( GL_TEXTURE_2D );
+
+   glTranslatef(-(NUM_TESTS * 1.5), 0, 0);
+   glBegin(GL_QUADS);
+   glColor3f( 0.5, 0.5, 0.5 );
+   glVertex2f(-1, -1);
+   glVertex2f( 1, -1);
+   glVertex2f( 1,  1);
+   glVertex2f(-1,  1);
+   glEnd();
+
+   for ( i = 0 ; i < NUM_TESTS ; i++ ) {
+      glActiveTexture( GL_TEXTURE0 );
+      glEnable( GL_TEXTURE_2D );
+      glBindTexture( GL_TEXTURE_2D, tests[i][0] );
+      glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE );
+      glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, tests[i][1] );
+      glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, tests[i][2] );
+      glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE1_RGB, tests[i][3] );
+
+      glActiveTexture( GL_TEXTURE1 );
+      glEnable( GL_TEXTURE_2D );
+      glBindTexture( GL_TEXTURE_2D, tests[i][4] );
+      glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE );
+      glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, tests[i][5] );
+      glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, tests[i][6] );
+      glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE1_RGB, tests[i][7] );
+
+      glCallList(1);
+   }
+
+   glPopMatrix();
+
+   glutSwapBuffers();
+}
+
+
+static void Reshape( int width, int height )
+{
+   GLfloat ar = (float) width / (float) height;
+   Width = width;
+   Height = height;
+   glViewport( 0, 0, width, height );
+   glMatrixMode( GL_PROJECTION );
+   glLoadIdentity();
+   glFrustum( -ar, ar, -1.0, 1.0, Near, Far );
+   glMatrixMode( GL_MODELVIEW );
+   glLoadIdentity();
+   glTranslatef( 0.0, 0.0, -15.0 );
+}
+
+
+static void Key( unsigned char key, int x, int y )
+{
+   (void) x;
+   (void) y;
+   switch (key) {
+      case 27:
+         exit(0);
+         break;
+   }
+   glutPostRedisplay();
+}
+
+
+static void Init( void )
+{
+   const char * const ver_string = (const char * const)
+       glGetString( GL_VERSION );
+   float ver = strtof( ver_string, NULL );
+   GLint tex_units;
+   GLint temp[ 256 ];
+
+
+   printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
+   printf("GL_VERSION = %s\n", ver_string);
+
+   if ( (!glutExtensionSupported("GL_ARB_multitexture") 
+	 && (ver < 1.3))
+	|| (!glutExtensionSupported("GL_ARB_texture_env_combine") 
+	    && !glutExtensionSupported("GL_EXT_texture_env_combine")
+	    && (ver < 1.3))
+	|| (!glutExtensionSupported("GL_ARB_texture_env_crossbar")
+	    && !glutExtensionSupported("GL_NV_texture_env_combine4")
+	    && (ver < 1.4)) ) {
+      printf("\nSorry, this program requires GL_ARB_multitexture and either\n"
+	     "GL_ARB_texture_env_combine or GL_EXT_texture_env_combine (or OpenGL 1.3).\n"
+	     "Either GL_ARB_texture_env_crossbar or GL_NV_texture_env_combine4 (or\n"
+	     "OpenGL 1.4) are also required.\n");
+      exit(1);
+   }
+
+   glGetIntegerv( GL_MAX_TEXTURE_UNITS, & tex_units );
+   if ( tex_units < 2 ) {
+      printf("\nSorry, this program requires at least 2 texture units.\n");
+      exit(1);
+   }
+
+   printf("\nAll %u squares should be the same color.\n", NUM_TESTS + 1);
+   
+   (void) memset( temp, 0x00, sizeof( temp ) );
+   glBindTexture( GL_TEXTURE_2D, 1 );
+   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
+   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
+   glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0,
+		 GL_RGBA, GL_UNSIGNED_BYTE, temp );
+
+   (void) memset( temp, 0x7f, sizeof( temp ) );
+   glBindTexture( GL_TEXTURE_2D, 2 );
+   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
+   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
+   glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0,
+		 GL_RGBA, GL_UNSIGNED_BYTE, temp );
+
+   (void) memset( temp, 0xff, sizeof( temp ) );
+   glBindTexture( GL_TEXTURE_2D, 3 );
+   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
+   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
+   glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0,
+		 GL_RGBA, GL_UNSIGNED_BYTE, temp );
+
+   (void) memset( temp, 0x3f, sizeof( temp ) );
+   glBindTexture( GL_TEXTURE_2D, 4 );
+   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
+   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
+   glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0,
+		 GL_RGBA, GL_UNSIGNED_BYTE, temp );
+
+
+   glNewList( 1, GL_COMPILE );
+   glTranslatef(3.0, 0, 0);
+   glBegin(GL_QUADS);
+   glColor3f( 0.9, 0.0, 0.0 );
+   glMultiTexCoord2f( GL_TEXTURE0, 0.5, 0.5 );
+   glMultiTexCoord2f( GL_TEXTURE1, 0.5, 0.5 );
+   glVertex2f(-1, -1);
+   glVertex2f( 1, -1);
+   glVertex2f( 1,  1);
+   glVertex2f(-1,  1);
+   glEnd();
+   glEndList();
+}
+
+
+int main( int argc, char *argv[] )
+{
+   glutInit( &argc, argv );
+   glutInitWindowPosition( 0, 0 );
+   glutInitWindowSize( Width, Height );
+   glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
+   glutCreateWindow( "GL_ARB_texture_env_crossbar test" );
+   glutReshapeFunc( Reshape );
+   glutKeyboardFunc( Key );
+   glutDisplayFunc( Display );
+   Init();
+   glutMainLoop();
+   return 0;
+}

progs/tests/fbotest1.c

@@ -0,0 +1,182 @@
+/*
+ * Test GL_EXT_framebuffer_object
+ *
+ * Brian Paul
+ * 7 Feb 2005
+ */
+
+
+#define GL_GLEXT_PROTOTYPES
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <GL/glut.h>
+
+static int Width = 400, Height = 400;
+static GLuint MyFB;
+
+
+static void
+CheckError(int line)
+{
+   GLenum err = glGetError();
+   if (err) {
+      printf("GL Error 0x%x at line %d\n", (int) err, line);
+   }
+}
+
+
+static void
+Display( void )
+{
+   GLubyte *buffer = malloc(Width * Height * 4);
+   GLenum status;
+
+   /* draw to user framebuffer */
+   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, MyFB);
+   glDrawBuffer(GL_COLOR_ATTACHMENT1_EXT);
+   glReadBuffer(GL_COLOR_ATTACHMENT1_EXT);
+
+   status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+   if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+      printf("Framebuffer incomplete!!!\n");
+   }
+
+   glClearColor(0.5, 0.5, 1.0, 0.0);
+   glClear( GL_COLOR_BUFFER_BIT );
+
+   glBegin(GL_POLYGON);
+   glColor3f(1, 0, 0);
+   glVertex2f(-1, -1);
+   glColor3f(0, 1, 0);
+   glVertex2f(1, -1);
+   glColor3f(0, 0, 1);
+   glVertex2f(0, 1);
+   glEnd();
+
+   /* read from user framebuffer */
+   glReadPixels(0, 0, Width, Height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+
+   /* draw to window */
+   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+   glWindowPos2iARB(0, 0);
+   glDrawPixels(Width, Height, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+
+   free(buffer);
+   glutSwapBuffers();
+}
+
+
+static void
+Reshape( int width, int height )
+{
+   float ar = (float) width / (float) height;
+   glViewport( 0, 0, width, height );
+   glMatrixMode( GL_PROJECTION );
+   glLoadIdentity();
+#if 0
+   glFrustum( -ar, ar, -1.0, 1.0, 5.0, 25.0 );
+#else
+   glOrtho(-1.0, 1.0, -1.0, 1.0, 5.0, 25.0 );
+#endif
+   glMatrixMode( GL_MODELVIEW );
+   glLoadIdentity();
+   glTranslatef( 0.0, 0.0, -15.0 );
+   Width = width;
+   Height = height;
+   glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGB, Width, Height);
+}
+
+
+static void
+Key( unsigned char key, int x, int y )
+{
+   (void) x;
+   (void) y;
+   switch (key) {
+      case 27:
+         exit(0);
+         break;
+   }
+   glutPostRedisplay();
+}
+
+
+static void
+Init( void )
+{
+   GLuint rb;
+   GLint i;
+
+   if (!glutExtensionSupported("GL_EXT_framebuffer_object")) {
+      printf("GL_EXT_framebuffer_object not found!\n");
+      /*exit(0);*/
+   }
+   printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
+
+   glGenFramebuffersEXT(1, &MyFB);
+   assert(MyFB);
+   assert(glIsFramebufferEXT(MyFB));
+   glDeleteFramebuffersEXT(1, &MyFB);
+   assert(!glIsFramebufferEXT(MyFB));
+   /* Note, continue to use MyFB below */
+
+   glGenRenderbuffersEXT(1, &rb);
+   assert(rb);
+   assert(glIsRenderbufferEXT(rb));
+   glDeleteRenderbuffersEXT(1, &rb);
+   assert(!glIsRenderbufferEXT(rb));
+   rb = 42; /* an arbitrary ID */
+
+   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, MyFB);
+   assert(glIsFramebufferEXT(MyFB));
+   glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, rb);
+   assert(glIsRenderbufferEXT(rb));
+
+   glGetIntegerv(GL_RENDERBUFFER_BINDING_EXT, &i);
+   assert(i == rb);
+
+   glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &i);
+   assert(i == MyFB);
+
+   glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT1_EXT,
+                                GL_RENDERBUFFER_EXT, rb);
+
+   glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGB, Width, Height);
+
+   {
+      GLint r, g, b, a;
+      glGetRenderbufferParameterivEXT(GL_RENDERBUFFER_EXT,
+                                      GL_RENDERBUFFER_RED_SIZE_EXT, &r);
+      glGetRenderbufferParameterivEXT(GL_RENDERBUFFER_EXT,
+                                      GL_RENDERBUFFER_GREEN_SIZE_EXT, &g);
+      glGetRenderbufferParameterivEXT(GL_RENDERBUFFER_EXT,
+                                      GL_RENDERBUFFER_BLUE_SIZE_EXT, &b);
+      glGetRenderbufferParameterivEXT(GL_RENDERBUFFER_EXT,
+                                      GL_RENDERBUFFER_ALPHA_SIZE_EXT, &a);
+      printf("renderbuffer RGBA sizes = %d %d %d %d\n", r, g, b, a);
+   }
+
+   CheckError(__LINE__);
+
+   /* restore to default */
+   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+}
+
+
+int
+main( int argc, char *argv[] )
+{
+   glutInit( &argc, argv );
+   glutInitWindowPosition( 0, 0 );
+   glutInitWindowSize(Width, Height);
+   glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
+   glutCreateWindow(argv[0]);
+   glutReshapeFunc( Reshape );
+   glutKeyboardFunc( Key );
+   glutDisplayFunc( Display );
+   Init();
+   glutMainLoop();
+   return 0;
+}

progs/tests/fbotexture.c

@@ -0,0 +1,284 @@
+/*
+ * Test GL_EXT_framebuffer_object render-to-texture
+ *
+ * Draw a teapot into a texture image with stenciling.
+ * Then draw a textured quad using that texture.
+ *
+ * Brian Paul
+ * 18 Apr 2005
+ */
+
+
+#define GL_GLEXT_PROTOTYPES
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <GL/glut.h>
+
+static int Width = 400, Height = 400;
+static int TexWidth = 512, TexHeight = 512;
+static GLuint MyFB;
+static GLuint TexObj;
+static GLuint DepthRB, StencilRB;
+static GLboolean Anim = GL_FALSE;
+static GLfloat Rot = 0.0;
+
+
+static void
+CheckError(int line)
+{
+   GLenum err = glGetError();
+   if (err) {
+      printf("GL Error 0x%x at line %d\n", (int) err, line);
+   }
+}
+
+
+static void
+Idle(void)
+{
+   Rot = glutGet(GLUT_ELAPSED_TIME) * 0.05;
+   glutPostRedisplay();
+}
+
+
+static void
+RenderTexture(void)
+{
+   GLint level = 0;
+   GLenum status;
+
+   glMatrixMode(GL_PROJECTION);
+   glLoadIdentity();
+   glOrtho(-1.0, 1.0, -1.0, 1.0, 5.0, 25.0);
+   glMatrixMode(GL_MODELVIEW);
+   glLoadIdentity();
+   glTranslatef(0.0, 0.0, -15.0);
+
+   /* draw to texture */
+   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, MyFB);
+   glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+                             GL_TEXTURE_2D, TexObj, level);
+
+   status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+   if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+      printf("Framebuffer incomplete!!!\n");
+   }
+
+   glViewport(0, 0, TexWidth, TexHeight);
+
+   glClearColor(0.5, 0.5, 1.0, 0.0);
+   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+
+   glEnable(GL_DEPTH_TEST);
+   glEnable(GL_STENCIL_TEST);
+   glStencilFunc(GL_NEVER, 1, ~0);
+   glStencilOp(GL_REPLACE, GL_KEEP, GL_REPLACE);
+
+   /* draw diamond-shaped stencil pattern */
+   glColor3f(0, 1, 0);
+   glBegin(GL_POLYGON);
+   glVertex2f(-0.2,  0.0);
+   glVertex2f( 0.0, -0.2);
+   glVertex2f( 0.2,  0.0);
+   glVertex2f( 0.0,  0.2);
+   glEnd();
+
+   /* draw teapot where stencil != 1 */
+   glStencilFunc(GL_NOTEQUAL, 1, ~0);
+   glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+
+#if 0
+   glBegin(GL_POLYGON);
+   glColor3f(1, 0, 0);
+   glVertex2f(-1, -1);
+   glColor3f(0, 1, 0);
+   glVertex2f(1, -1);
+   glColor3f(0, 0, 1);
+   glVertex2f(0, 1);
+   glEnd();
+#else
+   glEnable(GL_LIGHTING);
+   glEnable(GL_LIGHT0);
+   glPushMatrix();
+   glRotatef(0.5 * Rot, 1.0, 0.0, 0.0);
+   glutSolidTeapot(0.5);
+   glPopMatrix();
+   glDisable(GL_LIGHTING);
+#endif
+   glDisable(GL_DEPTH_TEST);
+   glDisable(GL_STENCIL_TEST);
+
+   /* Bind normal framebuffer */
+   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+
+   CheckError(__LINE__);
+}
+
+
+
+static void
+Display(void)
+{
+   float ar = (float) Width / (float) Height;
+
+   RenderTexture();
+
+   /* draw textured quad in the window */
+
+   glMatrixMode(GL_PROJECTION);
+   glLoadIdentity();
+   glFrustum(-ar, ar, -1.0, 1.0, 5.0, 25.0);
+   glMatrixMode(GL_MODELVIEW);
+   glLoadIdentity();
+   glTranslatef(0.0, 0.0, -7.0);
+
+   glViewport(0, 0, Width, Height);
+
+   glClearColor(0.25, 0.25, 0.25, 0);
+   glClear(GL_COLOR_BUFFER_BIT);
+
+   glPushMatrix();
+   glRotatef(Rot, 0, 1, 0);
+   glEnable(GL_TEXTURE_2D);
+   glBegin(GL_POLYGON);
+   glColor3f(0.25, 0.25, 0.25);
+   glTexCoord2f(0, 0);
+   glVertex2f(-1, -1);
+   glTexCoord2f(1, 0);
+   glVertex2f(1, -1);
+   glColor3f(1.0, 1.0, 1.0);
+   glTexCoord2f(1, 1);
+   glVertex2f(1, 1);
+   glTexCoord2f(0, 1);
+   glVertex2f(-1, 1);
+   glEnd();
+   glPopMatrix();
+   glDisable(GL_TEXTURE_2D);
+   
+   glutSwapBuffers();
+   CheckError(__LINE__);
+}
+
+
+static void
+Reshape(int width, int height)
+{
+   glViewport(0, 0, width, height);
+   Width = width;
+   Height = height;
+}
+
+
+static void
+Key(unsigned char key, int x, int y)
+{
+   (void) x;
+   (void) y;
+   switch (key) {
+      case 'a':
+         Anim = !Anim;
+         if (Anim)
+            glutIdleFunc(Idle);
+         else
+            glutIdleFunc(NULL);
+         break;
+      case 27:
+         exit(0);
+         break;
+   }
+   glutPostRedisplay();
+}
+
+
+static void
+Init(void)
+{
+   GLint i;
+
+   if (!glutExtensionSupported("GL_EXT_framebuffer_object")) {
+      printf("GL_EXT_framebuffer_object not found!\n");
+      exit(0);
+   }
+   printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
+
+   /* make framebuffer */
+   glGenFramebuffersEXT(1, &MyFB);
+   assert(MyFB);
+   assert(glIsFramebufferEXT(MyFB));
+   glDeleteFramebuffersEXT(1, &MyFB);
+   assert(!glIsFramebufferEXT(MyFB));
+   /* Note, continue to use MyFB below */
+
+   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, MyFB);
+   assert(glIsFramebufferEXT(MyFB));
+   glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &i);
+   assert(i == MyFB);
+
+   /* make depth renderbuffer */
+   glGenRenderbuffersEXT(1, &DepthRB);
+   assert(DepthRB);
+   assert(glIsRenderbufferEXT(DepthRB));
+   glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, DepthRB);
+   glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT,
+                            TexWidth, TexHeight);
+   glGetRenderbufferParameterivEXT(GL_RENDERBUFFER_EXT,
+                                   GL_RENDERBUFFER_DEPTH_SIZE_EXT, &i);
+   printf("Depth renderbuffer size = %d bits\n", i);
+   assert(i > 0);
+
+   /* make stencil renderbuffer */
+   glGenRenderbuffersEXT(1, &StencilRB);
+   assert(StencilRB);
+   assert(glIsRenderbufferEXT(StencilRB));
+   glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, StencilRB);
+   glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_STENCIL_INDEX,
+                            TexWidth, TexHeight);
+   glGetRenderbufferParameterivEXT(GL_RENDERBUFFER_EXT,
+                                   GL_RENDERBUFFER_STENCIL_SIZE_EXT, &i);
+   printf("Stencil renderbuffer size = %d bits\n", i);
+   assert(i > 0);
+
+   /* attach DepthRB to MyFB */
+   glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
+                                GL_RENDERBUFFER_EXT, DepthRB);
+
+   /* attach StencilRB to MyFB */
+   glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT,
+                                GL_RENDERBUFFER_EXT, StencilRB);
+
+
+   /* bind regular framebuffer */
+   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+
+   /* Make texture object/image */
+   glGenTextures(1, &TexObj);
+   glBindTexture(GL_TEXTURE_2D, TexObj);
+   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, TexWidth, TexHeight, 0,
+                GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
+   CheckError(__LINE__);
+}
+
+
+int
+main(int argc, char *argv[])
+{
+   glutInit(&argc, argv);
+   glutInitWindowPosition(0, 0);
+   glutInitWindowSize(Width, Height);
+   glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
+   glutCreateWindow(argv[0]);
+   glutReshapeFunc(Reshape);
+   glutKeyboardFunc(Key);
+   glutDisplayFunc(Display);
+   if (Anim)
+      glutIdleFunc(Idle);
+   Init();
+   glutMainLoop();
+   return 0;
+}

progs/tests/getprocaddress.c

@@ -288,6 +288,7 @@ check_functions( const char *extensions )
 
    for (entry = functions; entry->name; entry++) {
       if (entry->name[0] == '-') {
+         /* XXX update for OpenGL 2.0 */
          if (entry->name[1] == '1') {
             /* check GL version X.Y */
             const char *version = (const char *) glGetString(GL_VERSION);

progs/tests/getprocaddress.py

@@ -1,13 +1,9 @@
 #!/usr/bin/env python
 
-# $Id: getprocaddress.py,v 1.6 2004/11/27 19:57:46 brianp Exp $
+# $Id: getprocaddress.py,v 1.7 2005/06/21 23:42:43 idr Exp $
 
 # Helper for the getprocaddress.c test.
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import sys, getopt, re
 sys.path.append("../../src/mesa/glapi/" )
 import gl_XML
@@ -30,16 +26,19 @@ def FindTestFunctions():
 	return functions
 
 
-class PrintExports(gl_XML.FilterGLAPISpecBase):
-	name = "gl_exports.py (from Mesa)"
-
+class PrintExports(gl_XML.gl_print_base):
 	def __init__(self):
-		gl_XML.FilterGLAPISpecBase.__init__(self)
+		gl_XML.gl_print_base.__init__(self)
+
+		self.name = "getprocaddress.py (from Mesa)"
 		self.license = license.bsd_license_template % ( \
 """Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
 (C) Copyright IBM Corporation 2004""", "BRIAN PAUL, IBM")
+
 		self.tests = FindTestFunctions()
 		self.prevCategory = ""
+		return
+
 
 	def printRealHeader(self):
 		print """
@@ -50,22 +49,28 @@ struct name_test_pair {
    
 static struct name_test_pair functions[] = {"""
 
-	def printRealFooter(self):
-		print"""
-   { NULL, NULL }
-};
-"""
+	def printBody(self, api):
+		prev_category = None
+		
 
-	def printFunction(self, f):
-		if f.category != self.prevCategory:
-			print '   { "-%s", NULL},' % f.category
-			self.prevCategory = f.category
+		for f in api.functionIterateByOffset():
+			[category, num] = api.get_category_for_name( f.name )
+			if category != prev_category:
+				print '   { "-%s", NULL},' % category
+				prev_category = category
 			
-		if f.name in self.tests:
-			test = "test_%s" % f.name
-		else:
 			test = "NULL"
-		print '   { "gl%s", %s },' % (f.name, test)
+			for name in f.entry_points:
+				if name in self.tests:
+					test = "test_%s" % name
+					break
+
+			print '   { "gl%s", %s },' % (f.name, test)
+
+		print ''
+		print '   { NULL, NULL }'
+		print '};'
+		print ''
 		return
 
 
@@ -81,15 +86,8 @@ if __name__ == '__main__':
 		if arg == "-f":
 			file_name = val
 
-	dh = PrintExports()
+	printer = PrintExports()
 
-	parser = make_parser()
-	parser.setFeature(feature_namespaces, 0)
-	parser.setContentHandler(dh)
+	api = gl_XML.parse_GL_API( file_name, gl_XML.gl_item_factory() )
 
-	f = open(file_name)
-
-	parser.parse(f)
-	dh.printHeader()
-	dh.printFunctions()
-	dh.printFooter()
+	printer.Print( api )

progs/tests/invert.c

@@ -0,0 +1,195 @@
+/*
+ * (C) Copyright IBM Corporation 2005
+ * 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
+ * on 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
+ * VA LINUX SYSTEM, IBM AND/OR THEIR 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.
+ */
+
+/**
+ * \file invert.c
+ * 
+ * Simple test of GL_MESA_pack_invert functionality.  Three squares are
+ * drawn.  The first two should look the same, and the third one should
+ * look inverted.
+ *
+ * \author Ian Romanick <idr@us.ibm.com>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <GL/glut.h>
+
+#include "readtex.h"
+
+#define IMAGE_FILE "../images/tree3.rgb"
+
+static int Width = 420;
+static int Height = 150;
+static const GLfloat Near = 5.0, Far = 25.0;
+
+static GLubyte * image = NULL;
+static GLubyte * temp_image = NULL;
+static GLuint img_width = 0;
+static GLuint img_height = 0;
+static GLuint img_format = 0;
+
+PFNGLWINDOWPOS2IPROC win_pos_2i = NULL;
+
+
+static void Display( void )
+{
+   GLint err;
+
+
+   glClearColor(0.2, 0.2, 0.8, 0);
+   glClear( GL_COLOR_BUFFER_BIT );
+
+
+   /* This is the "reference" square.
+    */
+
+   (*win_pos_2i)( 5, 5 );
+   glDrawPixels( img_width, img_height, img_format, GL_UNSIGNED_BYTE, image );
+
+   glPixelStorei( GL_PACK_INVERT_MESA, GL_FALSE );
+   err = glGetError();
+   if ( err != GL_NO_ERROR ) {
+      printf( "Setting PACK_INVERT_MESA to false generated an error (0x%04x).\n",
+	      err );
+   }
+
+   glReadPixels( 5, 5, img_width, img_height, img_format, GL_UNSIGNED_BYTE, temp_image );
+   (*win_pos_2i)( 5 + 1 * (10 + img_width), 5 );
+   glDrawPixels( img_width, img_height, img_format, GL_UNSIGNED_BYTE, temp_image );
+
+   glPixelStorei( GL_PACK_INVERT_MESA, GL_TRUE );
+   err = glGetError();
+   if ( err != GL_NO_ERROR ) {
+      printf( "Setting PACK_INVERT_MESA to true generated an error (0x%04x).\n",
+	      err );
+   }
+
+   glReadPixels( 5, 5, img_width, img_height, img_format, GL_UNSIGNED_BYTE, temp_image );
+   (*win_pos_2i)( 5 + 2 * (10 + img_width), 5 );
+   glDrawPixels( img_width, img_height, img_format, GL_UNSIGNED_BYTE, temp_image );
+
+   glutSwapBuffers();
+}
+
+
+static void Reshape( int width, int height )
+{
+   GLfloat ar = (float) width / (float) height;
+   Width = width;
+   Height = height;
+   glViewport( 0, 0, width, height );
+   glMatrixMode( GL_PROJECTION );
+   glLoadIdentity();
+   glFrustum( -ar, ar, -1.0, 1.0, Near, Far );
+   glMatrixMode( GL_MODELVIEW );
+   glLoadIdentity();
+   glTranslatef( 0.0, 0.0, -15.0 );
+}
+
+
+static void Key( unsigned char key, int x, int y )
+{
+   (void) x;
+   (void) y;
+   switch (key) {
+      case 27:
+         exit(0);
+         break;
+   }
+   glutPostRedisplay();
+}
+
+
+static void Init( void )
+{
+   const char * const ver_string = (const char * const)
+       glGetString( GL_VERSION );
+   const float ver = strtof( ver_string, NULL );
+
+
+   printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
+   printf("GL_VERSION = %s\n", ver_string);
+
+   if ( !glutExtensionSupported("GL_MESA_pack_invert") ) {
+      printf("\nSorry, this program requires GL_MESA_pack_invert.\n");
+      exit(1);
+   }
+
+   if ( ver >= 1.4 ) {
+      win_pos_2i = (PFNGLWINDOWPOS2IPROC) glutGetProcAddress( "glWindowPos2i" );
+   }
+   else if ( glutExtensionSupported("GL_ARB_window_pos") ) {
+      win_pos_2i = (PFNGLWINDOWPOS2IPROC) glutGetProcAddress( "glWindowPos2iARB" );
+   }
+   else if ( glutExtensionSupported("GL_MESA_window_pos") ) {
+      win_pos_2i = (PFNGLWINDOWPOS2IPROC) glutGetProcAddress( "glWindowPos2iMESA" );
+   }
+   
+
+   /* Do this check as a separate if-statement instead of as an else in case
+    * one of the required extensions is supported but glutGetProcAddress
+    * returns NULL.
+    */
+
+   if ( win_pos_2i == NULL ) {
+      printf("\nSorry, this program requires either GL 1.4 (or higher),\n"
+	     "GL_ARB_window_pos, or GL_MESA_window_pos.\n");
+      exit(1);
+   }
+
+   printf("\nThe left 2 squares should be the same color, and the right\n"
+	  "square should look upside-down.\n");
+   
+
+   image = LoadRGBImage( IMAGE_FILE, & img_width, & img_height,
+			 & img_format );
+   if ( image == NULL ) {
+      printf( "Could not open image file \"%s\".\n", IMAGE_FILE );
+      exit(1);
+   }
+
+   temp_image = malloc( 3 * img_height * img_width );
+   if ( temp_image == NULL ) {
+      printf( "Could not allocate memory for temporary image.\n" );
+      exit(1);
+   }
+}
+
+
+int main( int argc, char *argv[] )
+{
+   glutInit( &argc, argv );
+   glutInitWindowPosition( 0, 0 );
+   glutInitWindowSize( Width, Height );
+   glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
+   glutCreateWindow( "GL_MESA_pack_invert test" );
+   glutReshapeFunc( Reshape );
+   glutKeyboardFunc( Key );
+   glutDisplayFunc( Display );
+   Init();
+   glutMainLoop();
+   return 0;
+}

progs/xdemos/Makefile

@@ -11,6 +11,7 @@ LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME)
 PROGS = glthreads \
 	glxdemo \
 	glxgears \
+	glxgears_fbconfig \
 	glxcontexts \
 	glxheads \
 	glxinfo \
@@ -19,12 +20,14 @@ PROGS = glthreads \
 	glxswapcontrol \
 	manywin \
 	offset \
+	overlay \
 	pbinfo \
 	pbdemo \
 	wincopy \
 	xdemo \
 	xfont \
-	xrotfontdemo
+	xrotfontdemo \
+	yuvrect_client
 
 
 
@@ -49,10 +52,10 @@ clean:
 
 # special cases
 pbinfo: pbinfo.o pbutil.o
-	$(CC) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
+	$(CC) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
 
 pbdemo: pbdemo.o pbutil.o
-	$(CC) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
+	$(CC) $(CFLAGS) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
 
 pbinfo.o: pbinfo.c pbutil.h
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
@@ -63,9 +66,14 @@ pbdemo.o: pbdemo.c pbutil.h
 pbutil.o: pbutil.c pbutil.h
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
 
+glxgears_fbconfig: glxgears_fbconfig.o pbutil.o
+	$(CC) $(CFLAGS) glxgears_fbconfig.o pbutil.o $(APP_LIB_DEPS) -o $@
+
+glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h
+	$(CC) $(CFLAGS) -c -I. -I$(INCDIR) $(CFLAGS) glxgears_fbconfig.c
 
 xrotfontdemo: xrotfontdemo.o xuserotfont.o
-	$(CC) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
+	$(CC) $(CFLAGS) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
 
 xuserotfont.o: xuserotfont.c xuserotfont.h
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c

progs/xdemos/glxgears_fbconfig.c

@@ -32,6 +32,8 @@
  */
 
 
+#define GLX_GLXEXT_PROTOTYPES
+
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -44,7 +46,7 @@
 #include <assert.h>
 #include "pbutil.h"
 
-/* I had to the the SGIX versions of these because for some reason glxext.h
+/* I had to use the SGIX versions of these because for some reason glxext.h
  * doesn't define the core versions if GLX_VERSION_1_3 is defined, and glx.h
  * doesn't define them at all.  One or both header files is clearly broken.
  */
@@ -358,19 +360,19 @@ init_fbconfig_functions(Display *dpy, int scrnum)
 
    if ( glx_1_3_supported ) {
       choose_fbconfig = (PFNGLXCHOOSEFBCONFIGSGIXPROC) glXGetProcAddressARB( 
-		(GLbyte *) "glXChooseFBConfig");
+		(GLubyte *) "glXChooseFBConfig");
       get_visual_from_fbconfig = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) glXGetProcAddressARB( 
-		(GLbyte *) "glXGetVisualFromFBConfig");
+		(GLubyte *) "glXGetVisualFromFBConfig");
       create_new_context = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) glXGetProcAddressARB(
-		(GLbyte *) "glXCreateNewContext");
+		(GLubyte *) "glXCreateNewContext");
    }
    else if ( ext_version_supported ) {
       choose_fbconfig = (PFNGLXCHOOSEFBCONFIGSGIXPROC) glXGetProcAddressARB( 
-		(GLbyte *) "glXChooseFBConfigSGIX");
+		(GLubyte *) "glXChooseFBConfigSGIX");
       get_visual_from_fbconfig = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) glXGetProcAddressARB( 
-		(GLbyte *) "glXGetVisualFromFBConfigSGIX");
+		(GLubyte *) "glXGetVisualFromFBConfigSGIX");
       create_new_context = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) glXGetProcAddressARB(
-		(GLbyte *) "glXCreateContextWithConfigSGIX");
+		(GLubyte *) "glXCreateContextWithConfigSGIX");
    }
    else {
       printf( "This demo requires either GLX 1.3 or %s be supported.\n",
@@ -436,7 +438,7 @@ make_window( Display *dpy, const char *name,
    printf("\nThe following fbconfigs meet the requirements.  The first one "
 	  "will be used.\n\n");
    for ( i = 0 ; i < num_configs ; i++ ) {
-      PrintFBConfigInfo(dpy, fbconfig[i], GL_TRUE);
+      PrintFBConfigInfo(dpy, scrnum, fbconfig[i], GL_TRUE);
    }
 
    /* window attributes */
@@ -557,7 +559,7 @@ main(int argc, char *argv[])
    Display *dpy;
    Window win;
    GLXContext ctx;
-   char *dpyName = ":0";
+   const char *dpyName = NULL;
    GLboolean printInfo = GL_FALSE;
    int i;