exclude CVS dirs from tar file

intersection is found, it essentially reverses the two bounds with
intersecting edges above the point of intersection.  This needs to be
taken into account when inserting vertices from these bounds,
otherwise they will be added to the wrong end of the output contours.
Quite an easy fix, really.

Still cleaning up redundant code in the clipping functions, left over
from the original Vatti/GPC algorithms.  Will do some more thorough
testing of the fix with the programs that have had problems reported,
and finish cleaning up the clipping code.

Makefile.X11

@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.48 2001/06/19 21:49:06 brianp Exp $
+# $Id: Makefile.X11,v 1.12.2.8 2000/03/23 00:14:28 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.5
+# Version:  3.2
 # 
 # Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
 # 
@@ -66,25 +66,28 @@ default:
 	@echo "  make irix6-64             for SGI systems with IRIX 6.x, make 64-bit libs"
 	@echo "  make irix6-64-dso         for SGI systems with IRIX 6.x, make 64-bit DSOs"
 
-	@echo "  make linux                for Linux systems, make shared .so libs"
-	@echo "  make linux-static         for Linux systems, make static .a libs"
-	@echo "  make linux-trace          for Linux systems, with API trace extension"
-	@echo "  make linux-x86            for Linux on Intel, make shared .so libs"
-	@echo "  make linux-x86-static     for Linux on Intel, make static .a libs"
+	@echo "  make linux                for Linux systems, make static .a libs"
+	@echo "  make linux-elf            for Linux systems, make ELF shared libs"
+	@echo "  make linux-386            for Linux w/ Intel assembly"
+	@echo "  make linux-386-elf        for Linux w/ Intel assembly, make ELF shared libs"
 	@echo "  make linux-ggi            for Linux systems with libggi"
 	@echo "  make linux-386-ggi        for Linux systems with libggi w/ Intel assembly"
+	@echo "  make linux-alpha          for Linux on Alpha systems"
+	@echo "  make linux-alpha-elf      for Linux on Alpha systems, make ELF shared libs"
+	@echo "  make linux-ppc            for Linux on PowerPC systems"
+	@echo "  make linux-ppc-so         for Linux on PowerPC systems, make shared libs"
 	@echo "  make linux-glide          for Linux w/ 3Dfx Glide driver"
 	@echo "  make linux-386-glide      for Linux w/ 3Dfx Glide driver, Intel assembly"
 	@echo "  make linux-386-opt-glide  for Linux with 3Dfx Voodoo1 for GLQuake"
-	@echo "  make linux-x86-glide      for Linux w/ all x86 asm for Glide"
-	@echo "  make linux-alpha          for Linux on Alpha systems"
-	@echo "  make linux-alpha-static   for Linux on Alpha systems, static libs"
-	@echo "  make linux-ppc            for Linux on PowerPC systems"
-	@echo "  make linux-ppc-static     for Linux on PowerPC systems, static libs"
+	@echo "  make linux-386-opt-V2-glide  for Linux with 3Dfx Voodoo2 for GLQuake"
+	@echo "  make linux-3dnow          for Linux on AMD w/ 3DNow!"
+	@echo "  make linux-3dnow-glide    for Linux on AMD w/ 3DNow! for Glide"
+	@echo "  make linux-386-pthread    for Linux w/ Intel assembly and linuxthreads"
+	@echo "  make linux-386-pthread-shared  for Linux w/ Intel assembly and linuxthreads"
+	@echo "  make linux-386-pthread-shared-glide  for Linux w/ Intel assembly, linuxthreads, and 3Dfx Glide driver"
 	@echo "  make linux-sparc          for Linux on Sparc systems"
 	@echo "  make linux-sparc5-elf     for Sparc5 systems, make ELF shared libs"
 	@echo "  make linux-sparc-ultra    for UltraSparc systems, make ELF shared libs"
-	@echo "  make linux-osmesa16       for 16-bit/channel OSMesa"
 	@echo "  make lynxos               for LynxOS systems with GCC"
 	@echo "  make macintosh            for Macintosh"
 	@echo "  make machten-2.2          for Macs w/ MachTen 2.2 (68k w/ FPU)"
@@ -133,19 +136,18 @@ default:
 
 
 
-# XXX we may have to split up this group of targets into those that
-# have a C++ compiler and those that don't for the SI-GLU library.
-
 aix aix-sl amix bsdos bsdos4 dgux freebsd freebsd-386 gcc \
 hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
 hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
 irix4 irix5 irix5-gcc irix5-dso irix6-o32 irix6-o32-dso \
-linux linux-static linux-debug linux-static-debug linux-prof \
-linux-x86 linux-x86-static linux-x86-debug \
+linux linux-debug linux-prof linux-elf linux-elf-debug linux-glide-debug \
 linux-glide linux-386-glide linux-386-opt-glide \
-linux-x86-glide linux-glide-debug linux-glide-prof \
-linux-alpha-static linux-alpha \
-linux-ppc-static linux-ppc \
+linux-386-opt-V2-glide \
+linux-386 linux-386-elf \
+linux-3dnow linux-3dnow-glide \
+linux-alpha linux-alpha-elf \
+linux-ppc linux-ppc-so \
+linux-386-pthread linux-386-pthread-shared linux-386-pthread-shared-glide \
 linux-sparc \
 linux-sparc5-elf \
 linux-sparc-ultra \
@@ -157,33 +159,31 @@ sunos5 sunos5-sl sunos5-ultra sunos5-ultra-sl sunos5-gcc sunos5-gcc-sl \
 sunos5-thread sunos5-pthread sunos5-gcc-thread sunos5-gcc-pthread \
 sunos5-x11r6-gcc-sl ultrix-gcc unicos unixware uwin vistra:
 	-mkdir lib
-	if [ -d src      ] ; then touch src/depend      ; fi
-	if [ -d si-glu   ] ; then touch si-glu/depend  ; fi
+	touch src/depend
+	touch src-glu/depend
 	if [ -d src-glut ] ; then touch src-glut/depend ; fi
-	if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
-	if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d si-glu   ] ; then cd si-glu   ; $(MAKE) -f Makefile.X11 $@ ; fi
+	cd src ; $(MAKE) -f Makefile.X11 $@
+	cd src-glu ; $(MAKE) -f Makefile.X11 $@
 	if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d demos    ] ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d xdemos   ] ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d samples  ] ; then cd samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d book     ] ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d demos ]    ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d xdemos ]   ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d samples ]  ; then cd samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d book ]     ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 
+
 irix6-n32 irix6-n32-dso irix6-gcc-n32-sl irix-debug:
 	-mkdir lib32
-	if [ -d src      ] ; then touch src/depend      ; fi
-	if [ -d src-glu  ] ; then touch src-glu/depend  ; fi
+	touch src/depend
+	touch src-glu/depend
 	if [ -d src-glut ] ; then touch src-glut/depend ; fi
-	if [ -d src-glut ] ; then touch src-glut/depend ; fi
-	if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
-	if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d src-glu  ] ; then cd src-glu  ; $(MAKE) -f Makefile.X11 $@ ; fi
+	cd src ; $(MAKE) -f Makefile.X11 $@
+	cd src-glu ; $(MAKE) -f Makefile.X11 $@
 	if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d demos    ] ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d xdemos   ] ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d samples  ] ; then cd samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d book     ] ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d demos ]    ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d xdemos ]   ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d samples ]  ; then cd samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d book ]     ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 
 
@@ -192,14 +192,13 @@ irix6-64 irix6-64-dso:
 	touch src/depend
 	touch src-glu/depend
 	if [ -d src-glut ] ; then touch src-glut/depend ; fi
-	if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
-	if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d src-glu  ] ; then cd src-glu  ; $(MAKE) -f Makefile.X11 $@ ; fi
+	cd src ; $(MAKE) -f Makefile.X11 $@
+	cd src-glu ; $(MAKE) -f Makefile.X11 $@
 	if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d demos    ] ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d xdemos   ] ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d samples  ] ; then cd samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d book     ] ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d demos ]    ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d xdemos ]   ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d samples ]  ; then cd samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d book ]     ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 
 
@@ -213,26 +212,25 @@ beos-r4:
 	touch src/depend
 	-rm src-glu/depend
 	touch src-glu/depend
-	if [ -d src     ] ; then cd src     ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
-	if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
-	if [ -d BeOS    ] ; then cd BeOS    ; $(MAKE)                        ; fi
-	if [ -d src-glut.beos ] ; then cd src-glut.beos ; $(MAKE)            ; fi
+	cd src ; $(MAKE) -f Makefile.BeOS-R4 $@
+	cd src-glu ; $(MAKE) -f Makefile.BeOS-R4 $@
+	if [ -d BeOS ]          ; then cd BeOS          ; $(MAKE) ; fi
+	if [ -d src-glut.beos ] ; then cd src-glut.beos ; $(MAKE) ; fi
 	if [ -d src-glut.beos ] ; then cp src-glut.beos/obj*/libglut.so lib  ; fi
-	if [ -d demos   ] ; then cd demos   ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
+	if [ -d demos ]   ; then cd demos   ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 	if [ -d samples ] ; then cd samples ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
-	if [ -d book    ] ; then cd book    ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
+	if [ -d book ]    ; then cd book    ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 
 pgi-cygnus pgi-mingw32 \
 cygnus cygnus-linux:
 	-mkdir lib
 	touch src/depend
 	touch src-glu/depend
-	if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
-	if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d src-glu  ] ; then cd src-glu  ; $(MAKE) -f Makefile.X11 $@ ; fi
+	cd src ; $(MAKE) -f Makefile.X11 $@
+	cd src-glu ; $(MAKE) -f Makefile.X11 $@
 	if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d demos    ] ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d xdemos   ] ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d demos ]    ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
+	if [ -d xdemos ]  ; then cd xdemos  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 
 macintosh:
@@ -264,17 +262,16 @@ os2-x11:
 linux-ggi linux-386-ggi:
 	-mkdir lib
 	touch src/depend
-	touch si-glu/depend
-	if [ -d src-glut        ] ; then touch src-glut/depend ; fi
-	if [ -d widgets-sgi     ] ; then touch widgets-sgi/depend ; fi
-	if [ -d ggi             ] ; then touch ggi/depend      ; fi
-	if [ -d src             ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d src/GGI/default ] ; then cd src/GGI/default ; $(MAKE)      ; fi
-	if [ -d src/GGI/display ] ; then cd src/GGI/display ; $(MAKE)      ; fi
-	if [ -d si-glu ]   ; then cd si-glu   ; $(MAKE) -f Makefile.X11 $@ ; fi
+	touch src-glu/depend
+	if [ -d src-glut ] ; then touch src-glut/depend ; fi
+	if [ -d ggi ] ; then touch ggi/depend ; fi
+	cd src ; $(MAKE) -f Makefile.X11 $@
+	cd src/GGI/default ; $(MAKE)
+	cd src/GGI/display ; $(MAKE)
+	cd src-glu ; $(MAKE) -f Makefile.X11 $@
 #	if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d ggi ]      ; then cd ggi      ; $(MAKE) -f Makefile.X11 $@ ; fi
-	if [ -d ggi ]      ; then cd ggi/demos; $(MAKE)                    ; fi
+	if [ -d ggi ]      ; then cd ggi/demos; $(MAKE)    ; fi
 	if [ -d demos ]    ; then cd demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d xdemos ]   ; then cd xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d samples ]  ; then cd samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
@@ -294,12 +291,6 @@ linux-ggi-install linux-386-ggi-install:
 #	echo ".include $(DESTDIR)/etc/ggi/ggimesa.conf" >> $(DESTDIR)/etc/ggi/libggi.conf ; \
 #	fi
 
-linux-osmesa16:
-	-mkdir lib
-	if [ -d src ] ; then touch src/depend ; fi
-	if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.OSMesa16 $@ ; fi
-	
-
 # Remove .o files, emacs backup files, etc.
 clean:
 	-rm -f ggi/*~ *.o
@@ -309,15 +300,12 @@ clean:
 	-rm -f include/GL/*~
 	-rm -f src/*.o src/*~ src/*.a src/*/*.o src/*/*~
 	-rm -f src-glu/*.o src-glu/*~ src-glu/*.a
-	-rm -f si-glu/*/*.o si-glu/*/*/*.o
 	-rm -f src-glut/*.o
 	-rm -f demos/*.o
 	-rm -f book/*.o book/*~
 	-rm -f xdemos/*.o xdemos/*~
 	-rm -f samples/*.o samples/*~
 	-rm -f ggi/*.o ggi/demos/*.o ggi/*.a
-	-rm -f widgets-sgi/*.o
-	-rm -f widgets-mesa/*/*.o
 
 # Remove everything that can be remade
 realclean: clean
@@ -331,282 +319,208 @@ realclean: clean
 
 
 
-DIRECTORY = Mesa-3.5
-LIB_NAME = MesaLib-3.5
-DEMO_NAME = MesaDemos-3.5
-GLU_NAME = MesaGLU-3.5
-GLUT_NAME = GLUT-3.7
+DIRECTORY = Mesa-3.2
+LIB_NAME = MesaLib-3.2
+DEMO_NAME = MesaDemos-3.2
 
 
 LIB_FILES =	\
-	$(DIRECTORY)/Makefile*						\
-	$(DIRECTORY)/Make-config					\
-	$(DIRECTORY)/acconfig.h						\
-	$(DIRECTORY)/acinclude.m4					\
-	$(DIRECTORY)/aclocal.m4						\
-	$(DIRECTORY)/common_rules.make					\
-	$(DIRECTORY)/conf.h.in						\
-	$(DIRECTORY)/config.guess					\
-	$(DIRECTORY)/config.sub						\
-	$(DIRECTORY)/configure						\
-	$(DIRECTORY)/configure.in					\
-	$(DIRECTORY)/install-sh						\
-	$(DIRECTORY)/ltconfig						\
-	$(DIRECTORY)/ltmain.sh						\
-	$(DIRECTORY)/missing						\
-	$(DIRECTORY)/mkinstalldirs					\
-	$(DIRECTORY)/stamp-h.in						\
-	$(DIRECTORY)/docs/CONFIG					\
-	$(DIRECTORY)/docs/CONFORM					\
-	$(DIRECTORY)/docs/COPYING					\
-	$(DIRECTORY)/docs/COPYRIGHT					\
-	$(DIRECTORY)/docs/DEVINFO					\
-	$(DIRECTORY)/docs/IAFA-PACKAGE					\
-	$(DIRECTORY)/docs/INSTALL					\
-	$(DIRECTORY)/docs/INSTALL.GNU					\
-	$(DIRECTORY)/docs/README					\
-	$(DIRECTORY)/docs/README.*					\
-	$(DIRECTORY)/docs/RELNOTES*					\
-	$(DIRECTORY)/docs/VERSIONS					\
-	$(DIRECTORY)/docs/*.spec					\
-	$(DIRECTORY)/bin/README						\
-	$(DIRECTORY)/bin/mklib*						\
-	$(DIRECTORY)/descrip.mms					\
-	$(DIRECTORY)/mms-config						\
-	$(DIRECTORY)/m4/*.m4						\
-	$(DIRECTORY)/xlib.opt						\
-	$(DIRECTORY)/mesawin32.mak					\
-	$(DIRECTORY)/include/GL/internal/glcore.h			\
-	$(DIRECTORY)/include/GL/Makefile.in				\
-	$(DIRECTORY)/include/GL/Makefile.am				\
-	$(DIRECTORY)/include/GL/dosmesa.h				\
-	$(DIRECTORY)/include/GL/amesa.h					\
-	$(DIRECTORY)/include/GL/fxmesa.h				\
-	$(DIRECTORY)/include/GL/ggimesa.h				\
-	$(DIRECTORY)/include/GL/gl.h					\
-	$(DIRECTORY)/include/GL/glext.h					\
-	$(DIRECTORY)/include/GL/gl_mangle.h				\
-	$(DIRECTORY)/include/GL/glu.h					\
-	$(DIRECTORY)/include/GL/glu_mangle.h				\
-	$(DIRECTORY)/include/GL/glx.h					\
-	$(DIRECTORY)/include/GL/glxext.h				\
-	$(DIRECTORY)/include/GL/glx_mangle.h				\
-	$(DIRECTORY)/include/GL/mesa_wgl.h				\
-	$(DIRECTORY)/include/GL/mglmesa.h				\
-	$(DIRECTORY)/include/GL/osmesa.h				\
-	$(DIRECTORY)/include/GL/svgamesa.h				\
-	$(DIRECTORY)/include/GL/wmesa.h					\
-	$(DIRECTORY)/include/GL/xmesa.h					\
-	$(DIRECTORY)/include/GL/xmesa_x.h				\
-	$(DIRECTORY)/include/GL/xmesa_xf86.h				\
-	$(DIRECTORY)/include/GLView.h					\
-	$(DIRECTORY)/include/Makefile.in				\
-	$(DIRECTORY)/include/Makefile.am				\
-	$(DIRECTORY)/src/Makefile*					\
-	$(DIRECTORY)/src/libGL_la_SOURCES				\
-	$(DIRECTORY)/src/descrip.mms					\
-	$(DIRECTORY)/src/mms_depend					\
-	$(DIRECTORY)/src/mesa.conf					\
-	$(DIRECTORY)/src/*.def						\
-	$(DIRECTORY)/src/depend						\
-	$(DIRECTORY)/src/*.[chS]					\
-	$(DIRECTORY)/src/array_cache/*.[ch]				\
-	$(DIRECTORY)/src/array_cache/Makefile*				\
-	$(DIRECTORY)/src/array_cache/libMesaAC_la_SOURCES		\
-	$(DIRECTORY)/src/math/*.[ch]					\
-	$(DIRECTORY)/src/math/Makefile*					\
-	$(DIRECTORY)/src/swrast/*.[ch]					\
-	$(DIRECTORY)/src/swrast/Makefile*				\
-	$(DIRECTORY)/src/swrast/libMesaSwrast_la_SOURCES		\
-	$(DIRECTORY)/src/swrast_setup/*.[ch]				\
-	$(DIRECTORY)/src/swrast_setup/Makefile*				\
-	$(DIRECTORY)/src/tnl/*.[ch]					\
-	$(DIRECTORY)/src/tnl/Makefile*					\
-	$(DIRECTORY)/src/tnl/libMesaTnl_la_SOURCES			\
-	$(DIRECTORY)/src/BeOS/*.cpp					\
-	$(DIRECTORY)/src/FX/Makefile.am					\
-	$(DIRECTORY)/src/FX/Makefile.in					\
-	$(DIRECTORY)/src/FX/libMesaFX_la_SOURCES			\
-	$(DIRECTORY)/src/FX/*.[ch]					\
-	$(DIRECTORY)/src/FX/*.def					\
-	$(DIRECTORY)/src/FX/X86/Makefile.am				\
-	$(DIRECTORY)/src/FX/X86/Makefile.in				\
-	$(DIRECTORY)/src/FX/X86/*.[Shc]					\
-	$(DIRECTORY)/src/GGI/Makefile.am				\
-	$(DIRECTORY)/src/GGI/Makefile.in				\
-	$(DIRECTORY)/src/GGI/*.[ch]					\
-	$(DIRECTORY)/src/GGI/ggimesa.conf.in				\
-	$(DIRECTORY)/src/GGI/default/*.c				\
-	$(DIRECTORY)/src/GGI/default/Makefile.am			\
-	$(DIRECTORY)/src/GGI/default/Makefile.in			\
-	$(DIRECTORY)/src/GGI/default/genkgi.conf.in			\
-	$(DIRECTORY)/src/GGI/display/*.c				\
-	$(DIRECTORY)/src/GGI/display/Makefile.am			\
-	$(DIRECTORY)/src/GGI/display/Makefile.in			\
-	$(DIRECTORY)/src/GGI/display/fbdev.conf.in			\
-	$(DIRECTORY)/src/GGI/include/Makefile.am			\
-	$(DIRECTORY)/src/GGI/include/Makefile.in			\
-	$(DIRECTORY)/src/GGI/include/ggi/Makefile.am			\
-	$(DIRECTORY)/src/GGI/include/ggi/Makefile.in			\
-	$(DIRECTORY)/src/GGI/include/ggi/mesa/Makefile.am		\
-	$(DIRECTORY)/src/GGI/include/ggi/mesa/Makefile.in		\
-	$(DIRECTORY)/src/GGI/include/ggi/mesa/*.h			\
-	$(DIRECTORY)/src/KNOWN_BUGS					\
-	$(DIRECTORY)/src/OSmesa/Makefile.am				\
-	$(DIRECTORY)/src/OSmesa/Makefile.in				\
-	$(DIRECTORY)/src/OSmesa/*.[ch]					\
-	$(DIRECTORY)/src/SPARC/*.[chS]					\
-	$(DIRECTORY)/src/SPARC/Makefile.am				\
-	$(DIRECTORY)/src/SPARC/Makefile.in				\
-	$(DIRECTORY)/src/SVGA/Makefile.am				\
-	$(DIRECTORY)/src/SVGA/Makefile.in				\
-	$(DIRECTORY)/src/SVGA/*.[ch]					\
-	$(DIRECTORY)/src/Trace/*.[ch]					\
-	$(DIRECTORY)/src/Trace/Makefile.am				\
-	$(DIRECTORY)/src/Trace/Makefile.in				\
-	$(DIRECTORY)/src/Windows/*.[ch]					\
-	$(DIRECTORY)/src/Windows/*.def					\
-	$(DIRECTORY)/src/X/Makefile.am					\
-	$(DIRECTORY)/src/X/Makefile.in					\
-	$(DIRECTORY)/src/X/*.[ch]					\
-	$(DIRECTORY)/src/X86/*.[ch]					\
-	$(DIRECTORY)/src/X86/Makefile.am				\
-	$(DIRECTORY)/src/X86/Makefile.in				\
-	$(DIRECTORY)/src/X86/*.S					\
-	$(DIRECTORY)/si-glu/Makefile.am					\
-	$(DIRECTORY)/si-glu/Makefile.in					\
-	$(DIRECTORY)/si-glu/Makefile.X11				\
-	$(DIRECTORY)/si-glu/dummy.cc					\
-	$(DIRECTORY)/si-glu/descrip.mms					\
-	$(DIRECTORY)/si-glu/mesaglu.opt					\
-	$(DIRECTORY)/si-glu/include/gluos.h				\
-	$(DIRECTORY)/si-glu/include/Makefile.am				\
-	$(DIRECTORY)/si-glu/include/Makefile.in				\
-	$(DIRECTORY)/si-glu/libnurbs/Makefile.am			\
-	$(DIRECTORY)/si-glu/libnurbs/Makefile.in			\
-	$(DIRECTORY)/si-glu/libnurbs/interface/*.h			\
-	$(DIRECTORY)/si-glu/libnurbs/interface/*.cc			\
-	$(DIRECTORY)/si-glu/libnurbs/interface/libNIFac_la_SOURCES	\
-	$(DIRECTORY)/si-glu/libnurbs/interface/Makefile.am		\
-	$(DIRECTORY)/si-glu/libnurbs/interface/Makefile.in		\
-	$(DIRECTORY)/si-glu/libnurbs/internals/*.h			\
-	$(DIRECTORY)/si-glu/libnurbs/internals/*.cc			\
-	$(DIRECTORY)/si-glu/libnurbs/internals/libNInt_la_SOURCES	\
-	$(DIRECTORY)/si-glu/libnurbs/internals/Makefile.am		\
-	$(DIRECTORY)/si-glu/libnurbs/internals/Makefile.in		\
-	$(DIRECTORY)/si-glu/libnurbs/nurbtess/*.h			\
-	$(DIRECTORY)/si-glu/libnurbs/nurbtess/*.cc			\
-	$(DIRECTORY)/si-glu/libnurbs/nurbtess/libNTess_la_SOURCES	\
-	$(DIRECTORY)/si-glu/libnurbs/nurbtess/Makefile.am		\
-	$(DIRECTORY)/si-glu/libnurbs/nurbtess/Makefile.in		\
-	$(DIRECTORY)/si-glu/libtess/README				\
-	$(DIRECTORY)/si-glu/libtess/alg-outline				\
-	$(DIRECTORY)/si-glu/libtess/*.[ch]				\
-	$(DIRECTORY)/si-glu/libtess/libtess_la_SOURCES			\
-	$(DIRECTORY)/si-glu/libtess/Makefile.am				\
-	$(DIRECTORY)/si-glu/libtess/Makefile.in				\
-	$(DIRECTORY)/si-glu/libutil/*.[ch]				\
-	$(DIRECTORY)/si-glu/libutil/libutil_la_SOURCES			\
-	$(DIRECTORY)/si-glu/libutil/Makefile.am				\
-	$(DIRECTORY)/si-glu/libutil/Makefile.in				\
-	$(DIRECTORY)/src-glu/README[12]					\
-	$(DIRECTORY)/src-glu/Makefile*					\
-	$(DIRECTORY)/src-glu/descrip.mms				\
-	$(DIRECTORY)/src-glu/mms_depend					\
-	$(DIRECTORY)/src-glu/*.def					\
-	$(DIRECTORY)/src-glu/depend					\
-	$(DIRECTORY)/src-glu/*.[ch]					\
-	$(DIRECTORY)/widgets-mesa/ChangeLog				\
-	$(DIRECTORY)/widgets-mesa/INSTALL				\
-	$(DIRECTORY)/widgets-mesa/Makefile.in				\
-	$(DIRECTORY)/widgets-mesa/README				\
-	$(DIRECTORY)/widgets-mesa/TODO					\
-	$(DIRECTORY)/widgets-mesa/configure				\
-	$(DIRECTORY)/widgets-mesa/configure.in				\
-	$(DIRECTORY)/widgets-mesa/demos/ChangeLog			\
-	$(DIRECTORY)/widgets-mesa/demos/Cube				\
-	$(DIRECTORY)/widgets-mesa/demos/Ed				\
-	$(DIRECTORY)/widgets-mesa/demos/Makefile.in			\
-	$(DIRECTORY)/widgets-mesa/demos/Mcube				\
-	$(DIRECTORY)/widgets-mesa/demos/Tea				\
-	$(DIRECTORY)/widgets-mesa/demos/*.[ch]				\
-	$(DIRECTORY)/widgets-mesa/demos/events				\
-	$(DIRECTORY)/widgets-mesa/include/GL/ChangeLog			\
-	$(DIRECTORY)/widgets-mesa/include/GL/*.h			\
-	$(DIRECTORY)/widgets-mesa/include/GL/Makefile.in		\
-	$(DIRECTORY)/widgets-mesa/man/ChangeLog				\
-	$(DIRECTORY)/widgets-mesa/man/GL*				\
-	$(DIRECTORY)/widgets-mesa/man/Makefile.in			\
-	$(DIRECTORY)/widgets-mesa/man/Mesa*				\
-	$(DIRECTORY)/widgets-mesa/src/ChangeLog				\
-	$(DIRECTORY)/widgets-mesa/src/*.c				\
-	$(DIRECTORY)/widgets-mesa/src/Makefile.in			\
-	$(DIRECTORY)/widgets-sgi/*.[ch]					\
-	$(DIRECTORY)/widgets-sgi/Makefile*				\
-	$(DIRECTORY)/widgets-sgi/README					\
-	$(DIRECTORY)/util/README					\
-	$(DIRECTORY)/util/Makefile.am					\
-	$(DIRECTORY)/util/Makefile.in					\
-	$(DIRECTORY)/util/*.[ch]					\
-	$(DIRECTORY)/util/sampleMakefile				\
-	$(DIRECTORY)/vms/analyze_map.com				\
-	$(DIRECTORY)/vms/xlib.opt					\
-	$(DIRECTORY)/vms/xlib_share.opt					\
-	$(DIRECTORY)/BeOS/Makefile					\
-	$(DIRECTORY)/BeOS/*.cpp
-
-OBSOLETE_LIB_FILES = \
-	$(DIRECTORY)/src/Allegro/*.[ch]					\
-	$(DIRECTORY)/src/D3D/*.cpp					\
-	$(DIRECTORY)/src/D3D/*.CPP					\
-	$(DIRECTORY)/src/D3D/*.h					\
-	$(DIRECTORY)/src/D3D/*.H					\
-	$(DIRECTORY)/src/D3D/*.c					\
-	$(DIRECTORY)/src/D3D/*.C					\
-	$(DIRECTORY)/src/D3D/MAKEFILE					\
-	$(DIRECTORY)/src/D3D/*bat					\
-	$(DIRECTORY)/src/D3D/*DEF					\
-	$(DIRECTORY)/src/DOS/DEPEND.DOS					\
-	$(DIRECTORY)/src/DOS/*.c					\
-	$(DIRECTORY)/src/S3/*.[ch]					\
-	$(DIRECTORY)/src/S3/*.def					\
-	$(DIRECTORY)/src/S3/*.mak					\
-	$(DIRECTORY)/src/S3/*.rc					\
-	$(DIRECTORY)/macos/README					\
-	$(DIRECTORY)/macos/gli_api/*.h					\
-	$(DIRECTORY)/macos/cglpane/CGLPane.*				\
-	$(DIRECTORY)/macos/include-mac/*.h				\
-	$(DIRECTORY)/macos/libraries/*.stub				\
-	$(DIRECTORY)/macos/libraries/*Stub				\
-	$(DIRECTORY)/macos/projects/*.mcp				\
-	$(DIRECTORY)/macos/projects/*.exp				\
-	$(DIRECTORY)/macos/projects/*.h					\
-	$(DIRECTORY)/macos/resources/*.c				\
-	$(DIRECTORY)/macos/resources/*.r				\
-	$(DIRECTORY)/macos/resources/*.rsrc				\
-	$(DIRECTORY)/macos/src-agl/*.exp				\
-	$(DIRECTORY)/macos/src-agl/*.[ch]				\
-	$(DIRECTORY)/macos/src-gli/*.[ch]				\
-	$(DIRECTORY)/OpenStep
-
+	$(DIRECTORY)/Makefile*					\
+	$(DIRECTORY)/Make-config				\
+	$(DIRECTORY)/acconfig.h					\
+	$(DIRECTORY)/acinclude.m4				\
+	$(DIRECTORY)/aclocal.m4					\
+	$(DIRECTORY)/conf.h.in					\
+	$(DIRECTORY)/config.guess				\
+	$(DIRECTORY)/config.sub					\
+	$(DIRECTORY)/configure					\
+	$(DIRECTORY)/configure.in				\
+	$(DIRECTORY)/install-sh					\
+	$(DIRECTORY)/ltconfig					\
+	$(DIRECTORY)/ltmain.sh					\
+	$(DIRECTORY)/missing					\
+	$(DIRECTORY)/mkinstalldirs				\
+	$(DIRECTORY)/stamp-h.in					\
+	$(DIRECTORY)/configure					\
+	$(DIRECTORY)/docs/CONFIG				\
+	$(DIRECTORY)/docs/CONFORM				\
+	$(DIRECTORY)/docs/COPYING				\
+	$(DIRECTORY)/docs/COPYRIGHT				\
+	$(DIRECTORY)/docs/DEVINFO				\
+	$(DIRECTORY)/docs/IAFA-PACKAGE				\
+	$(DIRECTORY)/docs/INSTALL				\
+	$(DIRECTORY)/docs/INSTALL.GNU				\
+	$(DIRECTORY)/docs/README				\
+	$(DIRECTORY)/docs/README.*				\
+	$(DIRECTORY)/docs/RELNOTES				\
+	$(DIRECTORY)/docs/VERSIONS				\
+	$(DIRECTORY)/docs/*.spec				\
+	$(DIRECTORY)/bin/README					\
+	$(DIRECTORY)/bin/mklib*					\
+	$(DIRECTORY)/*.BAT					\
+	$(DIRECTORY)/*.bat					\
+	$(DIRECTORY)/descrip.mms				\
+	$(DIRECTORY)/mms-config					\
+	$(DIRECTORY)/xlib.opt					\
+	$(DIRECTORY)/STARTUP.MK					\
+	$(DIRECTORY)/mesawin32.mak				\
+	$(DIRECTORY)/Names.win					\
+	$(DIRECTORY)/win32-openstep.sh				\
+	$(DIRECTORY)/Makefile.dja				\
+	$(DIRECTORY)/common.dja					\
+	$(DIRECTORY)/include/GL/Makefile.in			\
+	$(DIRECTORY)/include/GL/Makefile.am			\
+	$(DIRECTORY)/include/GL/amesa.h				\
+	$(DIRECTORY)/include/GL/dosmesa.h			\
+	$(DIRECTORY)/include/GL/foomesa.h			\
+	$(DIRECTORY)/include/GL/fxmesa.h			\
+	$(DIRECTORY)/include/GL/ggimesa.h			\
+	$(DIRECTORY)/include/GL/gl.h				\
+	$(DIRECTORY)/include/GL/gl_mangle.h			\
+	$(DIRECTORY)/include/GL/glu.h				\
+	$(DIRECTORY)/include/GL/glu_mangle.h			\
+	$(DIRECTORY)/include/GL/glx.h				\
+	$(DIRECTORY)/include/GL/glx_mangle.h			\
+	$(DIRECTORY)/include/GL/mesa_wgl.h			\
+	$(DIRECTORY)/include/GL/mglmesa.h			\
+	$(DIRECTORY)/include/GL/osmesa.h			\
+	$(DIRECTORY)/include/GL/svgamesa.h			\
+	$(DIRECTORY)/include/GL/wmesa.h				\
+	$(DIRECTORY)/include/GL/xmesa.h				\
+	$(DIRECTORY)/include/GL/xmesa_x.h			\
+	$(DIRECTORY)/include/GL/xmesa_xf86.h			\
+	$(DIRECTORY)/include/GLView.h				\
+	$(DIRECTORY)/include/Makefile.in			\
+	$(DIRECTORY)/include/Makefile.am			\
+	$(DIRECTORY)/src/Makefile*				\
+	$(DIRECTORY)/src/descrip.mms				\
+	$(DIRECTORY)/src/mms_depend				\
+	$(DIRECTORY)/src/mesa.conf				\
+	$(DIRECTORY)/src/*.def					\
+	$(DIRECTORY)/src/depend					\
+	$(DIRECTORY)/src/*.[chS]				\
+	$(DIRECTORY)/src/Allegro/*.[ch]				\
+	$(DIRECTORY)/src/BeOS/*.cpp				\
+	$(DIRECTORY)/src/D3D/*.cpp				\
+	$(DIRECTORY)/src/D3D/*.CPP				\
+	$(DIRECTORY)/src/D3D/*.h				\
+	$(DIRECTORY)/src/D3D/*.H				\
+	$(DIRECTORY)/src/D3D/*.c				\
+	$(DIRECTORY)/src/D3D/*.C				\
+	$(DIRECTORY)/src/D3D/MAKEFILE				\
+	$(DIRECTORY)/src/D3D/*bat				\
+	$(DIRECTORY)/src/D3D/*DEF				\
+	$(DIRECTORY)/src/DOS/DEPEND.DOS				\
+	$(DIRECTORY)/src/DOS/*.c				\
+	$(DIRECTORY)/src/FX/Makefile.am				\
+	$(DIRECTORY)/src/FX/Makefile.in				\
+	$(DIRECTORY)/src/FX/*.[ch]				\
+	$(DIRECTORY)/src/FX/*.def				\
+	$(DIRECTORY)/src/FX/X86/Makefile.am			\
+	$(DIRECTORY)/src/FX/X86/Makefile.in			\
+	$(DIRECTORY)/src/FX/X86/*.[Shc]				\
+	$(DIRECTORY)/src/GGI/Makefile.am			\
+	$(DIRECTORY)/src/GGI/Makefile.in			\
+	$(DIRECTORY)/src/GGI/*.[ch]				\
+	$(DIRECTORY)/src/GGI/ggimesa.conf.in			\
+	$(DIRECTORY)/src/GGI/default/*.c			\
+	$(DIRECTORY)/src/GGI/default/Makefile.am		\
+	$(DIRECTORY)/src/GGI/default/Makefile.in		\
+	$(DIRECTORY)/src/GGI/default/genkgi.conf.in		\
+	$(DIRECTORY)/src/GGI/display/*.c			\
+	$(DIRECTORY)/src/GGI/display/Makefile.am		\
+	$(DIRECTORY)/src/GGI/display/Makefile.in		\
+	$(DIRECTORY)/src/GGI/display/fbdev.conf.in		\
+	$(DIRECTORY)/src/GGI/include/Makefile.am		\
+	$(DIRECTORY)/src/GGI/include/Makefile.in		\
+	$(DIRECTORY)/src/GGI/include/ggi/Makefile.am		\
+	$(DIRECTORY)/src/GGI/include/ggi/Makefile.in		\
+	$(DIRECTORY)/src/GGI/include/ggi/mesa/Makefile.am	\
+	$(DIRECTORY)/src/GGI/include/ggi/mesa/Makefile.in	\
+	$(DIRECTORY)/src/GGI/include/ggi/mesa/*.h		\
+	$(DIRECTORY)/src/KNOWN_BUGS				\
+	$(DIRECTORY)/src/MGL/*.[ch]				\
+	$(DIRECTORY)/src/MGL/*.txt				\
+	$(DIRECTORY)/src/OSmesa/Makefile.am			\
+	$(DIRECTORY)/src/OSmesa/Makefile.in			\
+	$(DIRECTORY)/src/OSmesa/*.[ch]				\
+	$(DIRECTORY)/src/S3/*.[ch]				\
+	$(DIRECTORY)/src/S3/*.def				\
+	$(DIRECTORY)/src/S3/*.mak				\
+	$(DIRECTORY)/src/S3/*.rc				\
+	$(DIRECTORY)/src/SVGA/Makefile.am			\
+	$(DIRECTORY)/src/SVGA/Makefile.in			\
+	$(DIRECTORY)/src/SVGA/*.[ch]				\
+	$(DIRECTORY)/src/Windows/*.[ch]				\
+	$(DIRECTORY)/src/Windows/*.def				\
+	$(DIRECTORY)/src/X/Makefile.am				\
+	$(DIRECTORY)/src/X/Makefile.in				\
+	$(DIRECTORY)/src/X/*.[ch]				\
+	$(DIRECTORY)/src/X86/*.[ch]				\
+	$(DIRECTORY)/src/X86/Makefile.am			\
+	$(DIRECTORY)/src/X86/Makefile.in			\
+	$(DIRECTORY)/src/X86/*.m4				\
+	$(DIRECTORY)/src/X86/*.S				\
+	$(DIRECTORY)/src/*.dja					\
+	$(DIRECTORY)/src-glu/README[12]				\
+	$(DIRECTORY)/src-glu/Makefile*				\
+	$(DIRECTORY)/src-glu/descrip.mms			\
+	$(DIRECTORY)/src-glu/mms_depend				\
+	$(DIRECTORY)/src-glu/*.def				\
+	$(DIRECTORY)/src-glu/*.dja				\
+	$(DIRECTORY)/src-glu/depend				\
+	$(DIRECTORY)/src-glu/*.[ch]				\
+	$(DIRECTORY)/widgets-mesa				\
+	$(DIRECTORY)/widgets-sgi				\
+	$(DIRECTORY)/util/README				\
+	$(DIRECTORY)/util/Makefile.am				\
+	$(DIRECTORY)/util/Makefile.in				\
+	$(DIRECTORY)/util/*.[ch]				\
+	$(DIRECTORY)/util/sampleMakefile			\
+	$(DIRECTORY)/BeOS/Makefile				\
+	$(DIRECTORY)/BeOS/*.cpp					\
+	$(DIRECTORY)/WIN32/NMAKE.MAK				\
+	$(DIRECTORY)/WIN32/NMAKE.MIF				\
+	$(DIRECTORY)/WIN32/RES/*rc				\
+	$(DIRECTORY)/WIN32/RES/*def				\
+	$(DIRECTORY)/WIN32/RULES/lib.*				\
+	$(DIRECTORY)/WIN32/RULES/progs.*			\
+	$(DIRECTORY)/macos/README				\
+	$(DIRECTORY)/macos/gli_api/*.h				\
+	$(DIRECTORY)/macos/include-mac/*.h			\
+	$(DIRECTORY)/macos/libraries/*.stub			\
+	$(DIRECTORY)/macos/libraries/*Stub			\
+	$(DIRECTORY)/macos/projects/*.mcp			\
+	$(DIRECTORY)/macos/projects/*.exp			\
+	$(DIRECTORY)/macos/projects/*.h				\
+	$(DIRECTORY)/macos/resources/*.c			\
+	$(DIRECTORY)/macos/resources/*.r			\
+	$(DIRECTORY)/macos/resources/*.rsrc			\
+	$(DIRECTORY)/macos/src-agl/*.exp			\
+	$(DIRECTORY)/macos/src-agl/*.[ch]			\
+	$(DIRECTORY)/macos/src-gli/*.[ch]			\
+	$(DIRECTORY)/OpenStep					\
 
 
 DEMO_FILES =	\
 	$(DIRECTORY)/include/GL/glut.h		\
 	$(DIRECTORY)/include/GL/glutf90.h	\
+	$(DIRECTORY)/include/GL/glut_h.dja	\
 	$(DIRECTORY)/src-glut/Makefile*		\
 	$(DIRECTORY)/src-glut/depend		\
 	$(DIRECTORY)/src-glut/*def		\
 	$(DIRECTORY)/src-glut/descrip.mms	\
 	$(DIRECTORY)/src-glut/mms_depend	\
 	$(DIRECTORY)/src-glut/*.[ch]		\
+	$(DIRECTORY)/src-glut.dja/*		\
+	$(DIRECTORY)/src-glut.beos/Makefile	\
+	$(DIRECTORY)/src-glut.beos/*.cpp	\
+	$(DIRECTORY)/src-glut.beos/*.h		\
 	$(DIRECTORY)/images/*			\
 	$(DIRECTORY)/demos/Makefile*		\
 	$(DIRECTORY)/demos/descrip.mms		\
 	$(DIRECTORY)/demos/*.[ch]		\
-	$(DIRECTORY)/demos/*.cxx		\
 	$(DIRECTORY)/demos/*.dat		\
-	$(DIRECTORY)/demos/README		\
 	$(DIRECTORY)/xdemos/Makefile*		\
 	$(DIRECTORY)/xdemos/descrip.mms		\
 	$(DIRECTORY)/xdemos/*.[cf]		\
@@ -616,116 +530,32 @@ DEMO_FILES =	\
 	$(DIRECTORY)/samples/Makefile*		\
 	$(DIRECTORY)/samples/README		\
 	$(DIRECTORY)/samples/*.c		\
+	$(DIRECTORY)/samples/*.dja		\
+	$(DIRECTORY)/3Dfx			\
 	$(DIRECTORY)/mtdemos			\
 	$(DIRECTORY)/ggi
 
-OBSOLETE_DEMO_FILES = \
-	$(DIRECTORY)/include/GL/glut_h.dja	\
-	$(DIRECTORY)/src-glut.dja/*		\
-	$(DIRECTORY)/src-glut.beos/Makefile	\
-	$(DIRECTORY)/src-glut.beos/*.cpp	\
-	$(DIRECTORY)/src-glut.beos/*.h		\
-
-
-SI_GLU_FILES = \
-	$(DIRECTORY)/Makefile*				\
-	$(DIRECTORY)/Make-config			\
-	$(DIRECTORY)/bin/mklib*				\
-	$(DIRECTORY)/include/GL/glu.h			\
-	$(DIRECTORY)/si-glu/Makefile.X11		\
-	$(DIRECTORY)/si-glu/include/gluos.h		\
-	$(DIRECTORY)/si-glu/libnurbs/interface/*.h	\
-	$(DIRECTORY)/si-glu/libnurbs/interface/*.cc	\
-	$(DIRECTORY)/si-glu/libnurbs/internals/*.h	\
-	$(DIRECTORY)/si-glu/libnurbs/internals/*.cc	\
-	$(DIRECTORY)/si-glu/libnurbs/nurbstess/*.h	\
-	$(DIRECTORY)/si-glu/libnurbs/nurbstess/*.cc	\
-	$(DIRECTORY)/si-glu/libtess/README		\
-	$(DIRECTORY)/si-glu/libtess/alg-outline		\
-	$(DIRECTORY)/si-glu/libtess/*.[ch]		\
-	$(DIRECTORY)/si-glu/libutil/*.[ch]
-
-GLU_FILES = \
-	$(DIRECTORY)/Makefile*			\
-	$(DIRECTORY)/Make-config		\
-	$(DIRECTORY)/bin/mklib*			\
-	$(DIRECTORY)/include/GL/gl.h		\
-	$(DIRECTORY)/include/GL/gl_mangle.h	\
-	$(DIRECTORY)/include/GL/glext.h		\
-	$(DIRECTORY)/include/GL/glu.h		\
-	$(DIRECTORY)/include/GL/glu_mangle.h	\
-	$(DIRECTORY)/src-glu/README[12]		\
-	$(DIRECTORY)/src-glu/Makefile*		\
-	$(DIRECTORY)/src-glu/descrip.mms	\
-	$(DIRECTORY)/src-glu/mms_depend		\
-	$(DIRECTORY)/src-glu/*.def		\
-	$(DIRECTORY)/src-glu/depend		\
-	$(DIRECTORY)/src-glu/*.[ch]
-
-GLUT_FILES = \
-	$(DIRECTORY)/Makefile*			\
-	$(DIRECTORY)/Make-config		\
-	$(DIRECTORY)/bin/mklib*			\
-	$(DIRECTORY)/include/GL/gl.h		\
-	$(DIRECTORY)/include/GL/gl_mangle.h	\
-	$(DIRECTORY)/include/GL/glext.h		\
-	$(DIRECTORY)/include/GL/glu.h		\
-	$(DIRECTORY)/include/GL/glu_mangle.h	\
-	$(DIRECTORY)/include/GL/glut.h		\
-	$(DIRECTORY)/include/GL/glutf90.h	\
-	$(DIRECTORY)/src-glut/Makefile*		\
-	$(DIRECTORY)/src-glut/depend		\
-	$(DIRECTORY)/src-glut/*def		\
-	$(DIRECTORY)/src-glut/descrip.mms	\
-	$(DIRECTORY)/src-glut/mms_depend	\
-	$(DIRECTORY)/src-glut/*.[ch]
-
-
-OBSOLETE_GLUT_FILES = \
-	$(DIRECTORY)/include/GL/glut_h.dja	\
-	$(DIRECTORY)/src-glut.dja/*		\
-	$(DIRECTORY)/src-glut.beos/Makefile	\
-	$(DIRECTORY)/src-glut.beos/*.cpp	\
-	$(DIRECTORY)/src-glut.beos/*.h
-
 
 lib_tar:
-	cp Makefile.X11 Makefile ; \
 	cd .. ; \
-	tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
+	tar --exclude CVS -c -v -f $(LIB_NAME).tar $(LIB_FILES) ; \
 	gzip $(LIB_NAME).tar ; \
 	mv $(LIB_NAME).tar.gz $(DIRECTORY)
 
 demo_tar:
 	cd .. ; \
-	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+	tar --exclude CVS -c -v -f $(DEMO_NAME).tar $(DEMO_FILES) ; \
 	gzip $(DEMO_NAME).tar ; \
 	mv $(DEMO_NAME).tar.gz $(DIRECTORY)
 
-glu_tar:
-	cp Makefile.X11 Makefile ; \
-	cd .. ; \
-	tar -cvf $(GLU_NAME).tar $(GLU_FILES) ; \
-	gzip $(GLU_NAME).tar ; \
-	mv $(GLU_NAME).tar.gz $(DIRECTORY)
-
-glut_tar:
-	cp Makefile.X11 Makefile ; \
-	cd .. ; \
-	tar -cvf $(GLUT_NAME).tar $(GLUT_FILES) ; \
-	gzip $(GLUT_NAME).tar ; \
-	mv $(GLUT_NAME).tar.gz $(DIRECTORY)
-
-
 lib_zip:
-	-rm $(LIB_NAME).zip ; \
-	cp Makefile.X11 Makefile ; \
+	-rm $(LIB_NAME).zip
 	cd .. ; \
 	zip -r $(LIB_NAME).zip $(LIB_FILES) ; \
 	mv $(LIB_NAME).zip $(DIRECTORY)
 
 demo_zip:
-	-rm $(DEMO_NAME).zip ; \
+	-rm $(DEMO_NAME).zip
 	cd .. ; \
 	zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
 	mv $(DEMO_NAME).zip $(DIRECTORY)

docs/MESA_copy_sub_buffer.spec

@@ -1,88 +0,0 @@
-Name
-
-    MESA_copy_sub_buffer
-
-Name Strings
-
-    GLX_MESA_copy_sub_buffer
-
-Contact
-
-    Brian Paul (brian 'at' mesa3d.org)
-
-Status
-
-    Shipping since Mesa 2.6 in February, 1998.
-
-Version
-
-    Last Modified Date:  8 June 2000
-
-Number
-
-    215
-
-Dependencies
-
-    OpenGL 1.0 or later is required.
-    GLX 1.0 or later is required.
-
-Overview
-
-    The glxCopySubBufferMESA() function copies a rectangular region
-    of the back color buffer to the front color buffer.  This can be
-    used to quickly repaint 3D windows in response to expose events
-    when the back color buffer cannot be damaged by other windows.
-
-IP Status
-
-    Open-source; freely implementable.
-
-Issues
-
-    None.
-
-New Procedures and Functions
-
-    void glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable,
-			       int x, int y, int width, int height );
-
-New Tokens
-
-    None.
-
-Additions to Chapter 3 of the GLX 1.3 Specification (Functions and Errors)
-
-    Add to section 3.3.10 Double Buffering:
-
-    The function
-
-	 void glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable,
-				    int x, int y, int width, int height );
-
-    may be used to copy a rectangular region of the back color buffer to
-    the front color buffer.  This can be used to quickly repaint 3D windows
-    in response to expose events when the back color buffer cannot be
-    damaged by other windows.
-
-    <x> and <y> indicates the lower-left corner of the region to copy and
-    <width> and <height> indicate the size in pixels.  Coordinate (0,0)
-    corresponds to the lower-left pixel of the window, like glReadPixels.
-
-GLX Protocol
-
-    None at this time.  The extension is implemented in terms of ordinary
-    Xlib protocol inside of Mesa.
-
-Errors
-
-    None.
-
-New State
-
-    None.
-
-Revision History
-
-    8 June 2000 - initial specification
-

docs/MESA_packed_depth_stencil.spec

@@ -1,233 +0,0 @@
-XXX - Not complete yet!!!
-
-Name
-
-    MESA_packed_depth_stencil
-
-Name Strings
-
-    GL_MESA_packed_depth_stencil
-
-Contact
-
-    Keith Whitwell, VA Linux Systems Inc. (keithw 'at' valinux.com)
-    Brian Paul, VA Linux Systems Inc. (brianp 'at' valinux.com)
-
-Status
-
-    Not yet shipping.
-
-Version
-
-    $Id: MESA_packed_depth_stencil.spec,v 1.1 2000/11/03 14:58:45 brianp Exp $
-
-Number
-
-    ???
-
-Dependencies
-
-    EXT_abgr affects the definition of this extension
-    SGIS_texture4D affects the definition of this extension
-    EXT_cmyka affects the definition of this extension
-    ARB_packed_pixels affects the definition of this extension
-
-Overview
-	
-    Provides a mechanism for DrawPixels and ReadPixels to efficiently
-    transfer depth and stencil image data.  Specifically, we defined new
-    packed pixel formats and types which pack both stencil and depth
-    into one value.
-
-Issues:
-
-    1. Is this the right way to distinguish between 24/8 and 8/24
-       pixel formats?  Should we instead provide both:
-	
-       GL_DEPTH_STENCIL_MESA
-       GL_STENCIL_DEPTH_MESA
-
-       And perhaps just use GL_UNSIGNED_INT, GL_UNSIGNED_SHORT ?
-
-    2. If not, is it correct to use _REV to indicate that stencil
-       preceeds depth in the 1_15 and 8_24 formats?
-
-    3. Do we really want the GL_UNSIGNED_SHORT formats?  
-
-	
-New Procedures and Functions
-
-    None.
-
-New Tokens
-    
-    Accepted by the <format> parameter of ReadPixels and DrawPixels:
-
-	GL_DEPTH_STENCIL_MESA		0x8750
-
-    Accepted by the <type> parameter of ReadPixels and DrawPixels:
-
-	GL_UNSIGNED_INT_24_8_MESA	0x8751
-	GL_UNSIGNED_INT_8_24_REV_MESA	0x8752
-	GL_UNSIGNED_SHORT_15_1_MESA	0x8753
-	GL_UNSIGNED_SHORT_1_15_REV_MESA	0x8754
-
-Additions to Chapter 2 of the 1.1 Specification (OpenGL Operation)
-
-    None
-
-Additions to Chapter 3 of the 1.1 Specification (Rasterization)
-
-    One entry is added to table 3.5 (DrawPixels and ReadPixels formats).
-    The new table is:
-
-			Target
-	Format Name	Buffer	Element Meaning and Order
-	-----------	------	-------------------------
-	COLOR_INDEX	Color	Color index
-	STENCIL_INDEX	Stencil Stencil index
-	DEPTH_COMPONENT Depth	Depth component
-	RED		Color	R component
-	GREEN		Color	G component
-	BLUE		Color	B component
-	ALPHA		Color	A component
-	RGB		Color	R, G, B components
-	RGBA		Color	R, G, B, A components
-	BGRA	        Color   B, G, R, A components
-	ABGR_EXT	Color	A, B, G, R components
-	CMYK_EXT	Color	Cyan, Magenta, Yellow, Black components
-	CMYKA_EXT	Color	Cyan, Magenta, Yellow, Black, A components
-	LUMINANCE	Color	Luminance component
-	LUMINANCE_ALPHA Color	Luminance, A components
-	DEPTH_STENCIL   Depth,  Depth component, stencil index.
-			Stencil
-
-	Table 3.5: DrawPixels and ReadPixels formats.  The third column
-	gives a description of and the number and order of elements in a
-	group.
-
-    Add to the description of packed pixel formats:
-
-	<type> Parameter		Data	of	  Matching
-	Token Name			Type	Elements  Pixel Formats
-	----------------		----	--------  -------------
-
-	UNSIGNED_BYTE_3_3_2	      ubyte   3	      RGB
-	UNSIGNED_BYTE_2_3_3_REV       ubyte   3	      RGB
-	UNSIGNED_SHORT_5_6_5	      ushort  3	      RGB
-	UNSIGNED_SHORT_5_6_5_REV      ushort  3	      RGB
-	UNSIGNED_SHORT_4_4_4_4	      ushort  4	      RGBA,BGRA,ABGR_EXT,CMYK_EXT
-	UNSIGNED_SHORT_4_4_4_4_REV    ushort  4	      RGBA,BGRA
-	UNSIGNED_SHORT_5_5_5_1	      ushort  4	      RGBA,BGRA,ABGR_EXT,CMYK_EXT
-	UNSIGNED_SHORT_1_5_5_5_REV    ushort  4	      RGBA,BGRA
-	UNSIGNED_INT_8_8_8_8	      uint    4	      RGBA,BGRA,ABGR_EXT,CMYK_EXT
-	UNSIGNED_INT_8_8_8_8_REV      uint    4	      RGBA,BGRA
-	UNSIGNED_INT_10_10_10_2       uint    4	      RGBA,BGRA,ABGR_EXT,CMYK_EXT
-	UNSIGNED_INT_2_10_10_10_REV   uint    4	      RGBA,BGRA
-	UNSIGNED_SHORT_15_1_MESA      ushort  2       DEPTH_STENCIL_MESA
-	UNSIGNED_SHORT_1_15_REV_MESA  ushort  2       DEPTH_STENCIL_MESA
-	UNSIGNED_SHORT_24_8_MESA      ushort  2       DEPTH_STENCIL_MESA
-	UNSIGNED_SHORT_8_24_REV_MESA  ushort  2       DEPTH_STENCIL_MESA
-
-	UNSIGNED_INT_8_24:
-
-	     31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10	9  8  7  6  5  4  3  2	1  0
-	    +-----------------------+-----------------------------------------------------------------------+
-	    |			    |			     			    			    |
-	    +-----------------------+-----------------------------------------------------------------------+
-
-		    first					second		    
-		    element					element		    
-
-
-	UNSIGNED_INT_24_8:
-
-	     31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10	9  8  7  6  5  4  3  2	1  0
-	    +----------------------------------------------------------------------+------------------------+
-	    |			    			     			   | 			    |
-	    +----------------------------------------------------------------------+------------------------+
-
-		    first								  second		    
-		    element								  element		    
-
-	UNSIGNED_SHORT_15_1:
-
-	      15  14  13  12  11  10  9   8   7   6   5   4   3   2   1   0
-	    +-----------------------------------------------------------+---+
-	    |					    			|   |
-	    +-----------------------------------------------------------+---+
-
-	    		first						second	
-			element						element	
-
-
-	UNSIGNED_SHORT_1_15_REV:
-
-	      15  14  13  12  11  10  9   8   7   6   5   4   3   2   1   0
-	    +---+-----------------------------------------------------------+
-	    |	|		     					    |
-	    +---+-----------------------------------------------------------+
-
-	    second		    first
-	    element		    element
-
-    The assignment of elements to fields in the packed pixel is as
-    described in the table below:
-
-			   First       Second	Third	    Fourth
-	Format		   Element     Element	Element     Element
-	------		   -------     -------	-------     -------
-	RGB		   red	       green	blue
-	RGBA		   red	       green	blue	    alpha
-	BGRA		   blue	       green	red	    alpha
-	ABGR_EXT	   alpha       blue	green	    red
-	CMYK_EXT	   cyan	       magenta	yellow	    black
-	DEPTH_STENCIL_MESA depth       stencil
-
-Additions to Chapter 4 of the 1.1 Specification (Per-Fragment Operations
-and the Frame Buffer)
-
-    The new format is added to the discussion of Obtaining Pixels from the
-    Framebuffer.  It should read " If the <format> is one of RED, GREEN,
-    BLUE, ALPHA, RGB, RGBA, ABGR_EXT, LUMINANCE, or LUMINANCE_ALPHA, and
-    the GL is in color index mode, then the color index is obtained."
-
-    The new format is added to the discussion of Index Lookup.  It should
-    read "If <format> is one of RED, GREEN, BLUE, ALPHA, RGB, RGBA,
-    ABGR_EXT, LUMINANCE, or LUMINANCE_ALPHA, then the index is used to
-    reference 4 tables of color components: PIXEL_MAP_I_TO_R,
-    PIXEL_MAP_I_TO_G, PIXEL_MAP_I_TO_B, and PIXEL_MAP_I_TO_A."
-
-
-Additions to Chapter 5 of the 1.1 Specification (Special Functions)
-
-    None
-
-Additions to Chapter 6 of the 1.1 Specification (State and State Requests)
-
-    None
-
-Additions to the GLX Specification
-
-    None
-
-GLX Protocol
-
-    TBD
-
-Errors
-
-    None
-
-New State
-
-    None
-
-Revision History
-
-    Version 1.0 - 23 Sep 2000
-        Keith's original version.
-
-    Version 1.1 - 3 Nov 2000
-        Brian's edits, assigned values to new enums.
-

docs/MESA_pixmap_colormap.spec

@@ -1,90 +0,0 @@
-Name
-
-    MESA_pixmap_colormap
-
-Name Strings
-
-    GLX_MESA_pixmap_colormap
-
-Contact
-
-    Brian Paul (brian 'at' mesa3d.org)
-
-Status
-
-    Shipping since Mesa 1.2.8 in May, 1996.
-
-Version
-
-    Last Modified Date:  8 June 2000
-
-Number
-
-    216
-
-Dependencies
-
-    OpenGL 1.0 or later is required.
-    GLX 1.0 or later is required.
-
-Overview
-
-    Since Mesa allows RGB rendering into drawables with PseudoColor,
-    StaticColor, GrayScale and StaticGray visuals, Mesa needs a colormap
-    in order to compute pixel values during rendering.
-
-    The colormap associated with a window can be queried with normal
-    Xlib functions but there is no colormap associated with pixmaps.
-
-    The glXCreateGLXPixmapMESA function is an alternative to glXCreateGLXPixmap
-    which allows specification of a colormap.
-
-IP Status
-
-    Open-source; freely implementable.
-
-Issues
-
-    None.
-
-New Procedures and Functions
-
-    GLXPixmap glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visual,
-				      Pixmap pixmap, Colormap cmap );
-
-New Tokens
-
-    None.
-
-Additions to Chapter 3 of the GLX 1.3 Specification (Functions and Errors)
-
-    Add to section 3.4.2 Off Screen Rendering
-
-    The Mesa implementation of GLX allows RGB rendering into X windows and
-    pixmaps of any visual class, not just TrueColor or DirectColor.  In order
-    to compute pixel values from RGB values Mesa requires a colormap.
-
-    The function
-
-	GLXPixmap glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visual,
-					  Pixmap pixmap, Colormap cmap );
-
-    allows one to create a GLXPixmap with a specific colormap.  The image
-    rendered into the pixmap may then be copied to a window (which uses the
-    same colormap and visual) with the expected results.
-
-GLX Protocol
-
-    None since this is a client-side extension.
-
-Errors
-
-    None.
-
-New State
-
-    None.
-
-Revision History
-
-    8 June 2000 - initial specification

docs/MESA_release_buffers.spec

@@ -1,85 +0,0 @@
-Name
-
-    MESA_release_buffers
-
-Name Strings
-
-    GLX_MESA_release_buffers
-
-Contact
-
-    Brian Paul (brian 'at' mesa3d.org)
-
-Status
-
-    Shipping since Mesa 2.0 in October, 1996.
-
-Version
-
-    Last Modified Date:  8 June 2000
-
-Number
-
-    217
-
-Dependencies
-
-    OpenGL 1.0 or later is required.
-    GLX 1.0 or later is required.
-
-Overview
-
-    Mesa's implementation of GLX is entirely implemented on the client side.
-    Therefore, Mesa cannot immediately detect when an X window or pixmap is
-    destroyed in order to free any ancilliary data associated with the window
-    or pixmap.
-
-    The glxMesaReleaseBuffers() function can be used to explicitly indicate
-    when the back color buffer, depth buffer, stencil buffer, and/or accum-
-    ulation buffer associated with a drawable can be freed.
-
-IP Status
-
-    Open-source; freely implementable.
-
-Issues
-
-    None.
-
-New Procedures and Functions
-
-    Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d );
-
-New Tokens
-
-    None.
-
-Additions to Chapter 3 of the GLX 1.3 Specification (Functions and Errors)
-
-    The function
-
-	Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d );
-
-    causes all software ancilliary buffers (back buffer, depth, stencil,
-    accum, etc) associated with the named drawable to be immediately
-    deallocated.  True is returned if <d> is a valid Mesa GLX drawable,
-    else False is returned.  After calling glXReleaseBuffersMESA, the
-    drawable should no longer be used for GL rendering.  Results of
-    attempting to do so are undefined.
-
-
-GLX Protocol
-
-    None, since this is a client-side operation.
-
-Errors
-
-    None.
-
-New State
-
-    None.
-
-Revision History
-
-    8 June 2000 - initial specification

docs/MESA_resize_buffers.spec

@@ -16,11 +16,11 @@ Status
 
 Version
 
-    $Id: MESA_resize_buffers.spec,v 1.2 2000/04/04 23:29:32 brianp Exp $
+    $Id: MESA_resize_buffers.spec,v 1.1 1999/07/20 00:30:41 brianp Exp $
 
 Number
 
-    196
+    XXX none assigned
 
 Dependencies
 

docs/MESA_set_3dfx_mode.spec

@@ -1,85 +0,0 @@
-Name
-
-    MESA_set_3dfx_mode
-
-Name Strings
-
-    GLX_MESA_set_3dfx_mode
-
-Contact
-
-    Brian Paul (brian 'at' mesa3d.org)
-
-Status
-
-    Shipping since Mesa 2.6 in February, 1998.
-
-Version
-
-    Last Modified Date:  8 June 2000
-
-Number
-
-    218
-
-Dependencies
-
-    OpenGL 1.0 or later is required.
-    GLX 1.0 or later is required.
-
-Overview
-
-    The Mesa Glide driver allows full-screen rendering or rendering into
-    an X window.  The glXSet3DfxModeMESA() function allows an application
-    to switch between full-screen and windowed rendering.
-
-IP Status
-
-    Open-source; freely implementable.
-
-Issues
-
-    None.
-
-New Procedures and Functions
-
-    GLboolean glXSet3DfxModeMESA( GLint mode );
-
-New Tokens
-
-    GLX_3DFX_WINDOW_MODE_MESA	    0x1
-    GLX_3DFX_FULLSCREEN_MODE_MESA   0x2
-
-Additions to Chapter 3 of the GLX 1.3 Specification (Functions and Errors)
-
-    The Mesa Glide device driver allows either rendering in full-screen
-    mode or rendering into an X window.  An application can switch between
-    full-screen and window rendering with the command:
-
-	GLboolean glXSet3DfxModeMESA( GLint mode );
-
-    <mode> may either be GLX_3DFX_WINDOW_MODE_MESA to indicate window
-    rendering or GLX_3DFX_FULLSCREEN_MODE_MESA to indicate full-screen mode.
-
-    GL_TRUE is returned if <mode> is valid and the operation completed
-    normally.  GL_FALSE is returned if <mode> is invalid or if the Glide
-    driver is not being used.
-
-    Note that only one drawable and context can be created at any given
-    time with the Mesa Glide driver.
-
-GLX Protocol
-
-    None since this is a client-side extension.
-
-Errors
-
-    None.
-
-New State
-
-    None.
-
-Revision History
-
-    8 June 2000 - initial specification

docs/MESA_sprite_point.spec

@@ -1,193 +0,0 @@
-XXX - Not complete yet!!!
-
-Name
-
-    MESA_sprite_point
-
-Name Strings
-
-    GL_MESA_sprite_point
-
-Contact
-
-    Brian Paul, VA Linux Systems Inc. (brianp 'at' valinux.com)
-
-Status
-
-    Not yet shipping.
-
-Version
-
-    $Id: MESA_sprite_point.spec,v 1.1 2000/12/08 00:21:02 brianp Exp $
-
-Number
-
-    ???
-
-Dependencies
-
-    GL_EXT_point_parameters effects the definition of this extension
-    GL_ARB_multitexture effects the definition of this extension
-
-Overview
-	
-    This extension modifies the way in which points are rendered,
-    specifically when they're textured.  When SPRITE_POINT_MESA is enabled
-    a point is rendered as if it were a quadrilateral with unique texture
-    coordinates at each vertex.  This extension effectively turns points
-    into sprites which may be rendered more easily and quickly than using
-    conventional textured quadrilaterals.
-
-    When using point size > 1 or attenuated points this extension is an
-    effective way to render many small sprite images for particle systems
-    or other effects.
-
-Issues:
-
-    1. How are the texture coordinates computed?
-
-       The lower-left corner has texture coordinate (0,0,r,q).
-       The lower-right, (1,0,r,q).  The upper-right, (1,1,r,q).
-       The upper-left, (0,1,r,q).
-
-    2. What about texgen and texture matrices?
-
-       Texgen and the texture matrix have no effect on the point's s and t
-       texture coordinates.  The r and q coordinates may have been computed
-       by texgen or the texture matrix.  Note that with a 3D texture and/or
-       texgen that the r coordinate could be used to select a slice in the
-       3D texture.
-
-    3. What about point smoothing?
-
-       When point smoothing is enabled, a triangle fan could be rendered
-       to approximate a circular point.  This could be problematic to
-       define and implement so POINT_SMOOTH is ignored when drawing sprite
-       points.
-
-       Smoothed points can be approximated by using an appropriate texture
-       images, alpha testing and blending.
-
-       POLYGON_SMOOTH does effect the rendering of the quadrilateral, however.
-
-    4. What about sprite rotation?
-
-       There is none.  Sprite points are always rendered as window-aligned
-       squares.  One could define rotated texture images if desired.  A 3D
-       texture and appropriate texture r coordinates could be used to
-       effectively specify image rotation per point.
-
-    5. What about POLYGON_MODE?
-
-       POLYGON_MODE does not effect the rasterization of the quadrilateral.
-
-    6. What about POLYGON_CULL?
-
-       TBD.  Polygon culling is normally specified and implemented in the
-       transformation stage of OpenGL.  However, some rasterization hardware
-       implements it later during triangle setup.
-
-       Polygon culling wouldn't be useful for sprite points since the
-       quadrilaterals are always defined in counter-clockwise order in
-       window space.  For that reason, polygon culling should probably be
-       ignored.
-
-    7. Should sprite points be alpha-attenuated if their size is below the
-       point parameter's threshold size?
-
-    8. Should there be an advertisized maximum sprite point size?
-
-       No.  Since we're rendering the point as a quadrilateral there's no
-       need to limit the size.
-
-
-New Procedures and Functions
-
-    None.
-
-New Tokens
-    
-    Accepted by the <pname> parameter of Enable, Disable, IsEnabled,
-    GetIntegerv, GetBooleanv, GetFloatv and GetDoublev:
-
-	SPRITE_POINT_MESA		0x????
-        MAX_SPRITE_POINT_SIZE_MESA      0x????   (need this?)
-
-Additions to Chapter 2 of the 1.1 Specification (OpenGL Operation)
-
-    None
-
-Additions to Chapter 3 of the 1.1 Specification (Rasterization)
-
-    Section ???.
-
-    When SPRITE_POINT_MESA is enabled points are rasterized as screen-
-    aligned quadrilaterals.  If the four vertices of the quadrilateral
-    are labeled A, B, C, and D, starting at the lower-left corner and moving
-    counter-clockwise around the quadrilateral, then the vertex and
-    texture coordinates are computed as follows:
-
-      vertex   window coordinate       texture coordinate
-        A      (x-r, y-r, z, w)          (0, 0, r, q)
-        B      (x+r, y-r, z, w)          (1, 0, r, q)
-        C      (x+r, y+r, z, w)          (1, 1, r, q)
-        D      (x-r, y+r, z, w)          (0, 1, r, q)
-
-    where x, y, z, w are the point's window coordinates, r and q are the
-    point's 3rd and 4th texture coordinates  and r is half the point's
-    size.  The other vertex attributes (such as the color and fog coordinate)
-    are simply duplicated from the original point vertex.
-
-    Point size may either be specified with PointSize or computed
-    according to the EXT_point_parameters extension.
-
-    The new texture coordinates are not effected by texgen or the texture
-    matrix.  Note, however, that the texture r and q coordinates are passed
-    unchanged and may have been computed with texgen and/or the texture
-    matrix.
-
-    If multiple texture units are present the same texture coordinate is
-    used for all texture units.
-
-    The point is then rendered as if it were a quadrilateral using the
-    normal point sampling rules.  POLYGON_MODE does not effect the
-    rasterization of the quadrilateral but POLYGON_SMOOTH does.
-
-    POINT_SMOOTH has no effect when SPRITE_POINT_MESA is enabled.
-
-Additions to Chapter 4 of the 1.1 Specification (Per-Fragment Operations
-and the Frame Buffer)
-
-    None.
-
-Additions to Chapter 5 of the 1.1 Specification (Special Functions)
-
-    None
-
-Additions to Chapter 6 of the 1.1 Specification (State and State Requests)
-
-    None
-
-Additions to the GLX Specification
-
-    None
-
-GLX Protocol
-
-    TBD
-
-Errors
-
-    None
-
-New State
-
-    Add boolean variable SPRITE_POINT_MESA to the point attribute group.
-
-Revision History
-
-    Version 1.0 - 4 Dec 2000
-        Original draft.
-
-
-

docs/MESA_trace.spec

@@ -1,360 +0,0 @@
-Name
-
-     MESA_trace
-
-Name Strings
-
-     GL_MESA_TRACE
-
-Contact
-    
-    Bernd Kreimeier, Loki Entertainment, bk 'at' lokigames.com
-    Brian Paul, VA Linux Systems, Inc., brianp 'at' valinux.com
-
-Status
-
-    XXX - Not complete yet!!!
-
-Version
-
-    $Id: MESA_trace.spec,v 1.2 2001/01/29 16:10:18 brianp Exp $
-
-Number
-
-    none yet
-
-Dependencies
-
-    OpenGL 1.2 is required.
-    The extension is written against the OpenGL 1.2 Specification
-
-Overview
-
-    Provides the application with means to enable and disable logging
-    of GL calls including parameters as readable text. The verbosity
-    of the generated log can be controlled. The resulting logs are
-    valid (but possibly incomplete) C code and can be compiled and 
-    linked for standalone test programs. The set of calls and the 
-    amount of static data that is logged can be controlled at runtime. 
-    The application can add comments and enable or disable tracing of GL 
-    operations at any time. The data flow from the application to GL
-    and back is unaffected except for timing.
-
-    Application-side implementation of these features raises namespace
-    and linkage issues. In the driver dispatch table a simple
-    "chain of responsibility" pattern (aka "composable piepline")
-    can be added.
-
-IP Status
-
-    The extension spec is in the public domain.  The current implementation
-    in Mesa is covered by Mesa's XFree86-style copyright by the authors above.
-    This extension is partially inspired by the Quake2 QGL wrapper.
-
-Issues
-
- 
-    (1) Is this Extension obsolete because it can
-    be implemented as a wrapper DLL?
-
-      RESOLVED: No. While certain operating systems (Win32) provide linkers 
-      that facilitate this kind of solution, other operating systems
-      (Linux) do not support hierarchical linking, so a wrapper solution
-      would result in symbol collisions.
-      Further, IHV's might have builtin support for tracing GL execution 
-      that enjoys privileged access, or that they do not wish to separate
-      the tracing code from their driver code base.
-
-    (2) Should the Trace API explicitely support the notion of "frames? 
-    This would require hooking into glXSwapBuffers calls as well.
-
-      RESOLVED: No. The application can use NewTraceMESA/EndTraceMESA
-      and TraceComment along with external parsing tools to split the 
-      trace into frames, in whatever way considered adequate.
-
-    (2a) Should GLX calls be traced?
-
-      PBuffers and other render-to-texture solutions demonstrate that
-      context level commands beyond SwapBuffers might have to be
-      traced. The GL DLL exports the entry points, so this would not
-      be out of the question. 
-
-    (3) Should the specification mandate the actual output format?
-
-      RESOLVED: No. It is sufficient to guarantee that all data and commands 
-      will be traced as requested by Enable/DisableTraceMESA, in the order
-      encountered. Whether the resulting trace is available as a readable 
-      text file, binary metafile, compilable source code, much less which 
-      indentation and formatting has been used, is up to the implementation. 
-      For the same reason this specification does not enforce or prohibit
-      additional information added to the trace (statistics, profiling/timing, 
-      warnings on possible error conditions).
-
-    (4) Should the comment strings associated with names and pointer (ranges) 
-    be considered persistent state?
-
-      RESOLVED: No. The implementation is not forced to use this information 
-      on subsequent occurences of name/pointer, and is free to consider it 
-      transient state.
- 
-    (5) Should comment commands be prohibited between Begin/End?
-
-      RESOLVED: Yes, with the exception of TraceCommentMESA. TraceCommentMESA 
-      is transient, the other commands might cause storage of persistent
-      data in the context. There is no need to have the ability mark names 
-      or pointers between Begin and End.
-
-
-New Procedures and Functions
- 
-    void NewTraceMESA( bitfield mask, const ubyte * traceName )
-
-    void EndTraceMESA( void )
-
-    void EnableTraceMESA( bitfield mask )
-
-    void DisableTraceMESA( bitfield mask )
-
-    void TraceAssertAttribMESA( bitfield attribMask )
-
-    void TraceCommentMESA( const ubyte* comment )
-
-    void TraceTextureMESA( uint name, const ubyte* comment )
-
-    void TraceListMESA( uint name, const ubyte* comment )
-
-    void TracePointerMESA( void* pointer, const ubyte* comment )
-
-    void TracePointerRangeMESA( const void* first, 
-                                const void* last, 
-                                const ubyte* comment ) 
-
-New Tokens
- 
-    Accepted by the <mask> parameter of EnableTrace and DisableTrace:
-
-       TRACE_ALL_BITS_MESA           0xFFFF
-       TRACE_OPERATIONS_BIT_MESA     0x0001
-       TRACE_PRIMITIVES_BIT_MESA     0x0002
-       TRACE_ARRAYS_BIT_MESA         0x0004
-       TRACE_TEXTURES_BIT_MESA       0x0008
-       TRACE_PIXELS_BIT_MESA         0x0010
-       TRACE_ERRORS_BIT_MESA         0x0020
-
-    Accepted by the <pname> parameter of GetIntegerv, GetBooleanv,
-    GetFloatv, and GetDoublev:
-
-       TRACE_MASK_MESA               0x8755
-
-    Accepted by the <pname> parameter to GetString:
-
-       TRACE_NAME_MESA               0x8756
-
-
-Additions to Chapter 2 of the OpenGL 1.2.1 Specification (OpenGL Operation)
-
-    None.
-
-Additions to Chapter 3 of the OpenGL 1.2.1 Specification (OpenGL Operation)
-
-    None.
-
-Additions to Chapter 4 of the OpenGL 1.2.1 Specification (OpenGL Operation)
-
-    None.
-
-Additions to Chapter 5 of the OpenGL 1.2.1 Specification (Special Functions)
-
-    Add a new section:
-
-    5.7 Tracing
-
-    The tracing facility is used to record the execution of a GL program
-    to a human-readable log.  The log appears as a sequence of GL commands
-    using C syntax.  The primary intention of tracing is to aid in program
-    debugging.
-
-    A trace is started with the command
-
-      void NewTraceMESA( bitfield mask, const GLubyte * traceName )
-
-    <mask> may be any value accepted by PushAttrib and specifies a set of
-    attribute groups.  The state values included in those attribute groups
-    is written to the trace as a sequence of GL commands.
-
-    <traceName> specifies a name or label for the trace.  It is expected
-    that <traceName> will be interpreted as a filename in most implementations.
-
-    A trace is ended by calling the command
-
-      void EndTraceMESA( void )
-
-    It is illegal to call NewTraceMESA or EndTraceMESA between Begin and End. 
-
-    The commands
-
-      void EnableTraceMESA( bitfield mask )
-      void DisableTraceMESA( bitfield mask )
-
-    enable or disable tracing of different classes of GL commands.
-    <mask> may be the union of any of TRACE_OPERATIONS_BIT_MESA,
-    TRACE_PRIMITIVES_BIT_MESA, TRACE_ARRAYS_BIT_MESA, TRACE_TEXTURES_BIT_MESA,
-    and TRACE_PIXELS_BIT_MESA.  The special token TRACE_ALL_BITS_MESA
-    indicates all classes of commands are to be logged.
-
-    TRACE_OPERATIONS_BIT_MESA controls logging of all commands outside of
-    Begin/End, including Begin/End.
-  
-    TRACE_PRIMITIVES_BIT_MESA controls logging of all commands inside of
-    Begin/End, including Begin/End.
- 
-    TRACE_ARRAYS_BIT_MESA controls logging of VertexPointer, NormalPointer,
-    ColorPointer, IndexPointer, TexCoordPointer and EdgeFlagPointer commands.
-
-    TRACE_TEXTURES_BIT_MESA controls logging of texture data dereferenced by
-    TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D, and
-    TexSubImage3D commands.
-
-    TRACE_PIXELS_BIT_MESA controls logging of image data dereferenced by
-    Bitmap and DrawPixels commands.
-
-    TRACE_ERRORS_BIT_MESA controls logging of all errors. If this bit is 
-    set, GetError will be executed whereever applicable, and the result will 
-    be added to the trace as a comment. The error returns are cached and 
-    returned to the application on its GetError calls. If the user does not 
-    wish the additional GetError calls to be performed, this bit should not
-    be set.
-    
-    The command
-
-      void TraceCommentMESA( const ubyte* comment )
-
-    immediately adds the <comment> string to the trace output, surrounded
-    by C-style comment delimiters.
-
-    The commands
-
-      void TraceTextureMESA( uint name, const ubyte* comment )
-      void TraceListMESA( uint name, const ubyte* comment )
-
-    associates <comment> with the texture object or display list specified
-    by <name>.  Logged commands which reference the named texture object or
-    display list will be annotated with <comment>.  If IsTexture(name) or
-    IsList(name) fail (respectively) the command is quietly ignored.
-
-    The commands
-
-      void TracePointerMESA( void* pointer, const ubyte* comment )
-
-      void TracePointerRangeMESA( const void* first, 
-                                  const void* last,
-                                  const ubyte* comment ) 
-
-    associate <comment> with the address specified by <pointer> or with
-    a range of addresses specified by <first> through <last>.
-    Any logged commands which reference <pointer> or an address between
-    <first> and <last> will be annotated with <comment>.
-
-    The command
-
-      void TraceAssertAttribMESA( bitfield attribMask )
-
-    will add GL state queries and assertion statements to the log to
-    confirm that the current state at the time TraceAssertAttrib is
-    executed matches the current state when the trace log is executed
-    in the future.
-
-    <attribMask> is any value accepted by PushAttrib and specifies
-    the groups of state variables which are to be asserted.
-
-    The commands NewTraceMESA, EndTraceMESA, EnableTraceMESA, DisableTraceMESA,
-    TraceAssertAttribMESA, TraceCommentMESA, TraceTextureMESA, TraceListMESA, 
-    TracePointerMESA and TracePointerRangeMESA are not compiled into display lists.
-
-
-    Examples:
-
-    The command NewTraceMESA(DEPTH_BUFFER_BIT, "log") will query the state
-    variables DEPTH_TEST, DEPTH_FUNC, DEPTH_WRITEMASK, and DEPTH_CLEAR_VALUE
-    to get the values <test>, <func>, <mask>, and <clear> respectively.
-    Statements equivalent to the following will then be logged:
-
-       glEnable(GL_DEPTH_TEST);   (if <test> is true)
-       glDisable(GL_DEPTH_TEST);  (if <test> is false)
-       glDepthFunc(<func>); 
-       glDepthMask(<mask>);
-       glClearDepth(<clear>);
-   
-
-    The command TraceAssertAttribMESA(DEPTH_BUFFER_BIT) will query the state
-    variables DEPTH_TEST, DEPTH_FUNC, DEPTH_WRITEMASK, and DEPTH_CLEAR_VALUE
-    to get the values <test>, <func>, <mask>, and <clear> respectively.
-    The resulting trace might then look will like this:
-
-    {
-      GLboolean b;
-      GLint i;
-      GLfloat f;
-      b = glIsEnabled(GL_DEPTH_TEST);
-      assert(b == <test>);
-      glGetIntegerv(GL_DEPTH_FUNC, &i);
-      assert(i == <func>);
-      glGetIntegerv(GL_DEPTH_MASK, &i);
-      assert(i == <mask>);
-      glGetFloatv(GL_DEPTH_CLEAR_VALUE, &f);
-      assert(f == <clear>);
-    }
-
-
-Additions to Chapter 6 of the OpenGL 1.2.1 Specification 
-    (State and State Requests)
-
-    Querying TRACE_MASK_MESA with GetIntegerv, GetFloatv, GetBooleanv or
-    GetDoublev returns the current command class trace mask.
-
-    Querying TRACE_NAME_MESA with GetString returns the current trace name.
-
-
-Additions to Appendix A of the OpenGL 1.2.1 Specification (Invariance)
-
-    The MESA_trace extension can be used in a way that does not affect data 
-    flow from application to OpenGL, as well as data flow from OpenGL to 
-    application, except for timing, possible print I/O. TRACE_ERRORS_BIT_MESA
-    will add additional GetError queries. Setting a trace mask with NewTraceMESA
-    as well as use of TraceAssertAttribMESA might cause additional state queries.
-    With the possible exception of performance, OpenGL rendering should not be
-    affected at all by a properly chosen logging operation.
-
-Additions to the AGL/GLX/WGL Specifications
-
-    None.
-
-GLX Protocol
-
-    None. The logging operation is carried out client-side, by exporting
-    entry points to the wrapper functions that execute the logging operation.
-
-Errors
-
-    INVALID_OPERATION is generated if any trace command except TraceCommentMESA
-    is called between Begin and End.
-
-New State
-
-    The current trace name and current command class mask are stored
-    per-context.
-
-New Implementation Dependent State
-
-    None.
-
-Revision History
-
-  * Revision 0.1 - Initial draft from template (bk000415)
-  * Revision 0.2 - Draft (bk000906)
-  * Revision 0.3 - Draft (bk000913)
-  * Revision 0.4 - Reworked text, fixed typos (bp000914)
-  * Revision 0.5 - Assigned final GLenum values (bp001103)
-  * Revision 0.6 - TRACE_ERRORS_BIT_MESA (bk000916)
-  * Revision 0.7 - Added MESA postfix (bk010126)
-

docs/MESA_window_pos.spec

@@ -16,11 +16,11 @@ Status
 
 Version
 
-    $Id: MESA_window_pos.spec,v 1.3 2000/04/04 23:29:32 brianp Exp $
+    $Id: MESA_window_pos.spec,v 1.1 1999/07/20 00:30:41 brianp Exp $
 
 Number
 
-    197
+    XXX non assigned
 
 Dependencies
 
@@ -33,7 +33,7 @@ Overview
     coordinate with the RasterPos command, the modelview matrix, projection
     matrix and viewport must be set very carefully.  Furthermore, if the
     desired window coordinate is outside of the window's bounds one must
-    rely on a subtle side-effect of the Bitmap command in order to circumvent
+    rely a subtle side-effect of the Bitmap command in order to circumvent
     frustum clipping.
 
     This extension provides a set of functions to directly set the
@@ -51,26 +51,6 @@ New Procedures and Functions
     void WindowPos2fMESA(float x, float y)
     void WindowPos2iMESA(int x, int y)
     void WindowPos2sMESA(short x, short y)
-    void WindowPos2ivMESA(const int *p)
-    void WindowPos2svMESA(const short *p)
-    void WindowPos2fvMESA(const float *p)
-    void WindowPos2dvMESA(const double *p)
-    void WindowPos3iMESA(int x, int y, int z)
-    void WindowPos3sMESA(short x, short y, short z)
-    void WindowPos3fMESA(float x, float y, float z)
-    void WindowPos3dMESA(double x, double y, double z)
-    void WindowPos3ivMESA(const int *p)
-    void WindowPos3svMESA(const short *p)
-    void WindowPos3fvMESA(const float *p)
-    void WindowPos3dvMESA(const double *p)
-    void WindowPos4iMESA(int x, int y, int z, int w)
-    void WindowPos4sMESA(short x, short y, short z, short w)
-    void WindowPos4fMESA(float x, float y, float z, float w)
-    void WindowPos4dMESA(double x, double y, double z, double )
-    void WindowPos4ivMESA(const int *p)
-    void WindowPos4svMESA(const short *p)
-    void WindowPos4fvMESA(const float *p)
-    void WindowPos4dvMESA(const double *p)
 
 New Tokens
 
@@ -84,7 +64,7 @@ Additions to Chapter 2 of the OpenGL 1.2 Specification (OpenGL Operation)
       WindowPosMESA commands:
 
          void WindowPos{234}{sidf}MESA( T coords );
-         void WindowPos{234}{sidf}vMESA( T coords );
+         void Window Pos{234}{sidf}vMESA( T coords );
 
       WindosPos4MESA takes four values indicating x, y, z, and w.
       WindowPos3MESA (or WindowPos2MESA) is analaguos, but sets only
@@ -98,6 +78,14 @@ Additions to Chapter 2 of the OpenGL 1.2 Specification (OpenGL Operation)
       color, color index and texture coordinate update the current raster
       position's associated data.
 
+      The current raster distance ??? XXX ???
+
+
+
+
+
+
+
 Additions to the AGL/GLX/WGL Specifications
 
     None
@@ -112,6 +100,7 @@ Errors
     INVALID_OPERATION is generated if WindowPosMESA is called betweeen
     Begin and End.
 
+
 New State
 
     None.
@@ -123,5 +112,3 @@ New Implementation Dependent State
 Revision History
 
   * Revision 1.0 - Initial specification
-  * Revision 1.1 - Minor clean-up  (7 Jan 2000, Brian Paul)
-

docs/README.3DFX

@@ -1,9 +1,8 @@
 
-                     3Dfx Glide device driver for Mesa 3.3
+                     3Dfx Glide device driver for Mesa 3.2
 				(see below for FAQ)
 
 
-
 What do you need ?
 ------------------
 
@@ -185,9 +184,9 @@ Doing more with Mesa & Linux Glide:
 	   quality. However you can use any visual depth supported by X.
 
 	2. Set the following environment variables:
-		export MESA_GLX_FX="window"	# to enable window rendering
-		export SST_VGA_PASS=1	# to stop video signal switching
-		export SST_NOSHUTDOWN=1	# to stop video signal switching
+		export MESA_GLX_FX="window"	// to enable window rendering
+		export SST_VGA_PASS=1	// to stop video signal switching
+		export SST_NOSHUTDOWN=1	// to stop video signal switching
 	    OR
 		setenv MESA_GLX_FX window
 		setenv SST_VGA_PASS 1
@@ -205,9 +204,6 @@ Doing more with Mesa & Linux Glide:
 	visual depth doesn't match the Voodoo framebufffer bit per pixel, it
 	is required also a pixel format translation).
 
-	NOTE: the in-window rendering feature only works with double-buffering.
-
-
         On the fly switching between in window rendering and full screen rendering
 	--------------------------------------------------------------------------
 

docs/README.BEOS

@@ -99,4 +99,4 @@ of February, 1999.
 
 
 ----------------------------------------------------------------------
-$Id: README.BEOS,v 1.6 1999/11/27 01:40:40 brianp Exp $
+$Id: README.BEOS,v 1.5.6.1 1999/11/27 01:39:50 brianp Exp $

docs/README.MINGW32

@@ -34,14 +34,14 @@ Installing GCC-2.95.2/Mingw32 Build:
 	
 	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)
+		%mesaroot%:	This is your root directory (Mesa-3.2)
+		%mesasrc%:	This is the Mesa-3.2 src directory (Mesa-3.2\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
+	Go to your Mesa-3.2 'root' directory
 	At the command line type: mingw32
 
 	That's all there is to it.

docs/README.MITS

@@ -1,9 +1,7 @@
 
 			Mesa 3.0 MITS Information
 
-
-This software is distributed under the terms of the GNU Library
-General Public License, see the LICENSE file for details.
+[The MITS code hasn't been update for Mesa 3.1 and may no longer work]
 
 
 This document is a preliminary introduction to help you get

docs/README.THREADS

@@ -1,33 +1,45 @@
 
+NOTE: this information is obsolete for Mesa 3.1.  Due to the big
+changes in the Mesa code, the threads support is out of date.
+Someone will have to review/update it.
+
 
 Mesa Threads README
 -------------------
 
-Thread safety was introduced in Mesa 2.6 by John Stone and
-Christoph Poliwoda.
-
-It was redesigned in Mesa 3.3 so that thread safety is
-supported by default (on systems which support threads,
-that is).  There is no measurable penalty on single
-threaded applications.
-
-NOTE that the only _driver_ which is thread safe at this time
-is the OS/Mesa driver!
-
-
-At present the mthreads code supports three thread APIS:
+Mesa 2.6 is the starting point for an effort to make Mesa 
+safe in multithreaded applications.  The files src/mthreads.c and
+src/mthreads.h provide a platform independent threads API which Mesa
+uses internally to provide thread-safe operation.  At present the mthreads
+code supports three thread APIS:
   1) POSIX threads (aka pthreads).
   2) Solaris / Unix International threads.
   3) Win32 threads (Win 95/NT).
 
-Support for other thread libraries can be added src/glthread.[ch]
+Here's the current list of targets which enable multithreaded handling
+in Mesa:
 
+  linux-386-pthread    for Linux w/ Intel assembly and linuxthreads
+  sunos5-thread        for Suns with SunOS 5.x, using Solaris threads
+  sunos5-pthread       for Suns with SunOS 5.[56] using POSIX threads
+  sunos5-gcc-thread    for Suns with SunOS 5.x and GCC, using Solaris threads
+  sunos5-gcc-pthread   for Suns with SunOS 5.[56] and GCC, using POSIX threads
 
-In order to guarantee proper operation, it is
+In order to use Mesa with a multithreaded application, Mesa must be compiled
+using one of the thread-enabled configurations.  In cases where a platform
+supports multiple APIs which are acceptable to Mesa, Mesa must be built
+with the same threads API as the application in order for things to work
+properly.  For example, Solaris >= 2.5 support both POSIX threads and
+Sun's own threads API.  In order to guarantee proper operation, it is
 necessary for both Mesa and application code to use the same threads API.
 So, if your application uses Sun's thread API, then you should build Mesa
 using one of the targets for Sun threads.
 
+Since this effort is still very much a work in progress, not all 
+aspects of Mesa are thread safe.  As of this release (Mesa 2.6) only the
+osmesa drivers have been made MT-safe.  As work continues, other drivers
+such as the X11 drivers will also incorporate MT-safe features.
+
 The mtdemos directory contains some example programs which use 
 multiple threads to render to osmesa rendering context(s).
 
@@ -38,15 +50,17 @@ only one that really supports multiprocessor machines (AFAIK). See
 http://pauillac.inria.fr/~xleroy/linuxthreads/README for further
 information about the usage of linuxthreads.
 
-If you are interested in helping with thread safety work in Mesa
-join the Mesa developers mailing list and post your proposal.
+If you are interested in helping develop MT-safe Mesa, please send email
+to j.stone@acm.org and poliwoda@volumegraphics.com who are the two most
+directly involved in this effort currently.  Similarly, if you have problems
+using the MT-safe builds of Mesa, please send us comments/bugs etc.
 
+Future versions of Mesa will include more extensive documentation related
+to multithreading.  This is the first release of our work, so please bear
+with us.
 
 Regards,
   John Stone           -- j.stone@acm.org  johns@cs.umr.edu
   Christoph Poliwoda   -- poliwoda@volumegraphics.com
 
 
-Version info:
-   Mesa 2.6 - initial thread support.
-   Mesa 3.3 - thread support mostly rewritten (Brian Paul)

docs/README.X11

@@ -1,5 +1,5 @@
 
-                         Mesa 3.5 Unix/X11 Information
+                         Mesa 3.1 Unix/X11 Information
 
 
 
@@ -25,7 +25,7 @@ There are two ways to compile Mesa on Unix/X11 systems:
 
 
 The top-level makefile will execute the makefiles in a number of sub-
-directories.  When finished, the Mesa libraries will be in the Mesa-3.5/lib/
+directories.  When finished, the Mesa libraries will be in the Mesa-3.1/lib/
 directory.  A few GLUT demos in the demos/ directory should be ready to run.
 
 If you also downloaded and unpacked the demos there should be executables
@@ -141,7 +141,7 @@ Xt/Motif Widgets:
 
 Togl:
    Togl is an OpenGL/Mesa widget for Tcl/Tk.
-   See http://togl.sourceforge.net for more information.
+   See http://www.ssec.wisc.edu/~brianp/Togl.html for more information.
 
 
 
@@ -260,7 +260,6 @@ Extensions:
    The following OpenGL GLX extensions are currently implemented:
 
       GLX_EXT_visual_info - GLX visual and transparent pixel extension
-      GLX_EXT_visual_rating - GLX visual caveats
 
    For detailed information about the extensions see www.opengl.org
 
@@ -323,4 +322,4 @@ Summary of X-related environment variables:
 
 
 ----------------------------------------------------------------------
-$Id: README.X11,v 3.6 2001/06/20 19:02:48 brianp Exp $
+$Id: README.X11,v 3.3.2.3 2000/01/25 17:18:46 brianp Exp $

docs/RELNOTES-3.1

@@ -143,4 +143,4 @@ code).  Anyone want to help?
 
 
 ----------------------------------------------------------------------
-$Id: RELNOTES-3.1,v 1.2 2000/04/07 17:08:06 brianp Exp $
+$Id: RELNOTES-3.1,v 1.1.2.1 2000/02/22 17:56:56 brianp Exp $

docs/RELNOTES-3.2

@@ -1,12 +0,0 @@
-
-                         Mesa 3.2 release notes
-
-                             PLEASE READ!!!!
-
-
-Mesa 3.2 is a stabilization of the Mesa 3.1 release.  No new features
-have been added.  For a list of bug fixes please read the VERSIONS file.
-
-
-----------------------------------------------------------------------
-$Id: RELNOTES-3.2,v 1.2 2000/04/07 17:08:06 brianp Exp $

docs/RELNOTES-3.2.1

@@ -1,32 +0,0 @@
-
-                         Mesa 3.2.1 release notes
-
-                             PLEASE READ!!!!
-
-
-
-The Mesa 3.2.1 release mainly just fixes bugs since the 3.2 release.
-See the VERSIONS file for the exact list.
-
-
-
-GLU Polygon Tessellator
------------------------
-
-The GLU tessellator has been reverted back to the version included
-with Mesa 3.0 since it's more stable.  The Mesa 3.1/3.2 tessellator
-implemented the GLU 1.3 specification but suffered from a number of
-bugs.
-
-Mesa implements GLU 1.1.
-
-Ideally, people should use the GLU 1.3 library included in SGI's
-OpenGL Sample Implementation (SI) available from 
-http://oss.sgi.com/projects/ogl-sample/
-People are working to make easy-to-install Linux RPMs of the
-GLU library.
-
-
-
-----------------------------------------------------------------------
-$Id: RELNOTES-3.2.1,v 1.2 2000/07/21 16:32:33 brianp Exp $

docs/RELNOTES-3.3

@@ -1,271 +0,0 @@
-
-                         Mesa 3.3 release notes
-
-                             July 21, 2000
-
-                             PLEASE READ!!!!
-
-
-
-Introduction
-------------
-
-Mesa uses an even/odd version number scheme like the Linux kernel.
-Odd numbered versions (such as 3.3) designate new developmental releases.
-Even numbered versions (such as 3.2.1) designate stable releases.
-
-Mesa 3.3 has a undergone many internal changes since version 3.2
-and features a lot of new extensions.  3.3 is expected to be pretty
-stable, but perhaps not as stable as 3.2 which has been used by
-thousands of users over the past months.
-
-Everyone is encouraged to try Mesa 3.3.  Bugs should be reported to
-the Mesa bug database on www.sourceforge.net.
-
-
-
-Header file / GLenum changes
-----------------------------
-
-The gl.h and glu.h headers now use #defines to define all GL_* tokens
-instead of C-language enums.  This change improves Mesa/OpenGL
-interoperability.
-
-
-
-New API dispatch code
----------------------
-
-The core Mesa gl* functions are now implemented with a new dispatch
-(jump table) which will allow simultaneous direct/indirect rendering.
-
-The code is found in the glapi*.[ch] files.
-
-Of interest:  the actual "glFooBar" functions are generated with
-templatized code defined in glapitemp.h and included by glapi.c
-The glapitemp.h template should be reusable for all sorts of OpenGL
-projects.
-
-The new dispatch code has also optimized with x86 assembly code.
-This optimization eliminates copying the function arguments during
-dispatch.
-
-
-
-New thread support
-------------------
-
-Thread support in Mesa has been rewritten.  The glthread.[ch] files
-replace mthreads.[ch].  Thread safety is always enabled (on platforms
-which support threads, that is).  There is virtually no performance
-penalty for typical single-thread applications.  See the glapi.c
-file for details.
-
-The Xlib driver (XMesa) is now thread-safe as well.  Be sure to
-call XInitThreads() in your app first.  See the xdemos/glthreads.c
-demo for an example.
-
-
-
-Make configuration changes
---------------------------
-
-If you use the old-style (non GNU automake) method to build Mesa note
-that several of the configuration names have changed:
-
-   Old name        New name
-   -------------   ----------------
-   linux-elf       linux
-   linux           linux-static
-   linux-386-elf   linux-386
-   linux-386       linux-386-static
-   etc.
-
-
-
-New extensions
---------------
-
-GL_ARB_transpose_matrix
-	Adds glLoadTransposeMatrixARB() and glMultTransposeMatrixARB()
-        functions.
-
-GL_ARB_texture_cube_map
-	For cube-based reflection mapping.
-
-GL_EXT_texture_add_env
-	Adds GL_ADD texture environment mode.
-	See http://www.berkelium.com/OpenGL/EXT/texture_env_add.txt
-
-GL_EXT_texture_lod_bias
-	Allows mipmapped texture blurring and sharpening.
-
-GLX_EXT_visual_rating extension
-	This extension has no effect in stand-alone Mesa (used for DRI).
-
-GL_HP_occlusion_test
-	Used for bounding box occlusion testing (see demos/occlude.c).
-
-GL_SGIX_pixel_texture / GL_SGIS_pixel_texture
-	Lets glDraw/CopyPixels draw a texture coordinate image.
-
-GL_SGI_color_matrix
-	Adds a color matrix and another set of scale and bias parameters
-	to the glDraw/CopyPixels paths.
-
-GL_SGI_color_table
-	Adds additional color tables to the glDraw/Read/CopyPixels paths.
-
-GL_EXT_histogram
-	Compute histograms for glDraw/Read/CopyPixels.
-
-GL_EXT_blend_func_separate
-	This is the same as GL_INGR_blend_func_separate.
-
-GL_ARB_texture_cube_mapping
-	6-face cube mapping, nicer than sphere mapping
-
-GL_EXT_texture_env_combine
-	For advanced texture environment effects.
-
-
-Documentation for all these functions can be found at
-http://oss.sgi.com/projects/ogl-sample/registry/
-
-
-
-GLX_SGI_make_current_read functionality
----------------------------------------
-
-The functionality of this extension is needed for GLX 1.3 (and required
-for the Linux/OpenGL standards base).
-
-Implementing this function required a **DEVICE DRIVER CHANGE**.
-The old SetBuffer() function has been replaced by SetReadBuffer() and
-SetDrawBuffer().  All device drivers will have to be updated because
-of this change.
-
-The new function, glXMakeContextCurrent(), in GLX 1.3 now works in Mesa.
-The xdemos/wincopy.c program demonstrates it.
-
-
-
-Image-related code changes
---------------------------
-
-The imaging path code used by glDrawPixels, glTexImage[123]D,
-glTexSubImage[123], etc has been rewritten.  It's now faster,
-uses less memory and has several bug fixes.  This work was
-actually started in Mesa 3.1 with the glTexImage paths but has now
-been carried over to glDrawPixels as well.
-
-
-
-Device driver interface changes
--------------------------------
-
-Added new functions for hardware stencil buffer support:
-   WriteStencilSpan
-   ReadStencilSpan
-   WriteStencilPixels
-   ReadStencilPixels
-
-
-Removed old depth buffer functions:
-   AllocDepthBuffer
-   DepthTestSpan
-   DepthTestPixels
-   ReadDepthSpanFloat
-   ReadDepthSpanInt
-
-
-Added new depth buffer functions:
-   WriteDepthSpan
-   ReadDepthSpan
-   WriteDepthPixels
-   ReadDepthPixels
-
-   These functions always read/write 32-bit GLuints.  This will allow
-   drivers to have anywhere from 0 to 32-bit Z buffers without
-   recompiling for 16 vs 32 bits as was previously needed.
-
-
-New texture image functions
-   The entire interface for texture image specification has been updated.
-   With the new functions, it's optional for Mesa to keep an internal copy
-   of all textures.  Texture download should be a lot faster when the extra
-   copy isn't made.
-
-Misc changes
-   TexEnv now takes a target argument
-   Removed UseGlobalTexturePalette (use Enable function instead)
-
-
-Also added
-   ReadPixels
-   CopyPixels
-
-
-The SetBufffer function has been replaced by SetDrawBuffer and
-SetReadBuffer functions.  This lets core Mesa independently
-specify which buffer is to be used for reading and which for
-drawing.
-
-The Clear function's mask parameter has changed.  Instead of
-mask being the flags specified by the user to glClear, the
-mask is now a bitmask of the DD_*_BIT flags in dd.h.  Now
-multiple color buffers can be specified for clearing (ala
-glDrawBuffers).  The driver's Clear function must also
-check the glColorMask glIndexMask, and glStencilMask settings
-and do the right thing.  See the X/Mesa, OS/Mesa, or FX/Mesa
-drivers for examples.
-
-
-The depth buffer changes shouldn't be hard to make for existing
-drivers.  In fact, it should simply the code.  Be careful with
-the depthBits value passed to gl_create_context().  1 is a bad
-value!  It should normally be 0, 16, 24, or 32.
-
-
-gl_create_framebuffer() takes new arguments which explicitly tell
-core Mesa which ancillary buffers (depth, stencil, accum, alpha)
-should be implemented in software.  Mesa hardware drivers should
-carefully set these flags depending on which buffers are in the
-graphics card.
-
-
-
-Internal constants
-------------------
-
-Point and line size range and granularity limits are now stored
-in the gl_constants struct, which is the Const member of GLcontext.
-The limits are initialized from values in config.h but may be
-overridden by device drivers to reflect the limits of that driver's
-hardware.
-
-Also added constants for NumAuxBuffers and SubPixelBits.
-
-
-
-OpenGL Conformance
-------------------
-
-Mesa now passes all the OpenGL 1.1 conformance tests, except for
-antialiased lines.  AA lines fail on some, but not all, the tests.
-In order to fix the remaining failures, a new AA line algorithm will
-be needed (which computes coverage values for end-point fragments).
-This will be done for Mesa 3.5/3.6.
-
-
-
-OpenGL 1.2 GL_ARB_imaging subset
---------------------------------
-
-Mesa 3.3 implements all the features of GL_ARB_imaging except for
-image convolution.  This will (hopefully) be done for Mesa 3.5/3.6.
-
-
-
-----------------------------------------------------------------------
-$Id: RELNOTES-3.3,v 1.8 2000/07/21 16:26:41 brianp Exp $

docs/RELNOTES-3.4.1

@@ -1,22 +0,0 @@
-
-                         Mesa 3.4.1 release notes
-
-                             February 9, 2001
-
-                              PLEASE READ!!!!
-
-
-
-Introduction
-------------
-
-Mesa uses an even/odd version number scheme like the Linux kernel.
-Odd numbered versions (such as 3.3) designate new developmental releases.
-Even numbered versions (such as 3.4) designate stable releases.
-
-Mesa 3.4.1 is a maintenance release that simply fixes bugs found since
-the Mesa 3.4 release.  For details, see the VERSIONS file.
-
-
-----------------------------------------------------------------------
-$Id: RELNOTES-3.4.1,v 1.2 2001/05/23 14:45:01 brianp Exp $

docs/RELNOTES-3.4.2

@@ -1,22 +0,0 @@
-
-                         Mesa 3.4.2 release notes
-
-                               May 17, 2001
-
-                              PLEASE READ!!!!
-
-
-
-Introduction
-------------
-
-Mesa uses an even/odd version number scheme like the Linux kernel.
-Odd numbered versions (such as 3.3) designate new developmental releases.
-Even numbered versions (such as 3.4) designate stable releases.
-
-Mesa 3.4.2 is a maintenance release that simply fixes bugs found since
-the Mesa 3.4.1 release.  For details, see the VERSIONS file.
-
-
-----------------------------------------------------------------------
-$Id: RELNOTES-3.4.2,v 1.2 2001/05/23 14:45:01 brianp Exp $

docs/RELNOTES-3.5

@@ -1,228 +0,0 @@
-
-                         Mesa 3.5 release notes
-
-                             June 21, 2001
-
-                             PLEASE READ!!!!
-
-
-
-Introduction
-------------
-
-Mesa uses an even/odd version number scheme like the Linux kernel.
-Odd numbered versions (such as 3.5) designate new developmental releases.
-Even numbered versions (such as 3.4) designate stable releases.
-
-The biggest change in Mesa 3.5 is a complete overhaul of the source
-code in order to make it more modular.  This was driven by the DRI
-hardware drivers.  It simplifies the DRI drivers and opens the door
-to hardware transform/clip/lighting (TCL).  Keith Whitwell can take
-the credit for that.
-
-
-
-Driver Support
---------------
-
-The device driver interface in Mesa 3.5 has changed a lot since Mesa 3.4
-Not all of the older Mesa drivers have been updated.  Here's the status:
-
-Driver			Status
-----------------------	-----------
-XMesa (Xlib)		updated
-OSMesa (off-screen)	updated
-FX (3dfx Voodoo1/2)	updated
-SVGA			updated
-GGI			not updated
-Windows/Win32		not updated
-DOS/DJGPP		not updated
-BeOS			not updated
-Allegro			not updated
-D3D			not updated
-DOS			not updated
-
-We're looking for volunteers to update the remaining drivers.  Please
-post to the Mesa3d-dev mailing list if you can help.
-
-
-
-GLU 1.3
--------
-
-Mesa 3.5 includes the SGI Sample Implementation (SI) GLU library.
-This version of GLU supports the GLU 1.3 specification.  The old
-Mesa GLU library implemented the 1.1 specification.  The SI GLU
-library should work much better.
-
-You'll need a C++ compiler to compile the SI GLU library.  This may
-be a problem on some systems.
-
-
-
-New Extensions
---------------
-
-GL_EXT_convolution
-	Adds image convolution to glRead/Copy/DrawPixels/TexImage.
-
-GL_ARB_imaging
-	This is the optional imaging subset of OpenGL 1.2.
-	It's the GL_EXT_convolution, GL_HP_convolution_border_modes,
-	GL_EXT_histogram, GL_EXT_color_table, GL_EXT_color_subtable
-	GL_EXT_blend_color, GL_EXT_blend_minmax, GL_EXT_blend_subtract
-	and GL_SGI_color_matrix extensions all rolled together.
-	This is supported in all software renderers but not in all
-	hardware drivers (3dfx for example).
-
-GL_ARB_texture_compression
-	This is supported in Mesa but only used by the 3dfx DRI drivers
-	for Voodoo4 and later.
-
-GL_ARB_texture_env_add
-	This is identical to GL_EXT_texture_env_add.
-
-GL_NV_blend_square
-	Adds extra blend source and dest factors which allow squaring
-	of color values.
-
-GL_EXT_fog_coord
-	Allows specification of a per-vertex fog coordinate instead of
-	having fog always computed from the eye distance.
-
-GL_EXT_secondary_color
-	Allows specifying the secondary (specular) color for each vertex
-	instead of getting it only from lighting in GL_SEPARATE_SPECULAR_COLOR
-	mode.
-
-GL_ARB_texture_env_combine
-	Basically the same as GL_EXT_texture_env_combine
-
-GL_ARB_texture_env_add extension
-	Texture addition mode.
-
-GL_ARB_texture_env_dot3 extension
-	Dot product texture environment.
-
-GL_ARB_texture_border_clamp
-	Adds GL_CLAMP_TO_BORDER_ARB texture wrap mode
-
-GL_SGIX_depth_texture, GL_SGIX_shadow and GL_SGIX_shadow_ambient
-	Implements a shadow casting algorithm based on depth map textures
-
-GL_SGIS_generate_mipmap
-	Automatically generate lower mipmap images whenever the base mipmap
-	image is changed with glTexImage, glCopyTexImage, etc.
-
-
-
-libOSMesa.so
-------------
-
-libOSMesa.so is a new library which contains the OSMesa interface for
-off-screen rendering.  Apps which need the OSMesa interface should link
-with both -lOSMesa and -lGL.  This change was made so that stand-alone
-Mesa works the same way as XFree86/DRI's libGL.
-
-
-
-Device Driver Changes / Core Mesa Changes
------------------------------------------
-
-The ctx->Driver.LogicOp() function has been removed.  It used to
-be called during state update in order to determine if the driver
-could do glLogicOp() operations, and if not, set the SWLogicOpEnabled
-flag.  Drivers should instead examine the LogicOp state themselves
-and choose specialized point, line, and triangle functions appropriately,
-or fall back to software rendering.  The Xlib driver was the only driver
-to use this function.  And since the Xlib driver no longer draws
-points, lines or triangles using Xlib, the LogicOp function isn't needed.
-
-The ctx->Driver.Dither() function has been removed.  Drivers should
-detect dither enable/disable via ctx->Driver.Enable() instead.
-
-The ctx->Driver.IndexMask() and ctx->Driver.ColorMask() functions
-are now just called from glIndexMask and glColorMask like the other
-GL state-changing functions.  They are no longer called from inside
-gl_update_state().  Also, they now return void.  The change was made
-mostly for sake of uniformity.
-
-The NEW_DRVSTATE[0123] flags have been removed.  They weren't being used
-and are obsolete w.r.t. the way state updates are done in DRI drivers.
-
-
-Removed obsolete gl_create_visual() and gl_destroy_visual().
-
-Renamed functions (new namespace):
-
-old				new
-gl_create_framebuffer		_mesa_create_framebuffer
-gl_destroy_framebuffer		_mesa_destroy_framebuffer
-gl_create_context		_mesa_create_context
-gl_destroy_context		_mesa_destroy_context
-gl_context_initialize		_mesa_context_initialize
-gl_copy_context			_mesa_copy_context
-gl_make_current			_mesa_make_current
-gl_make_current2		_mesa_make_current2
-gl_get_current_context		_mesa_get_current_context
-gl_flush_vb			_mesa_flush_vb
-gl_warning			_mesa_warning
-gl_compile_error		_mesa_compile_error
-
-
-All the drivers have been updated, but not all of them have been
-tested since I can't test some platforms (DOS, Windows, Allegro, etc).
-
-
-X/Mesa Driver
--------------
-
-The source files for the X/Mesa driver in src/X have been renamed.
-The xmesa[1234].c files are gone.  The new files are xm_api.c,
-xm_dd.c, xm_line.c, xm_span.c and xm_tri.c.
-
-
-
-Multitexture
-------------
-
-Eight texture units are now supported by default.
-
-
-
-OpenGL SI related changes
--------------------------
-
-In an effort to make Mesa's internal interfaces more like the OpenGL
-SI interfaces, a number of changes have been made:
-
-1. Importing the SI's glcore.h file which defines a number of
-interface structures like __GLimports and __GLexports.
-
-2. Renamed "struct gl_context" to "struct __GLcontextRec".
-
-3. Added __glCoreCreateContext() and __glCoreNopDispatch() functions.
-
-4. The GLcontext member Visual is no longer a pointer.
-
-5. New file: imports.c to setup default import functions for Mesa.
-
-
-
-
-16-bit color channels
----------------------
-
-There's experimental support for 16-bit color channels (64-bit pixels)
-in Mesa 3.5.  Only the OSMesa interface can be used for 16-bit rendering.
-Type "make linux-osmesa16" in the top-level directory to build the
-special libOSMesa16.so library.
-
-This hasn't been tested very thoroughly yet so please file bug reports
-if you have trouble.
-
-In the future I hope to implement support for 32-bit, floating point
-color channels.
-
-----------------------------------------------------------------------
-$Id: RELNOTES-3.5,v 1.14 2001/06/20 19:02:48 brianp Exp $

docs/VERSIONS

@@ -1,4 +1,4 @@
-$Id: VERSIONS,v 1.60 2001/06/20 19:02:48 brianp Exp $
+$Id: VERSIONS,v 1.13.2.24 2000/03/23 00:12:41 brianp Exp $
 
 
 Mesa Version History
@@ -666,204 +666,45 @@ Mesa Version History
 	- added demos/gloss.c
 	- added xdemos/glxdpyinfo.c
 	- added GLX_ARB_get_proc_address extension
-	- rewritten glTexImage code paths (faster, less memory, bug fixes)
-    Bug Fixes:
+    Bug fixes:
 	- several vertex array bug fixes
 	- overlapping glCopyPixels with pixel zooming now works
 	- glXUseXFont() bitmaps were vertically shifted by one pixel
-	- glCopyPixels with pixel zooming now works
 
 
-3.2 final  April 24, 2000
+3.2 beta 1 March 23, 2000
     Bug fixes:
-	- fixed memcpy bugs in span.c
-	- fixed missing glEnd problem in demos/tessdemo.c
-	- fixed bug when clearing 24bpp Ximages
-	- fixed clipping problem found in Unreal Tournament
-	- fixed Loki's "ice bug" and "crazy triangles" seen in Heretic2
-	- fixed Loki's 3dfx RGB vs BGR bug
-	- fixed Loki's 3dfx smooth/flat shading bug in SoF
-    Changes:
-	- updated docs/README file
-	- use bcopy() optimizations on FreeBSD
-	- re-enabled the optimized persp_textured_triangle() function
-
-
-3.2.1  July 19, 2000
-    Bug fixes:
-	- gluBuild2DMipmaps() didn't accept GL_BGRA
-	- Fixed compile/makefile problems on IRIX
-	- fixed segfault in 3dfx driver when using GL selection/feedback
-	- no longer cull very, very tiny triangles
-	- blending w/ drawbuffer==GL_FRONT_BACK caused segfault (sw rendering)
-	- fixed Motif detection code in widgets-mesa/configure.in
-	- glColorMaterial and glMaterial updates to emissive and ambient
-	  didn't always work right
-	- Specular highlights weren't always in the right place
-	- clipped GL_LINE mode polygons had interior lines appear
-	- blend term GL_ONE_MINUS_CONSTANT_ALPHA was broken
-	- GL_NICEST fog didn't always work with flat shading
-	- glRect commands in display lists were sometimes miscolored
-	- Line Z offset didn't always work
-	- fixed texgen normal vector problem (gloss's teapot)
-	- numerous GL conformance bugs fixed
-    Changes:
-	- glColorMask(false, false, false, false) handled better/faster
-	- reverted to old GLU polygon tessellator, GLU 1.1
-	- updated Win32 build files
-
-
-3.3  July 21, 2000
+	- mixed drawing of lines and bitmaps sometimes had wrong colors
+	- added missing glHintPGI() function
+	- fixed a polygon culling bug
+	- fixed bugs in gluPartialDisk()
+	- Z values in selection mode were wrong
+	- added missing tokens:
+		GL_SMOOTH_POINT_SIZE_RANGE
+		GL_SMOOTH_POINT_SIZE_GRANULARITY
+		GL_SMOOTH_LINE_WIDTH_RANGE
+		GL_SMOOTH_LINE_WIDTH_GRANULARITY
+		GL_ALIASED_POINT_SIZE_RANGE
+		GL_ALIASED_LINE_WIDTH_RANGE
+	- fixed glCopyPixels when copying from back to front buffer
+	- GL_EXT_compiled_vertex_array tokens had _SGI suffix instead of _EXT
+	- glDrawRangeElements(GL_LINES, 0, 1, 2, type, indices) was broken
+	- glDeleteTextures() didn't decrement reference count correctly
+	- GL_SRCA_ALPHA_SATURATE blend mode didn't work correctly
+	- Actual depth of transformation matrix stacks was off by one
+	- 24bpp visuals didn't address pixels correctly
+	- mipmap level of detail (lambda) calculation simplified, more accurate
+	- 101691 - Polygon clipping and GL_LINE
+	- 101928 - Polygon clipping and GL_LINE (same fix as above)
+	- 101808 - Non-glVertexArrays tristrip bug
+	- 101971 - find_last_3f on Dec OSF (worked around)
+	- 102369 - segv on dec osf (possibly a duplicate of the above)
+	- 102893 - orientations of modelview cause segfault
     New:
-	- antialiased triangles now implemented
-	- GL_EXT_texture_env_add texture mode extension
-	- GLX 1.3 API
-	- support for separate draw/read buffers (ie GL_SGI_make_current_read)
-	- thread-safe API dispath
-	- improved glxinfo program
-	- demos/texdown program to measure texture download performance
-	- glext.h header file
-	- demos/geartrain program
-	- GL_EXT_texture_lod_bias extension
-	- demos/lodbias program
-	- further optimized glRead/DrawPixels for 16-bit TrueColor X visuals
-	- GLX_EXT_visual_rating extension (a no-op, however)
-	- GL_HP_occlusion_test extension (for X and OS/Mesa drivers)
-	- demos/occlude program
-	- GL_SGIS_pixel_texture and GL_SGIX_pixel_texture extensions
-	- demos/pixeltex program
-	- GL_SGI_color_matrix extension
-	- GL_SGI_color_table extension
-	- GL_EXT_histogram extension
-	- GL_ARB_texture_cube_map extension
-	- added xdemos/glxheads and xdemos/manywin
-	- demos/texenv.c demo
-	- GL_EXT_texture_env_combine extension (by Holger Waechtler)
-	- Xlib driver is now thread-safe (see xdemos/glthreads)
-    Bug Fixes:
-	- various GL conformance failures fixed since 3.2.1
+	- updated SVGA Linux driver
+	- added the MESA_FX_NO_SIGNALS env var, see docs/README.3DFX
+	- build libGLw.a (Xt/OpenGL drawing area widget) library by default
+	- changed -O2 to -O3 for a number of gcc configs
     Changes:
-	- gl.h now uses #defines instead of C enums for all tokens
-	- glu.h now uses #defines instead of C enums for all tokens
-	- moved programs from 3Dfx/demos/ into demos/ directory
+        - glXCopyContext's mask parameter is now unsigned long, per GLX spec
 
-
-3.4  November 3, 2000
-    New:
-	- optimized glDrawPixels for glPixelZoom(1,-1)
-    Bug Fixes:
-	- widgets-mesa/src/*.c files were missing from 3.3 distro
-	- include/GL/mesa_wgl.h file was missing from 3.3 distro
-	- fixed some Win32 compile problems
-	- texture object priorities weren't getting initialized to 1.0
-	- glAreTexturesResident return value was wrong when using hardware
-	- glXUseXFont segfaulted when using 3dfx driver (via MESA_GLX_FX)
-	- glReadPixels with GLushort packed types was broken
-	- fixed a few bugs in the GL_EXT_texture_env_combine texture code
-	- glPush/PopAttrib(GL_ENABLE_BIT) mishandled multi-texture enables
-	- fixed some typos/bugs in the VB code
-	- glDrawPixels(GL_COLOR_INDEX) to RGB window didn't work
-	- optimized glDrawPixels paths weren't being used
-	- per-fragment fog calculation didn't work without a Z buffer
-	- improved blending accuracy, fixes Glean blendFunc test failures
-	- glPixelStore(GL_PACK/UNPACK_SKIP_IMAGES) wasn't handled correctly
-	- glXGetProcAddressARB() didn't always return the right address
-	- gluBuild[12]DMipmaps() didn't grok the GL_BGR pixel format
-	- texture matrix changes weren't always detected (GLUT projtex demo)
-	- fixed random color problem in vertex fog code
-	- fixed Glide-related bug that let Quake get a 24-bit Z buffer
-    Changes:
-	- finished internal support for compressed textures for DRI
-
-
-3.4.1  February 14, 2001
-    New:
-	- fixed some Linux build problems
-	- fixed some Windows build problems
-	- GL_EXT_texture_env_dot3 extension (Gareth Hughes)
-    Bug fixes:
-	- added RENDER_START/RENDER_FINISH macros for glCopyTexImage in DRI
-	- various state-update code changes needed for DRI bugs
-	- disabled pixel transfer ops in glColorTable commands, not needed
-	- fixed bugs in glCopyConvolutionFilter1D/2D, glGetConvolutionFilter
-	- updated sources and fixed compile problems in widgets-mesa/
-	- GLX_PBUFFER enum value was wrong in glx.h
-	- fixed a glColorMaterial lighting bug
-	- fixed bad args to Read/WriteStencilSpan in h/w stencil clear function
-	- glXCopySubBufferMESA() Y position was off by one
-	- Error checking of glTexSubImage3D() was broken (bug 128775)
-	- glPopAttrib() didn't restore all derived Mesa state correctly
-	- Better glReadPixels accuracy for 16bpp color - fixes lots of OpenGL
-	  conformance problems at 16bpp.
-	- clearing depth buffer with scissoring was broken, would segfault
-	- OSMesaGetDepthBuffer() returned bad bytesPerValue value
-	- fixed a line clipping bug (reported by Craig McDaniel)
-	- fixed RGB color over/underflow bug for very tiny triangles
-    Known problems:
-	- NURBS or evaluator surfaces inside display lists don't always work
-
-
-3.4.2  May 17, 2001
-    Bug fixes:
-	- deleting the currently bound texture could cause bad problems
-	- using fog could result in random vertex alpha values
-	- AA triangle rendering could touch pixels outside right window bound
-	- fixed byteswapping problem in clear_32bit_ximage() function
-	- fixed bugs in wglUseFontBitmapsA(), by Frank Warmerdam
-	- fixed memory leak in glXUseXFont()
-	- fragment sampling in AA triangle function was off by 1/2 pixel
-	- Windows: reading pixels from framebuffer didn't always work
-	- glConvolutionFilter2D could segfault or cause FP exception
-	- fixed segfaults in FX and X drivers when using tex unit 1 but not 0
-	- GL_NAND logicop didn't work right in RGBA mode
-	- fixed a memory corruption bug in vertex buffer reset code
-	- clearing the softwara alpha buffer with scissoring was broken
-	- fixed a few color index mode fog bugs
-	- fixed some bad assertions in color index mode
-	- fixed FX line 'stipple' bug #420091
-	- fixed stencil buffer clear width/height typo
-	- fixed GL error glitches in gl[Client]ActiveTextureARB()
-	- fixed Windows compilation problem in texutil.c
-	- fixed 1/8-pixel AA triangle sampling error
-    Changes:
-	- optimized writing mono-colored pixel spans to X pixmaps
-	- increased max viewport size to 2048 x 2048
-
-
-3.5  June 21, 2001
-    New:
-	- internals of Mesa divided into modular pieces (Keith Whitwell)
-	- 100% OpenGL 1.2 conformance (passes all conformance tests)
-	- new AA line algorithm
-	- GL_EXT_convolution extension
-	- GL_ARB_imaging subset
-	- OSMesaCreateContextExt() function
-	- GL_ARB_texture_env_add extension (same as GL_EXT_texture_env_add)
-	- GL_MAX_TEXTURE_UNITS_ARB now defaults to eight
-	- GL_EXT_fog_coord extension (Keith Whitwell)
-	- GL_EXT_secondary_color extension (Keith Whitwell)
-	- GL_ARB_texture_env_add extension (same as GL_EXT_texture_env_add)
-	- GL_SGIX_depth_texture extension
-	- GL_SGIX_shadow and GL_SGIX_shadow_ambient extensions
-	- demos/shadowtex.c demo of GL_SGIX_depth_texture and GL_SGIX_shadow
-	- GL_ARB_texture_env_combine extension
-	- GL_ARB_texture_env_dot3 extension
-	- GL_ARB_texture_border_clamp (aka GL_SGIS_texture_border_clamp)
-	- OSMesaCreateContextExt() function
-	- libOSMesa.so library, contains the OSMesa driver interface
-	- GL/glxext.h header file for GLX extensions
-	- somewhat faster software texturing, fogging, depth testing
-	- all color-index conformance tests now pass (only 8bpp tested)
-	- SPARC assembly language TCL optimizations (David Miller)
-	- GL_SGIS_generate_mipmap extension
-    Bug Fixes:
-	- fbiRev and tmuRev were unitialized when using Glide3
-	- fixed a few color index mode conformance failures; all pass now
-	- now appling antialiasing coverage to alpha after texturing
-	- colors weren't getting clamped to [0,1] before color table lookup
-	- fixed RISC alignment errors caused by COPY_4UBV macro
-	- drawing wide, flat-shaded lines could cause a segfault
-	- vertices now snapped to 1/16 pixel to fix rendering of tiny triangles
-    Changes:
-	- SGI's Sample Implementation (SI) 1.3 GLU library replaces Mesa GLU
-	- new libOSMesa.so library, contains the OSMesa driver interface

include/GL/Makefile.am

@@ -2,42 +2,33 @@
 
 GLincludedir = $(includedir)/GL
 
-INC_FX = fxmesa.h
-INC_GGI = ggimesa.h
-INC_OSMESA = osmesa.h
-INC_SVGA = svgamesa.h
-INC_X11 = glx.h glxext.h glx_mangle.h xmesa.h xmesa_x.h xmesa_xf86.h
-INC_GLUT = glut.h glutf90.h
-
 if HAVE_FX
-sel_inc_fx = $(INC_FX)
+INC_FX = fxmesa.h
 endif
 
 if HAVE_GGI
-sel_inc_ggi = $(INC_GGI)
+INC_GGI = ggimesa.h
 endif
 
 if HAVE_OSMESA
-sel_inc_osmesa = $(INC_OSMESA)
+INC_OSMESA = osmesa.h
 endif
 
 if HAVE_SVGA
-sel_inc_svga = $(INC_SVGA)
+INC_SVGA = svgamesa.h
 endif
 
 if HAVE_X11
-sel_inc_x11 = $(INC_X11)
+INC_X11 = glx.h glx_mangle.h xmesa.h xmesa_x.h xmesa_xf86.h
 endif
 
 if NEED_GLUT
-sel_inc_glut = $(INC_GLUT)
+INC_GLUT = glut.h
 endif
 
-EXTRA_HEADERS = amesa.h dosmesa.h foomesa.h glut_h.dja mesa_wgl.h mglmesa.h \
-	vms_x_fix.h wmesa.h \
+EXTRA_DIST = fxmesa.h ggimesa.h osmesa.h svgamesa.h \
+	glx.h glx_mangle.h xmesa.h xmesa_x.h xmesa_xf86.h
+
+GLinclude_HEADERS = gl.h gl_mangle.h glu.h glu_mangle.h \
 	$(INC_FX) $(INC_GGI) $(INC_OSMESA) $(INC_SVGA) $(INC_X11) $(INC_GLUT)
 
-GLinclude_HEADERS = gl.h glext.h gl_mangle.h glu.h glu_mangle.h \
-	$(sel_inc_fx) $(sel_inc_ggi) $(sel_inc_osmesa) $(sel_inc_svga) \
-	$(sel_inc_x11) $(sel_inc_glut)
-include $(top_srcdir)/common_rules.make

include/GL/amesa.h

@@ -1,8 +1,8 @@
-/* $Id: amesa.h,v 1.2 2000/02/09 19:03:28 brianp Exp $ */
+/* $Id: amesa.h,v 1.1.1.1.2.1 2000/02/09 18:53:54 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
+ * Version:  3.2
  * 
  * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
@@ -33,7 +33,7 @@
 
 
 #define AMESA_MAJOR_VERSION 3
-#define AMESA_MINOR_VERSION 3
+#define AMESA_MINOR_VERSION 2
 
 
 typedef struct amesa_visual  *AMesaVisual;

include/GL/fxmesa.h

@@ -1,23 +1,27 @@
-/* $Id: fxmesa.h,v 1.3 2001/06/20 19:52:11 brianp Exp $ */
+/* $Id: fxmesa.h,v 1.1.1.1.2.2 2000/02/09 18:53:55 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
- * Copyright (C) 1995-2001  Brian Paul
+ * Version:  3.2
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * 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:
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
  */
 
 
@@ -41,7 +45,7 @@ extern "C" {
 
 
 #define FXMESA_MAJOR_VERSION 3
-#define FXMESA_MINOR_VERSION 5
+#define FXMESA_MINOR_VERSION 2
 
 
 /*

include/GL/ggimesa.h

@@ -1,9 +1,9 @@
-/* $Id: ggimesa.h,v 1.3 2000/02/09 19:03:28 brianp Exp $ */
+/* $Id: ggimesa.h,v 1.2.2.1 2000/02/09 18:53:55 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
- * Copyright (C) 1995-2000  Brian Paul
+ * Version:  3.2
+ * Copyright (C) 1995-1998  Brian Paul
  * Copyright (C) 1998  Uwe Maurer
  *
  * This library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 
 
 #define GGIMESA_MAJOR_VERSION 3
-#define GGIMESA_MINOR_VERSION 3
+#define GGIMESA_MINOR_VERSION 2
 
 
 #ifdef __cplusplus

include/GL/gl_mangle.h

@@ -1,10 +1,10 @@
-/* $Id: gl_mangle.h,v 1.6 2001/04/19 22:33:03 brianp Exp $ */
+/* $Id: gl_mangle.h,v 1.3.2.1 2000/01/04 08:08:28 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  3.2
  * 
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999  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"),
@@ -535,145 +535,5 @@
 #define glCopyColorTable mglCopyColorTable
 #define glLockArraysEXT mglLockArraysEXT
 #define glUnlockArraysEXT mglUnlockArraysEXT
-#define glGetFinalCombinerInputParameterivNV mglGetFinalCombinerInputParameterivNV
-#define glGetFinalCombinerInputParameterfvNV mglGetFinalCombinerInputParameterfvNV 
-#define glGetCombinerOutputParameterivNV mglGetCombinerOutputParameterivNV 
-#define glGetCombinerOutputParameterfvNV mglGetCombinerOutputParameterfvNV 
-#define glGetCombinerInputParameterivNV mglGetCombinerInputParameterivNV 
-#define glGetCombinerInputParameterfvNV mglGetCombinerInputParameterfvNV 
-#define glFinalCombinerInputNV mglFinalCombinerInputNV 
-#define glCombinerOutputNV mglCombinerOutputNV 
-#define glCombinerInputNV mglCombinerInputNV 
-#define glCombinerParameteriNV mglCombinerParameteriNV 
-#define glCombinerParameterivNV mglCombinerParameterivNV 
-#define glCombinerParameterfNV mglCombinerParameterfNV 
-#define glCombinerParameterfvNV mglCombinerParameterfvNV 
-#define glVertexArrayRangeNV mglVertexArrayRangeNV 
-#define glFlushVertexArrayRangeNV mglFlushVertexArrayRangeNV 
-#define glVertexWeightPointerEXT mglVertexWeightPointerEXT 
-#define glVertexWeightfvEXT mglVertexWeightfvEXT 
-#define glVertexWeightfEXT mglVertexWeightfEXT 
-#define glBlendFuncSeparateEXT mglBlendFuncSeparateEXT 
-#define glFogCoordPointerEXT mglFogCoordPointerEXT 
-#define glFogCoorddEXT mglFogCoorddEXT 
-#define glFogCoordfvEXT mglFogCoordfvEXT 
-#define glFogCoordfEXT mglFogCoordfEXT 
-#define glLightEnviSGIX mglLightEnviSGIX 
-#define glGetFragmentMaterialivSGIX mglGetFragmentMaterialivSGIX 
-#define glGetFragmentMaterialfvSGIX mglGetFragmentMaterialfvSGIX 
-#define glGetFragmentLightivSGIX mglGetFragmentLightivSGIX 
-#define glGetFragmentLightfvSGIX mglGetFragmentLightfvSGIX 
-#define glFragmentMaterialivSGIX mglFragmentMaterialivSGIX 
-#define glFragmentMaterialiSGIX mglFragmentMaterialiSGIX 
-#define glFragmentMaterialfvSGIX mglFragmentMaterialfvSGIX 
-#define glFragmentMaterialfSGIX mglFragmentMaterialfSGIX 
-#define glFragmentLightModelivSGIX mglFragmentLightModelivSGIX 
-#define glFragmentLightModeliSGIX mglFragmentLightModeliSGIX 
-#define glFragmentLightModelfvSGIX mglFragmentLightModelfvSGIX 
-#define glFragmentLightModelfSGIX mglFragmentLightModelfSGIX 
-#define glFragmentLightivSGIX mglFragmentLightivSGIX 
-#define glFragmentLightiSGIX mglFragmentLightiSGIX 
-#define glFragmentLightfvSGIX mglFragmentLightfvSGIX 
-#define glFragmentLightfSGIX mglFragmentLightfSGIX 
-#define glFragmentColorMaterialSGIX mglFragmentColorMaterialSGIX 
-#define glCullParameterdvEXT mglCullParameterdvEXT 
-#define glCullParameterfvEXT mglCullParameterfvEXT 
-#define glIndexFuncEXT mglIndexFuncEXT 
-#define glIndexMaterialEXT mglIndexMaterialEXT 
-#define glListParameterivSGIX mglListParameterivSGIX 
-#define glListParameteriSGIX mglListParameteriSGIX 
-#define glListParameterfvSGIX mglListParameterfvSGIX 
-#define glListParameterfSGIX mglListParameterfSGIX 
-#define glGetListParameterivSGIX mglGetListParameterivSGIX 
-#define glGetListParameterfvSGIX mglGetListParameterfvSGIX 
-#define glHintPGI mglHintPGI 
-#define glCopyColorSubTableEXT mglCopyColorSubTableEXT 
-#define glFlushRasterSGIX mglFlushRasterSGIX 
-#define glReferencePlaneSGIX mglReferencePlaneSGIX 
-#define glTagSampleBufferSGIX mglTagSampleBufferSGIX 
-#define glFrameZoomSGIX mglFrameZoomSGIX 
-#define glGetInstrumentsSGIX mglGetInstrumentsSGIX 
-#define glPollInstrumentsSGIX mglPollInstrumentsSGIX 
-#define glReadInstrumentsSGIX mglReadInstrumentsSGIX 
-#define glStopInstrumentsSGIX mglStopInstrumentsSGIX 
-#define glStartInstrumentsSGIX mglStartInstrumentsSGIX 
-#define glInstrumentsBufferSGIX mglInstrumentsBufferSGIX 
-#define glPointParameterfvSGIS mglPointParameterfvSGIS 
-#define glPointParameterfSGIS mglPointParameterfSGIS 
-#define glSpriteParameterivSGIX mglSpriteParameterivSGIX 
-#define glSpriteParameteriSGIX mglSpriteParameteriSGIX 
-#define glSpriteParameterfvSGIX mglSpriteParameterfvSGIX 
-#define glSpriteParameterfSGIX mglSpriteParameterfSGIX 
-#define glSamplePatternSGIS mglSamplePatternSGIS 
-#define glSampleMaskSGIS mglSampleMaskSGIS 
-#define glSharpenTexFuncSGIS mglSharpenTexFuncSGIS 
-#define glGetSharpenTexFuncSGIS mglGetSharpenTexFuncSGIS 
-#define glGetDetailTexFuncSGIS mglGetDetailTexFuncSGIS 
-#define glDetailTexFuncSGIS mglDetailTexFuncSGIS 
-#define glTexSubImage4DSGIS mglTexSubImage4DSGIS 
-#define glTexImage4DSGIS mglTexImage4DSGIS 
-#define glGetPixelTexGenParameterivSGIS mglGetPixelTexGenParameterivSGIS 
-#define glGetPixelTexGenParameterfvSGIS mglGetPixelTexGenParameterfvSGIS 
-#define glPixelTexGenParameteriSGIS mglPixelTexGenParameteriSGIS 
-#define glPixelTexGenParameterfSGIS mglPixelTexGenParameterfSGIS 
-#define glGetColorTableParameterivSGI mglGetColorTableParameterivSGI 
-#define glGetColorTableParameterfvSGI mglGetColorTableParameterfvSGI 
-#define glGetColorTableSGI mglGetColorTableSGI 
-#define glCopyColorTableSGI mglCopyColorTableSGI 
-#define glColorTableParameterivSGI mglColorTableParameterivSGI 
-#define glColorTableParameterfvSGI mglColorTableParameterfvSGI 
-#define glColorTableSGI mglColorTableSGI 
-#define glSeparableFilter2DEXT mglSeparableFilter2DEXT 
-#define glGetSeparableFilterEXT mglGetSeparableFilterEXT 
-#define glGetConvolutionParameterfvEXT mglGetConvolutionParameterfvEXT 
-#define glGetConvolutionParameterivEXT mglGetConvolutionParameterivEXT 
-#define glGetConvolutionFilterEXT mglGetConvolutionFilterEXT 
-#define glCopyConvolutionFilter2DEXT mglCopyConvolutionFilter2DEXT 
-#define glCopyConvolutionFilter1DEXT mglCopyConvolutionFilter1DEXT 
-#define glConvolutionParameterivEXT mglConvolutionParameterivEXT 
-#define glConvolutionParameteriEXT mglConvolutionParameteriEXT 
-#define glConvolutionParameterfvEXT mglConvolutionParameterfvEXT 
-#define glConvolutionParameterfEXT mglConvolutionParameterfEXT 
-#define glConvolutionFilter2DEXT mglConvolutionFilter2DEXT 
-#define glConvolutionFilter1DEXT mglConvolutionFilter1DEXT 
-#define glResetMinmaxEXT mglResetMinmaxEXT 
-#define glResetHistogramEXT mglResetHistogramEXT 
-#define glMinmaxEXT mglMinmaxEXT 
-#define glHistogramEXT mglHistogramEXT 
-#define glGetMinmaxParameterivEXT mglGetMinmaxParameterivEXT 
-#define glGetMinmaxParameterfvEXT mglGetMinmaxParameterfvEXT 
-#define glGetMinmaxEXT mglGetMinmaxEXT 
-#define glGetHistogramParameterivEXT mglGetHistogramParameterivEXT 
-#define glGetHistogramParameterfvEXT mglGetHistogramParameterfvEXT 
-#define glGetHistogramEXT mglGetHistogramEXT 
-#define glCopyTexSubImage2DEXT mglCopyTexSubImage2DEXT 
-#define glCopyTexSubImage1DEXT mglCopyTexSubImage1DEXT 
-#define glCopyTexImage2DEXT mglCopyTexImage2DEXT 
-#define glCopyTexImage1DEXT mglCopyTexImage1DEXT 
-#define glTexSubImage2DEXT mglTexSubImage2DEXT 
-#define glTexSubImage1DEXT mglTexSubImage1DEXT 
-#define glSampleCoverageARB mglSampleCoverageARB 
-#define glSamplePassARB mglSamplePassARB 
-#define glMultTransposeMatrixfARB mglMultTransposeMatrixfARB 
-#define glMultTransposeMatrixdARB mglMultTransposeMatrixdARB 
-#define glLoadTransposeMatrixfARB mglLoadTransposeMatrixfARB 
-#define glLoadTransposeMatrixdARB mglLoadTransposeMatrixdARB 
-#define glSecondaryColor3fEXT mglSecondaryColor3fEXT
-#define glSecondaryColor3ubEXT mglSecondaryColor3ubEXT
-#define glSecondaryColor3uivEXT mglSecondaryColor3uivEXT
-#define glSecondaryColor3ubvEXT mglSecondaryColor3ubvEXT
-#define glSecondaryColor3svEXT mglSecondaryColor3svEXT
-#define glSecondaryColor3ivEXT mglSecondaryColor3ivEXT
-#define glSecondaryColor3fvEXT mglSecondaryColor3fvEXT
-#define glSecondaryColor3dvEXT mglSecondaryColor3dvEXT
-#define glSecondaryColor3bvEXT mglSecondaryColor3bvEXT
-#define glSecondaryColor3usvEXT mglSecondaryColor3usvEXT
-#define glSecondaryColorPointerEXT mglSecondaryColorPointerEXT
-#define glSecondaryColor3iEXT mglSecondaryColor3iEXT
-#define glSecondaryColor3dEXT mglSecondaryColor3dEXT
-#define glSecondaryColor3bEXT mglSecondaryColor3bEXT
-#define glSecondaryColor3uiEXT mglSecondaryColor3uiEXT
-#define glSecondaryColor3usEXT mglSecondaryColor3usEXT
-#define glSecondaryColor3sEXT mglSecondaryColor3sEXT
 
 #endif

include/GL/glu.h

@@ -1,323 +1,486 @@
+/* $Id: glu.h,v 1.16 1999/11/11 03:21:43 kendallb Exp $ */
+
 /*
-** 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.1 (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-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: 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.
-*/
+ * Mesa 3-D graphics library
+ * Version:  3.3
+ *
+ * Copyright (C) 1995-1999  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 
-#ifndef __glu_h__
-#define __glu_h__
 
-#include <GL/gl.h>
+#ifndef GLU_H
+#define GLU_H
+
+
+#if defined(USE_MGL_NAMESPACE)
+#include "glu_mangle.h"
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*************************************************************/
 
-/* Extensions */
-#define GLU_EXT_object_space_tess          1
-#define GLU_EXT_nurbs_tessellator          1
+#include "GL/gl.h"
 
-/* Boolean */
-#define GLU_FALSE                          0
-#define GLU_TRUE                           1
-
-/* Version */
-#define GLU_VERSION_1_1                    1
-#define GLU_VERSION_1_2                    1
-#define GLU_VERSION_1_3                    1
-
-/* StringName */
-#define GLU_VERSION                        100800
-#define GLU_EXTENSIONS                     100801
-
-/* ErrorCode */
-#define GLU_INVALID_ENUM                   100900
-#define GLU_INVALID_VALUE                  100901
-#define GLU_OUT_OF_MEMORY                  100902
-#define GLU_INVALID_OPERATION              100904
-
-/* NurbsDisplay */
-/*      GLU_FILL */
-#define GLU_OUTLINE_POLYGON                100240
-#define GLU_OUTLINE_PATCH                  100241
-
-/* NurbsCallback */
-#define GLU_NURBS_ERROR                    100103
-#define GLU_ERROR                          100103
-#define GLU_NURBS_BEGIN                    100164
-#define GLU_NURBS_BEGIN_EXT                100164
-#define GLU_NURBS_VERTEX                   100165
-#define GLU_NURBS_VERTEX_EXT               100165
-#define GLU_NURBS_NORMAL                   100166
-#define GLU_NURBS_NORMAL_EXT               100166
-#define GLU_NURBS_COLOR                    100167
-#define GLU_NURBS_COLOR_EXT                100167
-#define GLU_NURBS_TEXTURE_COORD            100168
-#define GLU_NURBS_TEX_COORD_EXT            100168
-#define GLU_NURBS_END                      100169
-#define GLU_NURBS_END_EXT                  100169
-#define GLU_NURBS_BEGIN_DATA               100170
-#define GLU_NURBS_BEGIN_DATA_EXT           100170
-#define GLU_NURBS_VERTEX_DATA              100171
-#define GLU_NURBS_VERTEX_DATA_EXT          100171
-#define GLU_NURBS_NORMAL_DATA              100172
-#define GLU_NURBS_NORMAL_DATA_EXT          100172
-#define GLU_NURBS_COLOR_DATA               100173
-#define GLU_NURBS_COLOR_DATA_EXT           100173
-#define GLU_NURBS_TEXTURE_COORD_DATA       100174
-#define GLU_NURBS_TEX_COORD_DATA_EXT       100174
-#define GLU_NURBS_END_DATA                 100175
-#define GLU_NURBS_END_DATA_EXT             100175
-
-/* NurbsError */
-#define GLU_NURBS_ERROR1                   100251
-#define GLU_NURBS_ERROR2                   100252
-#define GLU_NURBS_ERROR3                   100253
-#define GLU_NURBS_ERROR4                   100254
-#define GLU_NURBS_ERROR5                   100255
-#define GLU_NURBS_ERROR6                   100256
-#define GLU_NURBS_ERROR7                   100257
-#define GLU_NURBS_ERROR8                   100258
-#define GLU_NURBS_ERROR9                   100259
-#define GLU_NURBS_ERROR10                  100260
-#define GLU_NURBS_ERROR11                  100261
-#define GLU_NURBS_ERROR12                  100262
-#define GLU_NURBS_ERROR13                  100263
-#define GLU_NURBS_ERROR14                  100264
-#define GLU_NURBS_ERROR15                  100265
-#define GLU_NURBS_ERROR16                  100266
-#define GLU_NURBS_ERROR17                  100267
-#define GLU_NURBS_ERROR18                  100268
-#define GLU_NURBS_ERROR19                  100269
-#define GLU_NURBS_ERROR20                  100270
-#define GLU_NURBS_ERROR21                  100271
-#define GLU_NURBS_ERROR22                  100272
-#define GLU_NURBS_ERROR23                  100273
-#define GLU_NURBS_ERROR24                  100274
-#define GLU_NURBS_ERROR25                  100275
-#define GLU_NURBS_ERROR26                  100276
-#define GLU_NURBS_ERROR27                  100277
-#define GLU_NURBS_ERROR28                  100278
-#define GLU_NURBS_ERROR29                  100279
-#define GLU_NURBS_ERROR30                  100280
-#define GLU_NURBS_ERROR31                  100281
-#define GLU_NURBS_ERROR32                  100282
-#define GLU_NURBS_ERROR33                  100283
-#define GLU_NURBS_ERROR34                  100284
-#define GLU_NURBS_ERROR35                  100285
-#define GLU_NURBS_ERROR36                  100286
-#define GLU_NURBS_ERROR37                  100287
-
-/* NurbsProperty */
-#define GLU_AUTO_LOAD_MATRIX               100200
-#define GLU_CULLING                        100201
-#define GLU_SAMPLING_TOLERANCE             100203
-#define GLU_DISPLAY_MODE                   100204
-#define GLU_PARAMETRIC_TOLERANCE           100202
-#define GLU_SAMPLING_METHOD                100205
-#define GLU_U_STEP                         100206
-#define GLU_V_STEP                         100207
-#define GLU_NURBS_MODE                     100160
-#define GLU_NURBS_MODE_EXT                 100160
-#define GLU_NURBS_TESSELLATOR              100161
-#define GLU_NURBS_TESSELLATOR_EXT          100161
-#define GLU_NURBS_RENDERER                 100162
-#define GLU_NURBS_RENDERER_EXT             100162
-
-/* NurbsSampling */
-#define GLU_OBJECT_PARAMETRIC_ERROR        100208
-#define GLU_OBJECT_PARAMETRIC_ERROR_EXT    100208
-#define GLU_OBJECT_PATH_LENGTH             100209
-#define GLU_OBJECT_PATH_LENGTH_EXT         100209
-#define GLU_PATH_LENGTH                    100215
-#define GLU_PARAMETRIC_ERROR               100216
-#define GLU_DOMAIN_DISTANCE                100217
-
-/* NurbsTrim */
-#define GLU_MAP1_TRIM_2                    100210
-#define GLU_MAP1_TRIM_3                    100211
-
-/* QuadricDrawStyle */
-#define GLU_POINT                          100010
-#define GLU_LINE                           100011
-#define GLU_FILL                           100012
-#define GLU_SILHOUETTE                     100013
-
-/* QuadricCallback */
-/*      GLU_ERROR */
-
-/* QuadricNormal */
-#define GLU_SMOOTH                         100000
-#define GLU_FLAT                           100001
-#define GLU_NONE                           100002
-
-/* QuadricOrientation */
-#define GLU_OUTSIDE                        100020
-#define GLU_INSIDE                         100021
-
-/* TessCallback */
-#define GLU_TESS_BEGIN                     100100
-#define GLU_BEGIN                          100100
-#define GLU_TESS_VERTEX                    100101
-#define GLU_VERTEX                         100101
-#define GLU_TESS_END                       100102
-#define GLU_END                            100102
-#define GLU_TESS_ERROR                     100103
-#define GLU_TESS_EDGE_FLAG                 100104
-#define GLU_EDGE_FLAG                      100104
-#define GLU_TESS_COMBINE                   100105
-#define GLU_TESS_BEGIN_DATA                100106
-#define GLU_TESS_VERTEX_DATA               100107
-#define GLU_TESS_END_DATA                  100108
-#define GLU_TESS_ERROR_DATA                100109
-#define GLU_TESS_EDGE_FLAG_DATA            100110
-#define GLU_TESS_COMBINE_DATA              100111
-
-/* TessContour */
-#define GLU_CW                             100120
-#define GLU_CCW                            100121
-#define GLU_INTERIOR                       100122
-#define GLU_EXTERIOR                       100123
-#define GLU_UNKNOWN                        100124
-
-/* TessProperty */
-#define GLU_TESS_WINDING_RULE              100140
-#define GLU_TESS_BOUNDARY_ONLY             100141
-#define GLU_TESS_TOLERANCE                 100142
-
-/* TessError */
-#define GLU_TESS_ERROR1                    100151
-#define GLU_TESS_ERROR2                    100152
-#define GLU_TESS_ERROR3                    100153
-#define GLU_TESS_ERROR4                    100154
-#define GLU_TESS_ERROR5                    100155
-#define GLU_TESS_ERROR6                    100156
-#define GLU_TESS_ERROR7                    100157
-#define GLU_TESS_ERROR8                    100158
-#define GLU_TESS_MISSING_BEGIN_POLYGON     100151
-#define GLU_TESS_MISSING_BEGIN_CONTOUR     100152
-#define GLU_TESS_MISSING_END_POLYGON       100153
-#define GLU_TESS_MISSING_END_CONTOUR       100154
-#define GLU_TESS_COORD_TOO_LARGE           100155
-#define GLU_TESS_NEED_COMBINE_CALLBACK     100156
-
-/* TessWinding */
-#define GLU_TESS_WINDING_ODD               100130
-#define GLU_TESS_WINDING_NONZERO           100131
-#define GLU_TESS_WINDING_POSITIVE          100132
-#define GLU_TESS_WINDING_NEGATIVE          100133
-#define GLU_TESS_WINDING_ABS_GEQ_TWO       100134
-
-/*************************************************************/
-
-
-#ifdef __cplusplus
-class GLUnurbs;
-class GLUquadric;
-class GLUtesselator;
+	/* to facilitate clean DLL building ... */
+#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__))
+#	if defined(_MSC_VER) && defined(BUILD_GLU32) /* tag specify we're building mesa as a DLL */
+#		define GLUAPI __declspec(dllexport)
+#	elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#		define GLUAPI __declspec(dllimport)
+#	else /* for use with static link lib build of Win32 edition only */
+#		define GLUAPI extern
+#	endif /* _STATIC_MESA support */
 #else
-typedef struct GLUnurbs GLUnurbs;
-typedef struct GLUquadric GLUquadric;
-typedef struct GLUtesselator GLUtesselator;
+#	define GLUAPI extern
+#endif /* WIN32 / CYGWIN32 bracket */
+
+#ifdef macintosh
+	#pragma enumsalwaysint on
+	#if PRAGMA_IMPORT_SUPPORTED
+	#pragma import on
+	#endif
 #endif
 
-typedef struct GLUnurbs GLUnurbsObj;
-typedef struct GLUquadric GLUquadricObj;
-typedef struct GLUtesselator GLUtesselatorObj;
-typedef struct GLUtesselator GLUtriangulatorObj;
+#ifndef GLUAPI
+#define GLUAPI
+#endif
 
-#define GLU_TESS_MAX_COORD 1.0e150
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
 
-/* Internal convenience typedefs */
-typedef void (*_GLUfuncptr)();
+#ifndef GLCALLBACK
+#define GLCALLBACK
+#endif
+
+
+#define GLU_VERSION_1_1			1
+#define GLU_VERSION_1_2			1
+
+
+#define GLU_TRUE			1
+#define GLU_FALSE			0
+
+
+/* Normal vectors */
+#define GLU_SMOOTH			100000
+#define GLU_FLAT			100001
+#define GLU_NONE			100002
+
+/* Quadric draw styles */
+#define GLU_POINT			100010
+#define GLU_LINE			100011
+#define GLU_FILL			100012
+#define GLU_SILHOUETTE			100013
+
+/* Quadric orientation */
+#define GLU_OUTSIDE			100020
+#define GLU_INSIDE			100021
+
+/* Tessellator */
+#define GLU_TESS_BEGIN			100100
+#define GLU_TESS_VERTEX			100101
+#define GLU_TESS_END			100102
+#define GLU_TESS_ERROR			100103
+#define GLU_TESS_EDGE_FLAG		100104
+#define GLU_TESS_COMBINE		100105
+
+#define GLU_TESS_BEGIN_DATA		100106
+#define GLU_TESS_VERTEX_DATA		100107
+#define GLU_TESS_END_DATA		100108
+#define GLU_TESS_ERROR_DATA		100109
+#define GLU_TESS_EDGE_FLAG_DATA		100110
+#define GLU_TESS_COMBINE_DATA		100111
+
+/* Winding rules */
+#define GLU_TESS_WINDING_ODD		100130
+#define GLU_TESS_WINDING_NONZERO	100131
+#define GLU_TESS_WINDING_POSITIVE	100132
+#define GLU_TESS_WINDING_NEGATIVE	100133
+#define GLU_TESS_WINDING_ABS_GEQ_TWO	100134
+
+/* Tessellation properties */
+#define GLU_TESS_WINDING_RULE		100140
+#define GLU_TESS_BOUNDARY_ONLY		100141
+#define GLU_TESS_TOLERANCE		100142
+
+/* Tessellation errors */
+#define GLU_TESS_ERROR1			100151  /* Missing gluBeginPolygon */
+#define GLU_TESS_ERROR2			100152  /* Missing gluBeginContour */
+#define GLU_TESS_ERROR3			100153  /* Missing gluEndPolygon */
+#define GLU_TESS_ERROR4			100154  /* Missing gluEndContour */
+#define GLU_TESS_ERROR5			100155  /* */
+#define GLU_TESS_ERROR6			100156  /* */
+#define GLU_TESS_ERROR7			100157  /* */
+#define GLU_TESS_ERROR8			100158  /* */
+
+/* NURBS */
+#define GLU_AUTO_LOAD_MATRIX		100200
+#define GLU_CULLING			100201
+#define GLU_PARAMETRIC_TOLERANCE	100202
+#define GLU_SAMPLING_TOLERANCE		100203
+#define GLU_DISPLAY_MODE		100204
+#define GLU_SAMPLING_METHOD		100205
+#define GLU_U_STEP			100206
+#define GLU_V_STEP			100207
+
+#define GLU_PATH_LENGTH			100215
+#define GLU_PARAMETRIC_ERROR		100216
+#define GLU_DOMAIN_DISTANCE		100217
+
+#define GLU_MAP1_TRIM_2			100210
+#define GLU_MAP1_TRIM_3			100211
+
+#define GLU_OUTLINE_POLYGON		100240
+#define GLU_OUTLINE_PATCH		100241
+
+#define GLU_NURBS_ERROR1	100251   /* spline order un-supported */
+#define GLU_NURBS_ERROR2	100252   /* too few knots */
+#define GLU_NURBS_ERROR3	100253   /* valid knot range is empty */
+#define GLU_NURBS_ERROR4	100254   /* decreasing knot sequence */
+#define GLU_NURBS_ERROR5	100255   /* knot multiplicity > spline order */
+#define GLU_NURBS_ERROR6	100256   /* endcurve() must follow bgncurve() */
+#define GLU_NURBS_ERROR7	100257   /* bgncurve() must precede endcurve() */
+#define GLU_NURBS_ERROR8	100258   /* ctrlarray or knot vector is NULL */
+#define GLU_NURBS_ERROR9 	100259   /* can't draw pwlcurves */
+#define GLU_NURBS_ERROR10	100260   /* missing gluNurbsCurve() */
+#define GLU_NURBS_ERROR11	100261   /* missing gluNurbsSurface() */
+#define GLU_NURBS_ERROR12	100262   /* endtrim() must precede endsurface() */
+#define GLU_NURBS_ERROR13	100263   /* bgnsurface() must precede endsurface() */
+#define GLU_NURBS_ERROR14	100264   /* curve of improper type passed as trim curve */
+#define GLU_NURBS_ERROR15	100265   /* bgnsurface() must precede bgntrim() */
+#define GLU_NURBS_ERROR16	100266   /* endtrim() must follow bgntrim() */
+#define GLU_NURBS_ERROR17	100267   /* bgntrim() must precede endtrim()*/
+#define GLU_NURBS_ERROR18	100268   /* invalid or missing trim curve*/
+#define GLU_NURBS_ERROR19	100269   /* bgntrim() must precede pwlcurve() */
+#define GLU_NURBS_ERROR20	100270   /* pwlcurve referenced twice*/
+#define GLU_NURBS_ERROR21	100271   /* pwlcurve and nurbscurve mixed */
+#define GLU_NURBS_ERROR22	100272   /* improper usage of trim data type */
+#define GLU_NURBS_ERROR23	100273   /* nurbscurve referenced twice */
+#define GLU_NURBS_ERROR24	100274   /* nurbscurve and pwlcurve mixed */
+#define GLU_NURBS_ERROR25	100275   /* nurbssurface referenced twice */
+#define GLU_NURBS_ERROR26	100276   /* invalid property */
+#define GLU_NURBS_ERROR27	100277   /* endsurface() must follow bgnsurface() */
+#define GLU_NURBS_ERROR28	100278   /* intersecting or misoriented trim curves */
+#define GLU_NURBS_ERROR29	100279   /* intersecting trim curves */
+#define GLU_NURBS_ERROR30	100280   /* UNUSED */
+#define GLU_NURBS_ERROR31	100281   /* unconnected trim curves */
+#define GLU_NURBS_ERROR32	100282   /* unknown knot error */
+#define GLU_NURBS_ERROR33	100283   /* negative vertex count encountered */
+#define GLU_NURBS_ERROR34	100284   /* negative byte-stride */
+#define GLU_NURBS_ERROR35	100285   /* unknown type descriptor */
+#define GLU_NURBS_ERROR36	100286   /* null control point reference */
+#define GLU_NURBS_ERROR37	100287   /* duplicate point on pwlcurve */
+
+/* Errors */
+#define GLU_INVALID_ENUM		100900
+#define GLU_INVALID_VALUE		100901
+#define GLU_OUT_OF_MEMORY		100902
+#define GLU_INCOMPATIBLE_GL_VERSION	100903
+
+/* New in GLU 1.1 */
+#define GLU_VERSION			100800
+#define GLU_EXTENSIONS			100801
+
+/*** GLU 1.0 tessellation - obsolete! ***/
+
+/* Contour types */
+#define GLU_CW				100120
+#define GLU_CCW				100121
+#define GLU_INTERIOR			100122
+#define GLU_EXTERIOR			100123
+#define GLU_UNKNOWN			100124
+
+/* Tessellator */
+#define GLU_BEGIN			GLU_TESS_BEGIN
+#define GLU_VERTEX			GLU_TESS_VERTEX
+#define GLU_END				GLU_TESS_END
+#define GLU_ERROR			GLU_TESS_ERROR
+#define GLU_EDGE_FLAG			GLU_TESS_EDGE_FLAG
+
+
+/*
+ * These are the GLU 1.1 typedefs.  GLU 1.3 has different ones!
+ */
+#if defined(__BEOS__)
+    /* The BeOS does something funky and makes these typedefs in one
+     * of its system headers.
+     */
+#else
+    typedef struct GLUquadric GLUquadricObj;
+    typedef struct GLUnurbs GLUnurbsObj;
+
+    /* FIXME: We need to implement the other 1.3 typedefs - GH */
+    typedef struct GLUtesselator GLUtesselator;
+    typedef GLUtesselator GLUtriangulatorObj;
+#endif
+
+
+
+#if defined(__BEOS__) || defined(__QUICKDRAW__)
+#pragma export on
+#endif
+
+
+/*
+ *
+ * Miscellaneous functions
+ *
+ */
+
+GLUAPI void GLAPIENTRY gluLookAt( GLdouble eyex, GLdouble eyey, GLdouble eyez,
+                                  GLdouble centerx, GLdouble centery,
+                                  GLdouble centerz,
+                                  GLdouble upx, GLdouble upy, GLdouble upz );
+
+
+GLUAPI void GLAPIENTRY gluOrtho2D( GLdouble left, GLdouble right,
+                                   GLdouble bottom, GLdouble top );
+
+
+GLUAPI void GLAPIENTRY gluPerspective( GLdouble fovy, GLdouble aspect,
+                                       GLdouble zNear, GLdouble zFar );
+
+
+GLUAPI void GLAPIENTRY gluPickMatrix( GLdouble x, GLdouble y,
+                                      GLdouble width, GLdouble height,
+                                      const GLint viewport[4] );
+
+GLUAPI GLint GLAPIENTRY gluProject( GLdouble objx, GLdouble objy, GLdouble objz,
+                                    const GLdouble modelMatrix[16],
+                                    const GLdouble projMatrix[16],
+                                    const GLint viewport[4],
+                                    GLdouble *winx, GLdouble *winy,
+                                    GLdouble *winz );
+
+GLUAPI GLint GLAPIENTRY gluUnProject( GLdouble winx, GLdouble winy,
+                                      GLdouble winz,
+                                      const GLdouble modelMatrix[16],
+                                      const GLdouble projMatrix[16],
+                                      const GLint viewport[4],
+                                      GLdouble *objx, GLdouble *objy,
+                                      GLdouble *objz );
+
+GLUAPI const GLubyte* GLAPIENTRY gluErrorString( GLenum errorCode );
+
+
+
+/*
+ *
+ * Mipmapping and image scaling
+ *
+ */
+
+GLUAPI GLint GLAPIENTRY gluScaleImage( GLenum format,
+                                       GLint widthin, GLint heightin,
+                                       GLenum typein, const void *datain,
+                                       GLint widthout, GLint heightout,
+                                       GLenum typeout, void *dataout );
+
+GLUAPI GLint GLAPIENTRY gluBuild1DMipmaps( GLenum target, GLint components,
+                                           GLint width, GLenum format,
+                                           GLenum type, const void *data );
+
+GLUAPI GLint GLAPIENTRY gluBuild2DMipmaps( GLenum target, GLint components,
+                                           GLint width, GLint height,
+                                           GLenum format,
+                                           GLenum type, const void *data );
+
+
+
+/*
+ *
+ * Quadrics
+ *
+ */
+
+GLUAPI GLUquadricObj* GLAPIENTRY gluNewQuadric( void );
+
+GLUAPI void GLAPIENTRY gluDeleteQuadric( GLUquadricObj *state );
+
+GLUAPI void GLAPIENTRY gluQuadricDrawStyle( GLUquadricObj *quadObject,
+                                            GLenum drawStyle );
+
+GLUAPI void GLAPIENTRY gluQuadricOrientation( GLUquadricObj *quadObject,
+                                              GLenum orientation );
+
+GLUAPI void GLAPIENTRY gluQuadricNormals( GLUquadricObj *quadObject,
+                                          GLenum normals );
+
+GLUAPI void GLAPIENTRY gluQuadricTexture( GLUquadricObj *quadObject,
+                                          GLboolean textureCoords );
+
+GLUAPI void GLAPIENTRY gluQuadricCallback( GLUquadricObj *qobj,
+                                           GLenum which,
+                                           void (GLCALLBACK *fn)() );
+
+GLUAPI void GLAPIENTRY gluCylinder( GLUquadricObj *qobj,
+                                    GLdouble baseRadius,
+                                    GLdouble topRadius,
+                                    GLdouble height,
+                                    GLint slices, GLint stacks );
+
+GLUAPI void GLAPIENTRY gluSphere( GLUquadricObj *qobj,
+                                  GLdouble radius, GLint slices,
+                                  GLint stacks );
+
+GLUAPI void GLAPIENTRY gluDisk( GLUquadricObj *qobj,
+                                GLdouble innerRadius, GLdouble outerRadius,
+                                GLint slices, GLint loops );
+
+GLUAPI void GLAPIENTRY gluPartialDisk( GLUquadricObj *qobj, GLdouble innerRadius,
+                                       GLdouble outerRadius, GLint slices,
+                                       GLint loops, GLdouble startAngle,
+                                       GLdouble sweepAngle );
+
+
+
+/*
+ *
+ * Nurbs
+ *
+ */
+
+GLUAPI GLUnurbsObj* GLAPIENTRY gluNewNurbsRenderer( void );
+
+GLUAPI void GLAPIENTRY gluDeleteNurbsRenderer( GLUnurbsObj *nobj );
+
+GLUAPI void GLAPIENTRY gluLoadSamplingMatrices( GLUnurbsObj *nobj,
+                                                const GLfloat modelMatrix[16],
+                                                const GLfloat projMatrix[16],
+                                                const GLint viewport[4] );
+
+GLUAPI void GLAPIENTRY gluNurbsProperty( GLUnurbsObj *nobj, GLenum property,
+                                         GLfloat value );
+
+GLUAPI void GLAPIENTRY gluGetNurbsProperty( GLUnurbsObj *nobj, GLenum property,
+                                            GLfloat *value );
+
+GLUAPI void GLAPIENTRY gluBeginCurve( GLUnurbsObj *nobj );
+
+GLUAPI void GLAPIENTRY gluEndCurve( GLUnurbsObj * nobj );
+
+GLUAPI void GLAPIENTRY gluNurbsCurve( GLUnurbsObj *nobj, GLint nknots,
+                                      GLfloat *knot, GLint stride,
+                                      GLfloat *ctlarray, GLint order,
+                                      GLenum type );
+
+GLUAPI void GLAPIENTRY gluBeginSurface( GLUnurbsObj *nobj );
+
+GLUAPI void GLAPIENTRY gluEndSurface( GLUnurbsObj * nobj );
+
+GLUAPI void GLAPIENTRY gluNurbsSurface( GLUnurbsObj *nobj,
+                                        GLint sknot_count, GLfloat *sknot,
+                                        GLint tknot_count, GLfloat *tknot,
+                                        GLint s_stride, GLint t_stride,
+                                        GLfloat *ctlarray,
+                                        GLint sorder, GLint torder,
+                                        GLenum type );
+
+GLUAPI void GLAPIENTRY gluBeginTrim( GLUnurbsObj *nobj );
+
+GLUAPI void GLAPIENTRY gluEndTrim( GLUnurbsObj *nobj );
+
+GLUAPI void GLAPIENTRY gluPwlCurve( GLUnurbsObj *nobj, GLint count,
+                                    GLfloat *array, GLint stride,
+                                    GLenum type );
+
+GLUAPI void GLAPIENTRY gluNurbsCallback( GLUnurbsObj *nobj, GLenum which,
+                                         void (GLCALLBACK *fn)() );
+
+
+
+/*
+ *
+ * Polygon tessellation
+ *
+ */
+
+GLUAPI GLUtesselator* GLAPIENTRY gluNewTess( void );
+
+GLUAPI void GLAPIENTRY gluDeleteTess( GLUtesselator *tobj );
+
+GLUAPI void GLAPIENTRY gluTessBeginPolygon( GLUtesselator *tobj,
+					    void *polygon_data );
+
+GLUAPI void GLAPIENTRY gluTessBeginContour( GLUtesselator *tobj );
+
+GLUAPI void GLAPIENTRY gluTessVertex( GLUtesselator *tobj, GLdouble coords[3],
+				      void *vertex_data );
+
+GLUAPI void GLAPIENTRY gluTessEndContour( GLUtesselator *tobj );
+
+GLUAPI void GLAPIENTRY gluTessEndPolygon( GLUtesselator *tobj );
+
+GLUAPI void GLAPIENTRY gluTessProperty( GLUtesselator *tobj, GLenum which,
+					GLdouble value );
+
+GLUAPI void GLAPIENTRY gluTessNormal( GLUtesselator *tobj, GLdouble x,
+				      GLdouble y, GLdouble z );
+
+GLUAPI void GLAPIENTRY gluTessCallback( GLUtesselator *tobj, GLenum which,
+					void (GLCALLBACK *fn)() );
+
+GLUAPI void GLAPIENTRY gluGetTessProperty( GLUtesselator *tobj, GLenum which,
+					   GLdouble *value );
+
+/*
+ *
+ * Obsolete 1.0 tessellation functions
+ *
+ */
+
+GLUAPI void GLAPIENTRY gluBeginPolygon( GLUtesselator *tobj );
+
+GLUAPI void GLAPIENTRY gluNextContour( GLUtesselator *tobj, GLenum type );
+
+GLUAPI void GLAPIENTRY gluEndPolygon( GLUtesselator *tobj );
+
+
+
+/*
+ *
+ * New functions in GLU 1.1
+ *
+ */
+
+GLUAPI const GLubyte* GLAPIENTRY gluGetString( GLenum name );
+
+
+
+#if defined(__BEOS__) || defined(__QUICKDRAW__)
+#pragma export off
+#endif
+
+
+#ifdef macintosh
+	#pragma enumsalwaysint reset
+	#if PRAGMA_IMPORT_SUPPORTED
+	#pragma import off
+	#endif
+#endif
 
-extern void gluBeginCurve (GLUnurbs* nurb);
-extern void gluBeginPolygon (GLUtesselator* tess);
-extern void gluBeginSurface (GLUnurbs* nurb);
-extern void gluBeginTrim (GLUnurbs* nurb);
-extern GLint gluBuild1DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
-extern GLint gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data);
-extern GLint gluBuild2DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
-extern GLint gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data);
-extern GLint gluBuild3DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
-extern GLint gluBuild3DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
-extern GLboolean gluCheckExtension (const GLubyte *extName, const GLubyte *extString);
-extern void gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks);
-extern void gluDeleteNurbsRenderer (GLUnurbs* nurb);
-extern void gluDeleteQuadric (GLUquadric* quad);
-extern void gluDeleteTess (GLUtesselator* tess);
-extern void gluDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops);
-extern void gluEndCurve (GLUnurbs* nurb);
-extern void gluEndPolygon (GLUtesselator* tess);
-extern void gluEndSurface (GLUnurbs* nurb);
-extern void gluEndTrim (GLUnurbs* nurb);
-extern const GLubyte * gluErrorString (GLenum error);
-extern void gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data);
-extern const GLubyte * gluGetString (GLenum name);
-extern void gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data);
-extern void gluLoadSamplingMatrices (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view);
-extern void gluLookAt (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ);
-extern GLUnurbs* gluNewNurbsRenderer (void);
-extern GLUquadric* gluNewQuadric (void);
-extern GLUtesselator* gluNewTess (void);
-extern void gluNextContour (GLUtesselator* tess, GLenum type);
-extern void gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc);
-extern void gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData);
-extern void gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData);
-extern void gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type);
-extern void gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value);
-extern void gluNurbsSurface (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type);
-extern void gluOrtho2D (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top);
-extern void gluPartialDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep);
-extern void gluPerspective (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar);
-extern void gluPickMatrix (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport);
-extern GLint gluProject (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ);
-extern void gluPwlCurve (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type);
-extern void gluQuadricCallback (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc);
-extern void gluQuadricDrawStyle (GLUquadric* quad, GLenum draw);
-extern void gluQuadricNormals (GLUquadric* quad, GLenum normal);
-extern void gluQuadricOrientation (GLUquadric* quad, GLenum orientation);
-extern void gluQuadricTexture (GLUquadric* quad, GLboolean texture);
-extern GLint gluScaleImage (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut);
-extern void gluSphere (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks);
-extern void gluTessBeginContour (GLUtesselator* tess);
-extern void gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data);
-extern void gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
-extern void gluTessEndContour (GLUtesselator* tess);
-extern void gluTessEndPolygon (GLUtesselator* tess);
-extern void gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);
-extern void gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data);
-extern void gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data);
-extern GLint gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ);
-extern GLint gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble near, GLdouble far, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __glu_h__ */
+
+#endif

include/GL/glut.h

@@ -199,7 +199,7 @@ WGLAPI int   GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);
 #  define GLUTCALLBACK
 #  define GLUTAPI extern
 /* Prototype exit for the non-Win32 case (see above). */
-/*extern void exit(int);  this screws up gcc -ansi -pedantic! */
+extern void exit(int);
 #endif
 
 

include/GL/glx.h

@@ -1,8 +1,8 @@
-/* $Id: glx.h,v 1.27 2001/05/24 19:07:14 brianp Exp $ */
+/* $Id: glx.h,v 1.5.2.3 2000/02/23 23:05:07 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  3.2
  * 
  * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
@@ -25,30 +25,21 @@
  */
 
 
+
 #ifndef GLX_H
 #define GLX_H
 
 
-#ifdef __VMS
-#include <GL/vms_x_fix.h>
-# ifdef __cplusplus
-/* VMS Xlib.h gives problems with C++.
- * this avoids a bunch of trivial warnings */
-#pragma message disable nosimpint
-#endif
-#endif
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#ifdef __VMS
-# ifdef __cplusplus
-#pragma message enable nosimpint
+#include "GL/gl.h"
+#ifdef MESA
+#include "GL/xmesa.h"
 #endif
-#endif
-#include <GL/gl.h>
 
 
 #if defined(USE_MGL_NAMESPACE)
-#include <GL/glx_mangle.h>
+#include "glx_mangle.h"
 #endif
 
 
@@ -58,33 +49,39 @@ extern "C" {
 
 
 #define GLX_VERSION_1_1		1
-#define GLX_VERSION_1_2		1
-#define GLX_VERSION_1_3		1
-
-#define GLX_EXTENSION_NAME   "GLX"
-
 
 
 /*
  * Tokens for glXChooseVisual and glXGetConfig:
  */
-#define GLX_USE_GL		1
-#define GLX_BUFFER_SIZE		2
-#define GLX_LEVEL		3
-#define GLX_RGBA		4
-#define GLX_DOUBLEBUFFER	5
-#define GLX_STEREO		6
-#define GLX_AUX_BUFFERS		7
-#define GLX_RED_SIZE		8
-#define GLX_GREEN_SIZE		9
-#define GLX_BLUE_SIZE		10
-#define GLX_ALPHA_SIZE		11
-#define GLX_DEPTH_SIZE		12
-#define GLX_STENCIL_SIZE	13
-#define GLX_ACCUM_RED_SIZE	14
-#define GLX_ACCUM_GREEN_SIZE	15
-#define GLX_ACCUM_BLUE_SIZE	16
-#define GLX_ACCUM_ALPHA_SIZE	17
+enum _GLX_CONFIGS {
+	GLX_USE_GL		= 1,
+	GLX_BUFFER_SIZE		= 2,
+	GLX_LEVEL		= 3,
+	GLX_RGBA		= 4,
+	GLX_DOUBLEBUFFER	= 5, 
+	GLX_STEREO		= 6,
+	GLX_AUX_BUFFERS		= 7,
+	GLX_RED_SIZE		= 8,
+	GLX_GREEN_SIZE		= 9,
+	GLX_BLUE_SIZE		= 10,
+	GLX_ALPHA_SIZE		= 11,
+	GLX_DEPTH_SIZE		= 12,
+	GLX_STENCIL_SIZE	= 13,
+	GLX_ACCUM_RED_SIZE	= 14,
+	GLX_ACCUM_GREEN_SIZE	= 15,
+	GLX_ACCUM_BLUE_SIZE	= 16,
+	GLX_ACCUM_ALPHA_SIZE	= 17,
+
+	/* GLX_EXT_visual_info extension */
+	GLX_X_VISUAL_TYPE_EXT		= 0x22,
+	GLX_TRANSPARENT_TYPE_EXT	= 0x23,
+	GLX_TRANSPARENT_INDEX_VALUE_EXT	= 0x24,
+	GLX_TRANSPARENT_RED_VALUE_EXT	= 0x25,
+	GLX_TRANSPARENT_GREEN_VALUE_EXT	= 0x26,
+	GLX_TRANSPARENT_BLUE_VALUE_EXT	= 0x27,
+	GLX_TRANSPARENT_ALPHA_VALUE_EXT	= 0x28
+};
 
 
 /*
@@ -108,70 +105,42 @@ extern "C" {
 
 
 /*
- * GLX 1.3 and later:
+ * GLX_visual_info extension
  */
-#define GLX_CONFIG_CAVEAT		0x20
-#define GLX_DONT_CARE			0xFFFFFFFF
-#define GLX_SLOW_CONFIG			0x8001
-#define GLX_NON_CONFORMANT_CONFIG	0x800D
-#define GLX_X_VISUAL_TYPE		0x22
-#define GLX_TRANSPARENT_TYPE		0x23
-#define GLX_TRANSPARENT_INDEX_VALUE	0x24
-#define GLX_TRANSPARENT_RED_VALUE	0x25
-#define GLX_TRANSPARENT_GREEN_VALUE	0x26
-#define GLX_TRANSPARENT_BLUE_VALUE	0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE	0x28
-#define GLX_MAX_PBUFFER_WIDTH		0x8016
-#define GLX_MAX_PBUFFER_HEIGHT		0x8017
-#define GLX_MAX_PBUFFER_PIXELS		0x8018
-#define GLX_PRESERVED_CONTENTS		0x801B
-#define GLX_LARGEST_BUFFER		0x801C
-#define GLX_DRAWABLE_TYPE		0x8010
-#define GLX_FBCONFIG_ID			0x8013
-#define GLX_VISUAL_ID			0x800B
-#define GLX_WINDOW_BIT			0x00000001
-#define GLX_PIXMAP_BIT			0x00000002
-#define GLX_PBUFFER_BIT			0x00000004
-#define GLX_AUX_BUFFERS_BIT		0x00000010
-#define GLX_FRONT_LEFT_BUFFER_BIT	0x00000001
-#define GLX_FRONT_RIGHT_BUFFER_BIT	0x00000002
-#define GLX_BACK_LEFT_BUFFER_BIT	0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT	0x00000008
-#define GLX_AUX_BUFFERS_BIT		0x00000010
-#define GLX_DEPTH_BUFFER_BIT		0x00000020
-#define GLX_STENCIL_BUFFER_BIT		0x00000040
-#define GLX_ACCUM_BUFFER_BIT		0x00000080
-#define GLX_DRAWABLE_TYPE		0x8010
-#define GLX_RENDER_TYPE			0x8011
-#define GLX_X_RENDERABLE		0x8012
-#define GLX_NONE			0x8000
-#define GLX_TRUE_COLOR			0x8002
-#define GLX_DIRECT_COLOR		0x8003
-#define GLX_PSEUDO_COLOR		0x8004
-#define GLX_STATIC_COLOR		0x8005
-#define GLX_GRAY_SCALE			0x8006
-#define GLX_STATIC_GRAY			0x8007
-#define GLX_TRANSPARENT_INDEX		0x8009
-#define GLX_COLOR_INDEX_TYPE		0x8015
-#define GLX_COLOR_INDEX_BIT		0x00000002
-#define GLX_SCREEN			0x800C
-#define GLX_PBUFFER_CLOBBER_MASK	0x08000000
-#define GLX_DAMAGED			0x8020
-#define GLX_SAVED			0x8021
-#define GLX_WINDOW			0x8022
-#define GLX_PBUFFER			0x8023
+#define GLX_TRUE_COLOR_EXT		0x8002
+#define GLX_DIRECT_COLOR_EXT		0x8003
+#define GLX_PSEUDO_COLOR_EXT		0x8004
+#define GLX_STATIC_COLOR_EXT		0x8005
+#define GLX_GRAY_SCALE_EXT		0x8006
+#define GLX_STATIC_GRAY_EXT		0x8007
+#define GLX_NONE_EXT			0x8000
+#define GLX_TRANSPARENT_RGB_EXT		0x8008
+#define GLX_TRANSPARENT_INDEX_EXT	0x8009
+
+
+/*
+ * Compile-time extension tests
+ */
+#define GLX_EXT_visual_info		1
+#define GLX_MESA_pixmap_colormap	1
+#define GLX_MESA_release_buffers	1
+#define GLX_MESA_copy_sub_buffer	1
+#define GLX_MESA_set_3dfx_mode		1
+#define GLX_SGI_video_sync		1
+#define GLX_ARB_get_proc_address	1
 
 
 
-typedef struct __GLXcontextRec *GLXContext;
-typedef XID GLXPixmap;
-typedef XID GLXDrawable;
-/* GLX 1.3 and later */
-typedef struct __GLXFBConfigRec *GLXFBConfig;
-typedef XID GLXFBConfigID;
+#ifdef MESA
+   typedef XMesaContext GLXContext;
+   typedef Pixmap GLXPixmap;
+   typedef Drawable GLXDrawable;
+#else
+   typedef void * GLXContext;
+   typedef XID GLXPixmap;
+   typedef XID GLXDrawable;
+#endif
 typedef XID GLXContextID;
-typedef XID GLXWindow;
-typedef XID GLXPbuffer;
 
 
 
@@ -225,215 +194,34 @@ extern const char *glXQueryServerString( Display *dpy, int screen, int name );
 extern const char *glXGetClientString( Display *dpy, int name );
 
 
-/* GLX 1.2 and later */
-extern Display *glXGetCurrentDisplay( void );
-
-
-/* GLX 1.3 and later */
-extern GLXFBConfig *glXChooseFBConfig( Display *dpy, int screen,
-                                       const int *attribList, int *nitems );
-
-extern int glXGetFBConfigAttrib( Display *dpy, GLXFBConfig config,
-                                 int attribute, int *value );
-
-extern GLXFBConfig *glXGetFBConfigs( Display *dpy, int screen,
-                                     int *nelements );
-
-extern XVisualInfo *glXGetVisualFromFBConfig( Display *dpy,
-                                              GLXFBConfig config );
-
-extern GLXWindow glXCreateWindow( Display *dpy, GLXFBConfig config,
-                                  Window win, const int *attribList );
-
-extern void glXDestroyWindow( Display *dpy, GLXWindow window );
-
-extern GLXPixmap glXCreatePixmap( Display *dpy, GLXFBConfig config,
-                                  Pixmap pixmap, const int *attribList );
-
-extern void glXDestroyPixmap( Display *dpy, GLXPixmap pixmap );
-
-extern GLXPbuffer glXCreatePbuffer( Display *dpy, GLXFBConfig config,
-                                    const int *attribList );
-
-extern void glXDestroyPbuffer( Display *dpy, GLXPbuffer pbuf );
-
-extern void glXQueryDrawable( Display *dpy, GLXDrawable draw, int attribute,
-                              unsigned int *value );
-
-extern GLXContext glXCreateNewContext( Display *dpy, GLXFBConfig config,
-                                       int renderType, GLXContext shareList,
-                                       Bool direct );
-
-extern Bool glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
-                                   GLXDrawable read, GLXContext ctx );
-
-extern GLXDrawable glXGetCurrentReadDrawable( void );
-
-extern int glXQueryContext( Display *dpy, GLXContext ctx, int attribute,
-                            int *value );
-
-extern void glXSelectEvent( Display *dpy, GLXDrawable drawable,
-                            unsigned long mask );
-
-extern void glXGetSelectedEvent( Display *dpy, GLXDrawable drawable,
-                                 unsigned long *mask );
-
-
-
-#ifndef GLX_GLXEXT_LEGACY
-
-#include <GL/glxext.h>
-
-#else
-
-
-/*
- * 28. GLX_EXT_visual_info extension
- */
-#ifndef GLX_EXT_visual_info
-#define GLX_EXT_visual_info		1
-
-#define GLX_X_VISUAL_TYPE_EXT		0x22
-#define GLX_TRANSPARENT_TYPE_EXT	0x23
-#define GLX_TRANSPARENT_INDEX_VALUE_EXT	0x24
-#define GLX_TRANSPARENT_RED_VALUE_EXT	0x25
-#define GLX_TRANSPARENT_GREEN_VALUE_EXT	0x26
-#define GLX_TRANSPARENT_BLUE_VALUE_EXT	0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE_EXT	0x28
-#define GLX_TRUE_COLOR_EXT		0x8002
-#define GLX_DIRECT_COLOR_EXT		0x8003
-#define GLX_PSEUDO_COLOR_EXT		0x8004
-#define GLX_STATIC_COLOR_EXT		0x8005
-#define GLX_GRAY_SCALE_EXT		0x8006
-#define GLX_STATIC_GRAY_EXT		0x8007
-#define GLX_NONE_EXT			0x8000
-#define GLX_TRANSPARENT_RGB_EXT		0x8008
-#define GLX_TRANSPARENT_INDEX_EXT	0x8009
-
-#endif /* 28. GLX_EXT_visual_info extension */
-
-
-
-/*
- * 41. GLX_SGI_video_sync
- */
-#ifndef GLX_SGI_video_sync
-#define GLX_SGI_video_sync 1
-
-extern int glXGetVideoSyncSGI(unsigned int *count);
-extern int glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count);
-
-#endif /* GLX_SGI_video_sync */
-
-
-
-/*
- * 42. GLX_EXT_visual_rating
- */
-#ifndef GLX_EXT_visual_rating
-#define GLX_EXT_visual_rating		1
-
-#define GLX_VISUAL_CAVEAT_EXT		0x20
-/*#define GLX_NONE_EXT			0x8000*/
-#define GLX_SLOW_VISUAL_EXT		0x8001
-#define GLX_NON_CONFORMANT_VISUAL_EXT	0x800D
-
-#endif /* GLX_EXT_visual_rating	*/
-
-
-
-/*
- * 47. GLX_EXT_import_context
- */
-#ifndef GLX_EXT_import_context
-#define GLX_EXT_import_context 1
-
-#define GLX_SHARE_CONTEXT_EXT		0x800A
-#define GLX_VISUAL_ID_EXT		0x800B
-#define GLX_SCREEN_EXT			0x800C
-
-extern void glXFreeContextEXT(Display *dpy, GLXContext context);
-
-extern GLXContextID glXGetContextIDEXT(const GLXContext context);
-
-extern Display *glXGetCurrentDisplayEXT(void);
-
-extern GLXContext glXImportContextEXT(Display *dpy, GLXContextID contextID);
-
-extern int glXQueryContextInfoEXT(Display *dpy, GLXContext context,
-                                  int attribute,int *value);
-
-#endif /* GLX_EXT_import_context */
-
-
-
-/*
- * 215. GLX_MESA_copy_sub_buffer
- */
-#ifndef GLX_MESA_copy_sub_buffer
-#define GLX_MESA_copy_sub_buffer 1
-
-extern void glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable,
-                                  int x, int y, int width, int height );
-
-#endif
-
-
-
-/*
- * 216. GLX_MESA_pixmap_colormap
- */
-#ifndef GLX_MESA_pixmap_colormap
-#define GLX_MESA_pixmap_colormap 1
 
+/* GLX_MESA_pixmap_colormap */
 extern GLXPixmap glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visual,
                                          Pixmap pixmap, Colormap cmap );
 
-#endif /* GLX_MESA_pixmap_colormap */
-
-
-
-/*
- * 217. GLX_MESA_release_buffers
- */
-#ifndef GLX_MESA_release_buffers
-#define GLX_MESA_release_buffers 1
 
+/* GLX_MESA_release_buffers */
 extern Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d );
 
-#endif /* GLX_MESA_release_buffers */
+
+/* GLX_MESA_copy_sub_buffer */
+extern void glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable,
+                                  int x, int y, int width, int height );
 
 
-
-/*
- * 218. GLX_MESA_set_3dfx_mode
- */
-#ifndef GLX_MESA_set_3dfx_mode
-#define GLX_MESA_set_3dfx_mode 1
-
-#define GLX_3DFX_WINDOW_MODE_MESA       0x1
-#define GLX_3DFX_FULLSCREEN_MODE_MESA   0x2
-
-extern Bool glXSet3DfxModeMESA( int mode );
-
-#endif /* GLX_MESA_set_3dfx_mode */
+/* GLX_MESA_set_3dfx_mode */
+extern GLboolean glXSet3DfxModeMESA( GLint mode );
 
 
+/* GLX_SGI_video_sync */
+extern int glXGetVideoSyncSGI(unsigned int *count);
+extern int glXWaitVideoSyncSGI(int divisor, int remainder,
+                               unsigned int *count);
 
-/*
- * ARB 2. GLX_ARB_get_proc_address
- */
-#ifndef GLX_ARB_get_proc_address
-#define GLX_ARB_get_proc_address 1
 
+/* GLX_ARB_get_proc_address */
 extern void (*glXGetProcAddressARB(const GLubyte *procName))();
 
-#endif /* GLX_ARB_get_proc_address */
-
-
-
-#endif /* GLX_GLXEXT_LEGACY */
-
 
 
 #ifdef __cplusplus

include/GL/glxext.h

@@ -1,534 +0,0 @@
-#ifndef __glxext_h_
-#define __glxext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** 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.1 (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-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: 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 defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-#define GLX_GLXEXT_VERSION 2
-
-#ifndef GLX_VERSION_1_3
-#define GLX_WINDOW_BIT                     0x00000001
-#define GLX_PIXMAP_BIT                     0x00000002
-#define GLX_PBUFFER_BIT                    0x00000004
-#define GLX_RGBA_BIT                       0x00000001
-#define GLX_COLOR_INDEX_BIT                0x00000002
-#define GLX_PBUFFER_CLOBBER_MASK           0x08000000
-#define GLX_FRONT_LEFT_BUFFER_BIT          0x00000001
-#define GLX_FRONT_RIGHT_BUFFER_BIT         0x00000002
-#define GLX_BACK_LEFT_BUFFER_BIT           0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT          0x00000008
-#define GLX_AUX_BUFFERS_BIT                0x00000010
-#define GLX_DEPTH_BUFFER_BIT               0x00000020
-#define GLX_STENCIL_BUFFER_BIT             0x00000040
-#define GLX_ACCUM_BUFFER_BIT               0x00000080
-#define GLX_CONFIG_CAVEAT                  0x20
-#define GLX_X_VISUAL_TYPE                  0x22
-#define GLX_TRANSPARENT_TYPE               0x23
-#define GLX_TRANSPARENT_INDEX_VALUE        0x24
-#define GLX_TRANSPARENT_RED_VALUE          0x25
-#define GLX_TRANSPARENT_GREEN_VALUE        0x26
-#define GLX_TRANSPARENT_BLUE_VALUE         0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE        0x28
-#define GLX_DONT_CARE                      0xFFFFFFFF
-#define GLX_NONE                           0x8000
-#define GLX_SLOW_CONFIG                    0x8001
-#define GLX_TRUE_COLOR                     0x8002
-#define GLX_DIRECT_COLOR                   0x8003
-#define GLX_PSEUDO_COLOR                   0x8004
-#define GLX_STATIC_COLOR                   0x8005
-#define GLX_GRAY_SCALE                     0x8006
-#define GLX_STATIC_GRAY                    0x8007
-#define GLX_TRANSPARENT_RGB                0x8008
-#define GLX_TRANSPARENT_INDEX              0x8009
-#define GLX_VISUAL_ID                      0x800B
-#define GLX_SCREEN                         0x800C
-#define GLX_NON_CONFORMANT_CONFIG          0x800D
-#define GLX_DRAWABLE_TYPE                  0x8010
-#define GLX_RENDER_TYPE                    0x8011
-#define GLX_X_RENDERABLE                   0x8012
-#define GLX_FBCONFIG_ID                    0x8013
-#define GLX_RGBA_TYPE                      0x8014
-#define GLX_COLOR_INDEX_TYPE               0x8015
-#define GLX_MAX_PBUFFER_WIDTH              0x8016
-#define GLX_MAX_PBUFFER_HEIGHT             0x8017
-#define GLX_MAX_PBUFFER_PIXELS             0x8018
-#define GLX_PRESERVED_CONTENTS             0x801B
-#define GLX_LARGEST_PBUFFER                0x801C
-#define GLX_WIDTH                          0x801D
-#define GLX_HEIGHT                         0x801E
-#define GLX_EVENT_MASK                     0x801F
-#define GLX_DAMAGED                        0x8020
-#define GLX_SAVED                          0x8021
-#define GLX_WINDOW                         0x8022
-#define GLX_PBUFFER                        0x8023
-#define GLX_PBUFFER_HEIGHT                 0x8040
-#define GLX_PBUFFER_WIDTH                  0x8041
-#endif
-
-/* XXX Added by BrianP */
-#ifndef GLX_SGIS_multisample
-#define GLX_SAMPLE_BUFFERS_SGIS            100000
-#define GLX_SAMPLES_SGIS                   100001
-#endif
-
-#ifndef GLX_EXT_visual_info
-#define GLX_X_VISUAL_TYPE_EXT              0x22
-#define GLX_TRANSPARENT_TYPE_EXT           0x23
-#define GLX_TRANSPARENT_INDEX_VALUE_EXT    0x24
-#define GLX_TRANSPARENT_RED_VALUE_EXT      0x25
-#define GLX_TRANSPARENT_GREEN_VALUE_EXT    0x26
-#define GLX_TRANSPARENT_BLUE_VALUE_EXT     0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE_EXT    0x28
-#define GLX_NONE_EXT                       0x8000
-#define GLX_TRUE_COLOR_EXT                 0x8002
-#define GLX_DIRECT_COLOR_EXT               0x8003
-#define GLX_PSEUDO_COLOR_EXT               0x8004
-#define GLX_STATIC_COLOR_EXT               0x8005
-#define GLX_GRAY_SCALE_EXT                 0x8006
-#define GLX_STATIC_GRAY_EXT                0x8007
-#define GLX_TRANSPARENT_RGB_EXT            0x8008
-#define GLX_TRANSPARENT_INDEX_EXT          0x8009
-#endif
-
-#ifndef GLX_SGI_swap_control
-#endif
-
-#ifndef GLX_SGI_video_sync
-#endif
-
-#ifndef GLX_SGI_make_current_read
-#endif
-
-#ifndef GLX_SGIX_video_source
-#endif
-
-#ifndef GLX_EXT_visual_rating
-#define GLX_VISUAL_CAVEAT_EXT              0x20
-#define GLX_SLOW_VISUAL_EXT                0x8001
-#define GLX_NON_CONFORMANT_VISUAL_EXT      0x800D
-/* reuse GLX_NONE_EXT */
-#endif
-
-#ifndef GLX_EXT_import_context
-#define GLX_SHARE_CONTEXT_EXT              0x800A
-#define GLX_VISUAL_ID_EXT                  0x800B
-#define GLX_SCREEN_EXT                     0x800C
-#endif
-
-#ifndef GLX_SGIX_fbconfig
-#define GLX_WINDOW_BIT_SGIX                0x00000001
-#define GLX_PIXMAP_BIT_SGIX                0x00000002
-#define GLX_RGBA_BIT_SGIX                  0x00000001
-#define GLX_COLOR_INDEX_BIT_SGIX           0x00000002
-#define GLX_DRAWABLE_TYPE_SGIX             0x8010
-#define GLX_RENDER_TYPE_SGIX               0x8011
-#define GLX_X_RENDERABLE_SGIX              0x8012
-#define GLX_FBCONFIG_ID_SGIX               0x8013
-#define GLX_RGBA_TYPE_SGIX                 0x8014
-#define GLX_COLOR_INDEX_TYPE_SGIX          0x8015
-/* reuse GLX_SCREEN_EXT */
-#endif
-
-#ifndef GLX_SGIX_pbuffer
-#define GLX_PBUFFER_BIT_SGIX               0x00000004
-#define GLX_BUFFER_CLOBBER_MASK_SGIX       0x08000000
-#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX     0x00000001
-#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX    0x00000002
-#define GLX_BACK_LEFT_BUFFER_BIT_SGIX      0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX     0x00000008
-#define GLX_AUX_BUFFERS_BIT_SGIX           0x00000010
-#define GLX_DEPTH_BUFFER_BIT_SGIX          0x00000020
-#define GLX_STENCIL_BUFFER_BIT_SGIX        0x00000040
-#define GLX_ACCUM_BUFFER_BIT_SGIX          0x00000080
-#define GLX_SAMPLE_BUFFERS_BIT_SGIX        0x00000100
-#define GLX_MAX_PBUFFER_WIDTH_SGIX         0x8016
-#define GLX_MAX_PBUFFER_HEIGHT_SGIX        0x8017
-#define GLX_MAX_PBUFFER_PIXELS_SGIX        0x8018
-#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX     0x8019
-#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX    0x801A
-#define GLX_PRESERVED_CONTENTS_SGIX        0x801B
-#define GLX_LARGEST_PBUFFER_SGIX           0x801C
-#define GLX_WIDTH_SGIX                     0x801D
-#define GLX_HEIGHT_SGIX                    0x801E
-#define GLX_EVENT_MASK_SGIX                0x801F
-#define GLX_DAMAGED_SGIX                   0x8020
-#define GLX_SAVED_SGIX                     0x8021
-#define GLX_WINDOW_SGIX                    0x8022
-#define GLX_PBUFFER_SGIX                   0x8023
-#endif
-
-#ifndef GLX_SGI_cushion
-#endif
-
-#ifndef GLX_SGIX_video_resize
-#define GLX_SYNC_FRAME_SGIX                0x00000000
-#define GLX_SYNC_SWAP_SGIX                 0x00000001
-#endif
-
-#ifndef GLX_SGIX_dmbuffer
-#define GLX_DIGITAL_MEDIA_PBUFFER_SGIX     0x8024
-#endif
-
-#ifndef GLX_SGIX_swap_group
-#endif
-
-#ifndef GLX_SGIX_swap_barrier
-#endif
-
-#ifndef GLX_SGIS_blended_overlay
-#define GLX_BLENDED_RGBA_SGIS              0x8025
-#endif
-
-#ifndef GLX_SGIS_shared_multisample
-#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026
-#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027
-#endif
-
-#ifndef GLX_SUN_get_transparent_index
-#endif
-
-#ifndef GLX_3DFX_multisample
-#define GLX_SAMPLE_BUFFERS_3DFX            0x8050
-#define GLX_SAMPLES_3DFX                   0x8051
-#endif
-
-#ifndef GLX_MESA_copy_sub_buffer
-#endif
-
-#ifndef GLX_MESA_pixmap_colormap
-#endif
-
-#ifndef GLX_MESA_release_buffers
-#endif
-
-#ifndef GLX_MESA_set_3dfx_mode
-#define GLX_3DFX_WINDOW_MODE_MESA          0x1
-#define GLX_3DFX_FULLSCREEN_MODE_MESA      0x2
-#endif
-
-
-/*************************************************************/
-
-#ifndef GLX_ARB_get_proc_address
-/* XXX Added void parameter to silence many, many warnings (BrianP) */
-typedef void (*__GLXextFuncPtr)(void);
-#endif
-
-#ifndef GLX_SGIX_video_source
-typedef XID GLXVideoSourceSGIX;
-#endif
-
-#ifndef GLX_SGIX_fbconfig
-typedef XID GLXFBConfigIDSGIX;
-typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
-#endif
-
-#ifndef GLX_SGIX_pbuffer
-typedef XID GLXPbufferSGIX;
-typedef struct {
-    int type;
-    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;	  /* i.d. of Drawable */
-    int event_type;		  /* GLX_DAMAGED_SGIX or GLX_SAVED_SGIX */
-    int draw_type;		  /* GLX_WINDOW_SGIX or GLX_PBUFFER_SGIX */
-    unsigned int mask;	  /* mask indicating which buffers are affected*/
-    int x, y;
-    int width, height;
-    int count;		  /* if nonzero, at least this many more */
-} GLXBufferClobberEventSGIX;
-#endif
-
-#ifndef GLX_VERSION_1_3
-#define GLX_VERSION_1_3 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXFBConfig * glXGetFBConfigs (Display *, int, int *);
-extern GLXFBConfig * glXChooseFBConfig (Display *, int, const int *, int *);
-extern int glXGetFBConfigAttrib (Display *, GLXFBConfig, int, int *);
-extern XVisualInfo * glXGetVisualFromFBConfig (Display *, GLXFBConfig);
-extern GLXWindow glXCreateWindow (Display *, GLXFBConfig, Window, const int *);
-extern void glXDestroyWindow (Display *, GLXWindow);
-extern GLXPixmap glXCreatePixmap (Display *, GLXFBConfig, Pixmap, const int *);
-extern void glXDestroyPixmap (Display *, GLXPixmap);
-extern GLXPbuffer glXCreatePbuffer (Display *, GLXFBConfig, const int *);
-extern void glXDestroyPbuffer (Display *, GLXPbuffer);
-extern void glXQueryDrawable (Display *, GLXDrawable, int, unsigned int *);
-extern GLXContext glXCreateNewContext (Display *, GLXFBConfig, int, GLXContext, Bool);
-extern Bool glXMakeContextCurrent (Display *, GLXDrawable, GLXDrawable, GLXContext);
-extern GLXDrawable glXGetCurrentReadDrawable (void);
-extern Display * glXGetCurrentDisplay (void);
-extern int glXQueryContext (Display *, GLXContext, int, int *);
-extern void glXSelectEvent (Display *, GLXDrawable, unsigned long);
-extern void glXGetSelectedEvent (Display *, GLXDrawable, unsigned long *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXFBConfig * ( * PFNGLXGETFBCONFIGSPROC) (Display *dpy, int screen, int *nelements);
-typedef GLXFBConfig * ( * PFNGLXCHOOSEFBCONFIGPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
-typedef int ( * PFNGLXGETFBCONFIGATTRIBPROC) (Display *dpy, GLXFBConfig config, int attribute, int *value);
-typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGPROC) (Display *dpy, GLXFBConfig config);
-typedef GLXWindow ( * PFNGLXCREATEWINDOWPROC) (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYWINDOWPROC) (Display *dpy, GLXWindow win);
-typedef GLXPixmap ( * PFNGLXCREATEPIXMAPPROC) (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYPIXMAPPROC) (Display *dpy, GLXPixmap pixmap);
-typedef GLXPbuffer ( * PFNGLXCREATEPBUFFERPROC) (Display *dpy, GLXFBConfig config, const int *attrib_list);
-typedef void ( * PFNGLXDESTROYPBUFFERPROC) (Display *dpy, GLXPbuffer pbuf);
-typedef void ( * PFNGLXQUERYDRAWABLEPROC) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
-typedef GLXContext ( * PFNGLXCREATENEWCONTEXTPROC) (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
-typedef Bool ( * PFNGLXMAKECONTEXTCURRENTPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
-typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLEPROC) (void);
-typedef Display * ( * PFNGLXGETCURRENTDISPLAYPROC) (void);
-typedef int ( * PFNGLXQUERYCONTEXTPROC) (Display *dpy, GLXContext ctx, int attribute, int *value);
-typedef void ( * PFNGLXSELECTEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long event_mask);
-typedef void ( * PFNGLXGETSELECTEDEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
-#endif
-
-#ifndef GLX_ARB_get_proc_address
-#define GLX_ARB_get_proc_address 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procName);
-#endif
-
-#ifndef GLX_SGIS_multisample
-#define GLX_SGIS_multisample 1
-#endif
-
-#ifndef GLX_EXT_visual_info
-#define GLX_EXT_visual_info 1
-#endif
-
-#ifndef GLX_SGI_swap_control
-#define GLX_SGI_swap_control 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXSwapIntervalSGI (int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
-#endif
-
-#ifndef GLX_SGI_video_sync
-#define GLX_SGI_video_sync 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXGetVideoSyncSGI (unsigned int *);
-extern int glXWaitVideoSyncSGI (int, int, unsigned int *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int *count);
-typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int *count);
-#endif
-
-#ifndef GLX_SGI_make_current_read
-#define GLX_SGI_make_current_read 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXMakeCurrentReadSGI (Display *, GLXDrawable, GLXDrawable, GLXContext);
-extern GLXDrawable glXGetCurrentReadDrawableSGI (void);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXMAKECURRENTREADSGIPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
-typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void);
-#endif
-
-#ifdef _VL_H
-#ifndef GLX_SGIX_video_source
-#define GLX_SGIX_video_source 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX (Display *, int, VLServer, VLPath, int, VLNode);
-extern void glXDestroyGLXVideoSourceSGIX (Display *, GLXVideoSourceSGIX);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXVideoSourceSGIX ( * PFNGLXCREATEGLXVIDEOSOURCESGIXPROC) (Display *display, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode);
-typedef void ( * PFNGLXDESTROYGLXVIDEOSOURCESGIXPROC) (Display *dpy, GLXVideoSourceSGIX glxvideosource);
-#endif
-
-#endif /* _VL_H */
-#ifndef GLX_EXT_visual_rating
-#define GLX_EXT_visual_rating 1
-#endif
-
-#ifndef GLX_EXT_import_context
-#define GLX_EXT_import_context 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Display * glXGetCurrentDisplayEXT (void);
-extern int glXQueryContextInfoEXT (Display *, GLXContext, int, int *);
-extern GLXContextID glXGetContextIDEXT (GLXContext);
-extern GLXContext glXImportContextEXT (Display *, GLXContextID);
-extern void glXFreeContextEXT (Display *, GLXContext);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Display * ( * PFNGLXGETCURRENTDISPLAYEXTPROC) (void);
-typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display *dpy, GLXContext context, int attribute, int *value);
-typedef GLXContextID ( * PFNGLXGETCONTEXTIDEXTPROC) (GLXContext context);
-typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display *dpy, GLXContextID contextID);
-typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display *dpy, GLXContext context);
-#endif
-
-#ifndef GLX_SGIX_fbconfig
-#define GLX_SGIX_fbconfig 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXGetFBConfigAttribSGIX (Display *, GLXFBConfigSGIX, int, int *);
-extern GLXFBConfigSGIX * glXChooseFBConfigSGIX (Display *, int, int *, int *);
-extern GLXPixmap glXCreateGLXPixmapWithConfigSGIX (Display *, GLXFBConfigSGIX, Pixmap);
-extern GLXContext glXCreateContextWithConfigSGIX (Display *, GLXFBConfigSGIX, int, GLXContext, Bool);
-extern XVisualInfo * glXGetVisualFromFBConfigSGIX (Display *, GLXFBConfigSGIX);
-extern GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX (Display *, XVisualInfo *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
-typedef GLXFBConfigSGIX * ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, int *attrib_list, int *nelements);
-typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
-typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
-typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config);
-typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display *dpy, XVisualInfo *vis);
-#endif
-
-#ifndef GLX_SGIX_pbuffer
-#define GLX_SGIX_pbuffer 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXPbufferSGIX glXCreateGLXPbufferSGIX (Display *, GLXFBConfigSGIX, unsigned int, unsigned int, int *);
-extern void glXDestroyGLXPbufferSGIX (Display *, GLXPbufferSGIX);
-extern int glXQueryGLXPbufferSGIX (Display *, GLXPbufferSGIX, int, unsigned int *);
-extern void glXSelectEventSGIX (Display *, GLXDrawable, unsigned long);
-extern void glXGetSelectedEventSGIX (Display *, GLXDrawable, unsigned long *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXPbufferSGIX ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
-typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf);
-typedef int ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
-typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long mask);
-typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long *mask);
-#endif
-
-#ifndef GLX_SGI_cushion
-#define GLX_SGI_cushion 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXCushionSGI (Display *, Window, float);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXCUSHIONSGIPROC) (Display *dpy, Window window, float cushion);
-#endif
-
-#ifndef GLX_SGIX_video_resize
-#define GLX_SGIX_video_resize 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern int glXBindChannelToWindowSGIX (Display *, int, int, Window);
-extern int glXChannelRectSGIX (Display *, int, int, int, int, int, int);
-extern int glXQueryChannelRectSGIX (Display *, int, int, int *, int *, int *, int *);
-extern int glXQueryChannelDeltasSGIX (Display *, int, int, int *, int *, int *, int *);
-extern int glXChannelRectSyncSGIX (Display *, int, int, GLenum);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef int ( * PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (Display *display, int screen, int channel, Window window);
-typedef int ( * PFNGLXCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int x, int y, int w, int h);
-typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
-typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display *display, int screen, int channel, int *x, int *y, int *w, int *h);
-typedef int ( * PFNGLXCHANNELRECTSYNCSGIXPROC) (Display *display, int screen, int channel, GLenum synctype);
-#endif
-
-#ifdef _DM_BUFFER_H_
-#ifndef GLX_SGIX_dmbuffer
-#define GLX_SGIX_dmbuffer 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXAssociateDMPbufferSGIX (Display *, GLXPbufferSGIX, DMparams *, DMbuffer);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXASSOCIATEDMPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer);
-#endif
-
-#endif /* _DM_BUFFER_H_ */
-#ifndef GLX_SGIX_swap_group
-#define GLX_SGIX_swap_group 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXJoinSwapGroupSGIX (Display *, GLXDrawable, GLXDrawable);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
-#endif
-
-#ifndef GLX_SGIX_swap_barrier
-#define GLX_SGIX_swap_barrier 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXBindSwapBarrierSGIX (Display *, GLXDrawable, int);
-extern Bool glXQueryMaxSwapBarriersSGIX (Display *, int, int *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display *dpy, GLXDrawable drawable, int barrier);
-typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen, int *max);
-#endif
-
-#ifndef GLX_SUN_get_transparent_index
-#define GLX_SUN_get_transparent_index 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Status glXGetTransparentIndexSUN (Display *, Window, Window, long *);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display *dpy, Window overlay, Window underlay, long *pTransparentIndex);
-#endif
-
-#ifndef GLX_MESA_copy_sub_buffer
-#define GLX_MESA_copy_sub_buffer 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern void glXCopySubBufferMESA (Display *, GLXDrawable, int, int, int, int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display *dpy, GLXDrawable drawable, int x, int y, int width, int height);
-#endif
-
-#ifndef GLX_MESA_pixmap_colormap
-#define GLX_MESA_pixmap_colormap 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern GLXPixmap glXCreateGLXPixmapMESA (Display *, XVisualInfo *, Pixmap, Colormap);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap);
-#endif
-
-#ifndef GLX_MESA_release_buffers
-#define GLX_MESA_release_buffers 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXReleaseBuffersMESA (Display *, GLXDrawable);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display *dpy, GLXDrawable drawable);
-#endif
-
-#ifndef GLX_MESA_set_3dfx_mode
-#define GLX_MESA_set_3dfx_mode 1
-#ifdef GLX_GLXEXT_PROTOTYPES
-extern Bool glXSet3DfxModeMESA (int);
-#endif /* GLX_GLXEXT_PROTOTYPES */
-typedef Bool ( * PFNGLXSET3DFXMODEMESAPROC) (int mode);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

include/GL/internal/glcore-new.h

@@ -1,424 +0,0 @@
-#ifndef __gl_core_h_
-#define __gl_core_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.1 (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-2000 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.
-**
-** $Date: 2001/01/08 03:56:53 $ $Revision: 1.1 $
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/include/GL/internal/Attic/glcore-new.h,v 1.1 2001/01/08 03:56:53 keithw Exp $
-*/
-
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#else
-#include <sys/types.h>
-#endif
-
-typedef struct __GLcontextRec __GLcontext;
-typedef struct __GLinterfaceRec __GLinterface;
-
-/*
-** This file defines the interface between the GL core and the surrounding
-** "operating system" that supports it (currently the GLX or WGL extensions).
-**
-** Members (data and function pointers) are documented as imported or
-** exported according to how they are used by the core rendering functions.
-** Imported members are initialized by the "operating system" and used by
-** the core functions.  Exported members are initialized by the core functions
-** and used by the "operating system".
-*/
-
-/*
-** Mode and limit information for a context.  This information is
-** kept around in the context so that values can be used during
-** command execution, and for returning information about the
-** context to the application.
-*/
-typedef struct __GLcontextModesRec {
-    GLboolean rgbMode;
-    GLboolean colorIndexMode;
-    GLboolean doubleBufferMode;
-    GLboolean stereoMode;
-
-    GLboolean haveAccumBuffer;
-    GLboolean haveDepthBuffer;
-    GLboolean haveStencilBuffer;
-
-    GLint redBits, greenBits, blueBits, alphaBits;	/* bits per comp */
-    GLuint redMask, greenMask, blueMask, alphaMask;
-    GLint rgbBits;		/* total bits for rgb */
-    GLint indexBits;		/* total bits for colorindex */
-
-    GLint accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits;
-    GLint depthBits;
-    GLint stencilBits;
-
-    GLint numAuxBuffers;
-
-    GLint level;
-
-    GLint pixmapMode;
-} __GLcontextModes;
-
-/************************************************************************/
-
-/*
-** Structure used for allocating and freeing drawable private memory.
-** (like software buffers, for example).
-**
-** The memory allocation routines are provided by the surrounding
-** "operating system" code, and they are to be used for allocating
-** software buffers and things which are associated with the drawable,
-** and used by any context which draws to that drawable.  There are
-** separate memory allocation functions for drawables and contexts
-** since drawables and contexts can be created and destroyed independently
-** of one another, and the "operating system" may want to use separate
-** allocation arenas for each.
-**
-** The freePrivate function is filled in by the core routines when they
-** allocates software buffers, and stick them in "private".  The freePrivate
-** function will destroy anything allocated to this drawable (to be called
-** when the drawable is destroyed).
-*/
-typedef struct __GLdrawableRegionRec __GLdrawableRegion;
-typedef struct __GLdrawableBufferRec __GLdrawableBuffer;
-typedef struct __GLdrawablePrivateRec __GLdrawablePrivate;
-
-typedef struct __GLregionRectRec {
-    /* lower left (inside the rectangle) */
-    GLint x0, y0;
-    /* upper right (outside the rectangle) */
-    GLint x1, y1;
-} __GLregionRect;
-
-struct __GLdrawableRegionRec {
-    GLint numRects;
-    __GLregionRect *rects;
-    __GLregionRect boundingRect;
-};
-
-/************************************************************************/
-
-/* masks for the buffers */
-#define __GL_FRONT_BUFFER_MASK		0x00000001
-#define	__GL_FRONT_LEFT_BUFFER_MASK	0x00000001
-#define	__GL_FRONT_RIGHT_BUFFER_MASK	0x00000002
-#define	__GL_BACK_BUFFER_MASK		0x00000004
-#define __GL_BACK_LEFT_BUFFER_MASK	0x00000004
-#define __GL_BACK_RIGHT_BUFFER_MASK	0x00000008
-#define	__GL_ACCUM_BUFFER_MASK		0x00000010
-#define	__GL_DEPTH_BUFFER_MASK		0x00000020
-#define	__GL_STENCIL_BUFFER_MASK	0x00000040
-#define	__GL_AUX_BUFFER_MASK(i)		(0x0000080 << (i))
-
-#define __GL_ALL_BUFFER_MASK		0xffffffff
-
-/* what Resize routines return if resize resorted to fallback case */
-#define __GL_BUFFER_FALLBACK	0x10
-
-typedef void (*__GLbufFallbackInitFn)(__GLdrawableBuffer *buf, 
-				      __GLdrawablePrivate *glPriv, GLint bits);
-typedef void (*__GLbufMainInitFn)(__GLdrawableBuffer *buf, 
-				  __GLdrawablePrivate *glPriv, GLint bits,
-				  __GLbufFallbackInitFn back);
-
-/*
-** A drawable buffer
-**
-** This data structure describes the context side of a drawable.  
-**
-** According to the spec there could be multiple contexts bound to the same
-** drawable at the same time (from different threads).  In order to avoid
-** multiple-access conflicts, locks are used to serialize access.  When a
-** thread needs to access (read or write) a member of the drawable, it takes
-** a lock first.  Some of the entries in the drawable are treated "mostly
-** constant", so we take the freedom of allowing access to them without
-** taking a lock (for optimization reasons).
-**
-** For more details regarding locking, see buffers.h in the GL core
-*/
-struct __GLdrawableBufferRec {
-    /*
-    ** Buffer dimensions
-    */
-    GLint width, height, depth;
-
-    /*
-    ** Framebuffer base address
-    */
-    void *base;
-
-    /*
-    ** Framebuffer size (in bytes)
-    */
-    GLuint size;
-
-    /*
-    ** Size (in bytes) of each element in the framebuffer
-    */
-    GLuint elementSize;
-    GLuint elementSizeLog2;
-
-    /*
-    ** Element skip from one scanline to the next.
-    ** If the buffer is part of another buffer (for example, fullscreen
-    ** front buffer), outerWidth is the width of that buffer.
-    */
-    GLint outerWidth;
-
-    /*
-    ** outerWidth * elementSize
-    */
-    GLint byteWidth;
-
-    /*
-    ** Allocation/deallocation is done based on this handle.  A handle
-    ** is conceptually different from the framebuffer 'base'.
-    */
-    void *handle;
-
-    /* imported */
-    GLboolean (*resize)(__GLdrawableBuffer *buf,
-			GLint x, GLint y, GLuint width, GLuint height, 
-			__GLdrawablePrivate *glPriv, GLuint bufferMask);
-    void (*lock)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
-    void (*unlock)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
-    void (*fill)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv,
-    		GLuint val, GLint x, GLint y, GLint w, GLint h);
-    void (*free)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
-
-    /* exported */
-    void (*freePrivate)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
-#ifdef __cplusplus
-    void *privatePtr;
-#else
-    void *private;
-#endif
-
-    /* private */
-    void *other;	/* implementation private data */
-    __GLbufMainInitFn mainInit;
-    __GLbufFallbackInitFn fallbackInit;
-};
-
-/*
-** The context side of the drawable private
-*/
-struct __GLdrawablePrivateRec {
-    /*
-    ** Drawable Modes
-    */
-    __GLcontextModes *modes;
-
-    /*
-    ** Drawable size
-    */
-    GLuint width, height;
-
-    /*
-    ** Origin in screen coordinates of the drawable
-    */
-    GLint xOrigin, yOrigin;
-#ifdef __GL_ALIGNED_BUFFERS
-    /*
-    ** Drawable offset from screen origin
-    */
-    GLint xOffset, yOffset;
-
-    /*
-    ** Alignment restriction
-    */
-    GLint xAlignment, yAlignment;
-#endif
-    /*
-    ** Should we invert the y axis?
-    */
-    GLint yInverted;
-
-    /*
-    ** Mask specifying which buffers are renderable by the hw
-    */
-    GLuint accelBufferMask;
-
-    /*
-    ** the buffers themselves
-    */
-    __GLdrawableBuffer frontBuffer;
-    __GLdrawableBuffer backBuffer;
-    __GLdrawableBuffer accumBuffer;
-    __GLdrawableBuffer depthBuffer;
-    __GLdrawableBuffer stencilBuffer;
-#if __GL_NUMBER_OF_AUX_BUFFERS > 0
-    __GLdrawableBuffer *auxBuffer;
-#endif
-
-    __GLdrawableRegion ownershipRegion;
-
-    /*
-    ** Lock for the drawable private structure
-    */
-    void *lock;
-#ifdef DEBUG
-    /* lock debugging info */
-    int lockRefCount;
-    int lockLine[10];
-    char *lockFile[10];
-#endif
-
-    /* imported */
-    void *(*malloc)(size_t size);
-    void *(*calloc)(size_t numElem, size_t elemSize);
-    void *(*realloc)(void *oldAddr, size_t newSize);
-    void (*free)(void *addr);
-
-    GLboolean (*addSwapRect)(__GLdrawablePrivate *glPriv, 
-			     GLint x, GLint y, GLsizei width, GLsizei height);
-    void (*setClipRect)(__GLdrawablePrivate *glPriv, 
-			GLint x, GLint y, GLsizei width, GLsizei height);
-    void (*updateClipRegion)(__GLdrawablePrivate *glPriv);
-    GLboolean (*resize)(__GLdrawablePrivate *glPriv);
-    void (*getDrawableSize)(__GLdrawablePrivate *glPriv, 
-			    GLint *x, GLint *y, GLuint *width, GLuint *height);
-
-    void (*lockDP)(__GLdrawablePrivate *glPriv, __GLcontext *gc);
-    void (*unlockDP)(__GLdrawablePrivate *glPriv);
-
-    /* exported */
-    void *wsPriv;	/* pointer to the window system DrawablePrivate */
-#ifdef __cplusplus
-    void *privatePtr;
-#else
-    void *private;
-#endif
-    void (*freePrivate)(__GLdrawablePrivate *);
-
-    /* client data */
-    void *other;
-};
-
-/*
-** Macros to lock/unlock the drawable private
-*/
-#if defined(DEBUG)
-#define __GL_LOCK_DP(glPriv,gc) \
-    (*(glPriv)->lockDP)(glPriv,gc); \
-    (glPriv)->lockLine[(glPriv)->lockRefCount] = __LINE__; \
-    (glPriv)->lockFile[(glPriv)->lockRefCount] = __FILE__; \
-    (glPriv)->lockRefCount++
-#define __GL_UNLOCK_DP(glPriv) \
-    (glPriv)->lockRefCount--; \
-    (glPriv)->lockLine[(glPriv)->lockRefCount] = 0; \
-    (glPriv)->lockFile[(glPriv)->lockRefCount] = NULL; \
-    (*(glPriv)->unlockDP)(glPriv)
-#else /* DEBUG */
-#define __GL_LOCK_DP(glPriv,gc)		(*(glPriv)->lockDP)(glPriv,gc)
-#define	__GL_UNLOCK_DP(glPriv)		(*(glPriv)->unlockDP)(glPriv)
-#endif /* DEBUG */
-
-
-/*
-** Procedures which are imported by the GL from the surrounding
-** "operating system".  Math functions are not considered part of the
-** "operating system".
-*/
-typedef struct __GLimportsRec {
-    /* Memory management */
-    void * (*malloc)(__GLcontext *gc, size_t size);
-    void *(*calloc)(__GLcontext *gc, size_t numElem, size_t elemSize);
-    void *(*realloc)(__GLcontext *gc, void *oldAddr, size_t newSize);
-    void (*free)(__GLcontext *gc, void *addr);
-
-    /* Error handling */
-    void (*warning)(__GLcontext *gc, char *fmt);
-    void (*fatal)(__GLcontext *gc, char *fmt);
-
-    /* other system calls */
-    char *(CAPI *getenv)(__GLcontext *gc, const char *var);
-    int (CAPI *atoi)(__GLcontext *gc, const char *str);
-    int (CAPI *sprintf)(__GLcontext *gc, char *str, const char *fmt, ...);
-    void *(CAPI *fopen)(__GLcontext *gc, const char *path, const char *mode);
-    int (CAPI *fclose)(__GLcontext *gc, void *stream);
-    int (CAPI *fprintf)(__GLcontext *gc, void *stream, const char *fmt, ...);
-
-    /* Drawing surface management */
-    __GLdrawablePrivate *(*getDrawablePrivate)(__GLcontext *gc);
-
-    /* Pointer to the window system context */
-    void *wscx;
-
-    /* Operating system dependent data goes here */
-    void *other;
-} __GLimports;
-
-/************************************************************************/
-
-/*
-** Procedures which are exported by the GL to the surrounding "operating
-** system" so that it can manage multiple GL context's.
-*/
-typedef struct __GLexportsRec {
-    /* Context management (return GL_FALSE on failure) */
-    GLboolean (*destroyContext)(__GLcontext *gc);
-    GLboolean (*loseCurrent)(__GLcontext *gc);
-    GLboolean (*makeCurrent)(__GLcontext *gc);
-    GLboolean (*shareContext)(__GLcontext *gc, __GLcontext *gcShare);
-    GLboolean (*copyContext)(__GLcontext *dst, const __GLcontext *src, GLuint mask);
-    GLboolean (*forceCurrent)(__GLcontext *gc);
-
-    /* Drawing surface notification callbacks */
-    GLboolean (*notifyResize)(__GLcontext *gc);
-    void (*notifyDestroy)(__GLcontext *gc);
-    void (*notifySwapBuffers)(__GLcontext *gc);
-
-    /* Dispatch table override control for external agents like libGLS */
-    struct __GLdispatchStateRec* (*dispatchExec)(__GLcontext *gc);
-    void (*beginDispatchOverride)(__GLcontext *gc);
-    void (*endDispatchOverride)(__GLcontext *gc);
-} __GLexports;
-
-/************************************************************************/
-
-/*
-** This must be the first member of a __GLcontext structure.  This is the
-** only part of a context that is exposed to the outside world; everything
-** else is opaque.
-*/
-struct __GLinterfaceRec {
-    __GLimports imports;
-    __GLexports exports;
-};
-
-extern __GLcontext *__glCoreCreateContext(__GLimports *, __GLcontextModes *);
-extern void __glCoreNopDispatch(void);
-
-#endif /* __gl_core_h_ */

include/GL/internal/glcore.h

@@ -1,424 +0,0 @@
-/* $XFree86: xc/lib/GL/include/GL/internal/glcore.h,v 1.7 2001/03/25 05:32:00 tsi Exp $ */
-#ifndef __gl_core_h_
-#define __gl_core_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.1 (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-2000 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.
-**
-*/
-
-#ifndef XFree86LOADER
-#include <sys/types.h>
-#endif
-
-#define GL_CORE_SGI  1
-#define GL_CORE_MESA 2
-
-typedef struct __GLcontextRec __GLcontext;
-typedef struct __GLinterfaceRec __GLinterface;
-
-/*
-** This file defines the interface between the GL core and the surrounding
-** "operating system" that supports it (currently the GLX or WGL extensions).
-**
-** Members (data and function pointers) are documented as imported or
-** exported according to how they are used by the core rendering functions.
-** Imported members are initialized by the "operating system" and used by
-** the core functions.  Exported members are initialized by the core functions
-** and used by the "operating system".
-*/
-
-/*
-** Mode and limit information for a context.  This information is
-** kept around in the context so that values can be used during
-** command execution, and for returning information about the
-** context to the application.
-*/
-typedef struct __GLcontextModesRec {
-    GLboolean rgbMode;
-    GLboolean colorIndexMode;
-    GLboolean doubleBufferMode;
-    GLboolean stereoMode;
-
-    GLboolean haveAccumBuffer;
-    GLboolean haveDepthBuffer;
-    GLboolean haveStencilBuffer;
-
-    GLint redBits, greenBits, blueBits, alphaBits;	/* bits per comp */
-    GLuint redMask, greenMask, blueMask, alphaMask;
-    GLint rgbBits;		/* total bits for rgb */
-    GLint indexBits;		/* total bits for colorindex */
-
-    GLint accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits;
-    GLint depthBits;
-    GLint stencilBits;
-
-    GLint numAuxBuffers;
-
-    GLint level;
-
-    GLint pixmapMode;
-} __GLcontextModes;
-
-/************************************************************************/
-
-/*
-** Structure used for allocating and freeing drawable private memory.
-** (like software buffers, for example).
-**
-** The memory allocation routines are provided by the surrounding
-** "operating system" code, and they are to be used for allocating
-** software buffers and things which are associated with the drawable,
-** and used by any context which draws to that drawable.  There are
-** separate memory allocation functions for drawables and contexts
-** since drawables and contexts can be created and destroyed independently
-** of one another, and the "operating system" may want to use separate
-** allocation arenas for each.
-**
-** The freePrivate function is filled in by the core routines when they
-** allocates software buffers, and stick them in "private".  The freePrivate
-** function will destroy anything allocated to this drawable (to be called
-** when the drawable is destroyed).
-*/
-typedef struct __GLdrawableRegionRec __GLdrawableRegion;
-typedef struct __GLdrawableBufferRec __GLdrawableBuffer;
-typedef struct __GLdrawablePrivateRec __GLdrawablePrivate;
-
-typedef struct __GLregionRectRec {
-    /* lower left (inside the rectangle) */
-    GLint x0, y0;
-    /* upper right (outside the rectangle) */
-    GLint x1, y1;
-} __GLregionRect;
-
-struct __GLdrawableRegionRec {
-    GLint numRects;
-    __GLregionRect *rects;
-    __GLregionRect boundingRect;
-};
-
-/************************************************************************/
-
-/* masks for the buffers */
-#define __GL_FRONT_BUFFER_MASK		0x00000001
-#define	__GL_FRONT_LEFT_BUFFER_MASK	0x00000001
-#define	__GL_FRONT_RIGHT_BUFFER_MASK	0x00000002
-#define	__GL_BACK_BUFFER_MASK		0x00000004
-#define __GL_BACK_LEFT_BUFFER_MASK	0x00000004
-#define __GL_BACK_RIGHT_BUFFER_MASK	0x00000008
-#define	__GL_ACCUM_BUFFER_MASK		0x00000010
-#define	__GL_DEPTH_BUFFER_MASK		0x00000020
-#define	__GL_STENCIL_BUFFER_MASK	0x00000040
-#define	__GL_AUX_BUFFER_MASK(i)		(0x0000080 << (i))
-
-#define __GL_ALL_BUFFER_MASK		0xffffffff
-
-/* what Resize routines return if resize resorted to fallback case */
-#define __GL_BUFFER_FALLBACK	0x10
-
-typedef void (*__GLbufFallbackInitFn)(__GLdrawableBuffer *buf, 
-				      __GLdrawablePrivate *glPriv, GLint bits);
-typedef void (*__GLbufMainInitFn)(__GLdrawableBuffer *buf, 
-				  __GLdrawablePrivate *glPriv, GLint bits,
-				  __GLbufFallbackInitFn back);
-
-/*
-** A drawable buffer
-**
-** This data structure describes the context side of a drawable.  
-**
-** According to the spec there could be multiple contexts bound to the same
-** drawable at the same time (from different threads).  In order to avoid
-** multiple-access conflicts, locks are used to serialize access.  When a
-** thread needs to access (read or write) a member of the drawable, it takes
-** a lock first.  Some of the entries in the drawable are treated "mostly
-** constant", so we take the freedom of allowing access to them without
-** taking a lock (for optimization reasons).
-**
-** For more details regarding locking, see buffers.h in the GL core
-*/
-struct __GLdrawableBufferRec {
-    /*
-    ** Buffer dimensions
-    */
-    GLint width, height, depth;
-
-    /*
-    ** Framebuffer base address
-    */
-    void *base;
-
-    /*
-    ** Framebuffer size (in bytes)
-    */
-    GLuint size;
-
-    /*
-    ** Size (in bytes) of each element in the framebuffer
-    */
-    GLuint elementSize;
-    GLuint elementSizeLog2;
-
-    /*
-    ** Element skip from one scanline to the next.
-    ** If the buffer is part of another buffer (for example, fullscreen
-    ** front buffer), outerWidth is the width of that buffer.
-    */
-    GLint outerWidth;
-
-    /*
-    ** outerWidth * elementSize
-    */
-    GLint byteWidth;
-
-    /*
-    ** Allocation/deallocation is done based on this handle.  A handle
-    ** is conceptually different from the framebuffer 'base'.
-    */
-    void *handle;
-
-    /* imported */
-    GLboolean (*resize)(__GLdrawableBuffer *buf,
-			GLint x, GLint y, GLuint width, GLuint height, 
-			__GLdrawablePrivate *glPriv, GLuint bufferMask);
-    void (*lock)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
-    void (*unlock)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
-    void (*fill)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv,
-    		GLuint val, GLint x, GLint y, GLint w, GLint h);
-    void (*free)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
-
-    /* exported */
-    void (*freePrivate)(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv);
-#ifdef __cplusplus
-    void *privatePtr;
-#else
-    void *private;
-#endif
-
-    /* private */
-    void *other;	/* implementation private data */
-    __GLbufMainInitFn mainInit;
-    __GLbufFallbackInitFn fallbackInit;
-};
-
-/*
-** The context side of the drawable private
-*/
-struct __GLdrawablePrivateRec {
-    /*
-    ** Drawable Modes
-    */
-    __GLcontextModes *modes;
-
-    /*
-    ** Drawable size
-    */
-    GLuint width, height;
-
-    /*
-    ** Origin in screen coordinates of the drawable
-    */
-    GLint xOrigin, yOrigin;
-#ifdef __GL_ALIGNED_BUFFERS
-    /*
-    ** Drawable offset from screen origin
-    */
-    GLint xOffset, yOffset;
-
-    /*
-    ** Alignment restriction
-    */
-    GLint xAlignment, yAlignment;
-#endif
-    /*
-    ** Should we invert the y axis?
-    */
-    GLint yInverted;
-
-    /*
-    ** Mask specifying which buffers are renderable by the hw
-    */
-    GLuint accelBufferMask;
-
-    /*
-    ** the buffers themselves
-    */
-    __GLdrawableBuffer frontBuffer;
-    __GLdrawableBuffer backBuffer;
-    __GLdrawableBuffer accumBuffer;
-    __GLdrawableBuffer depthBuffer;
-    __GLdrawableBuffer stencilBuffer;
-#if defined(__GL_NUMBER_OF_AUX_BUFFERS) && (__GL_NUMBER_OF_AUX_BUFFERS > 0)
-    __GLdrawableBuffer *auxBuffer;
-#endif
-
-    __GLdrawableRegion ownershipRegion;
-
-    /*
-    ** Lock for the drawable private structure
-    */
-    void *lock;
-#ifdef DEBUG
-    /* lock debugging info */
-    int lockRefCount;
-    int lockLine[10];
-    char *lockFile[10];
-#endif
-
-    /* imported */
-    void *(*malloc)(size_t size);
-    void *(*calloc)(size_t numElem, size_t elemSize);
-    void *(*realloc)(void *oldAddr, size_t newSize);
-    void (*free)(void *addr);
-
-    GLboolean (*addSwapRect)(__GLdrawablePrivate *glPriv, 
-			     GLint x, GLint y, GLsizei width, GLsizei height);
-    void (*setClipRect)(__GLdrawablePrivate *glPriv, 
-			GLint x, GLint y, GLsizei width, GLsizei height);
-    void (*updateClipRegion)(__GLdrawablePrivate *glPriv);
-    GLboolean (*resize)(__GLdrawablePrivate *glPriv);
-    void (*getDrawableSize)(__GLdrawablePrivate *glPriv, 
-			    GLint *x, GLint *y, GLuint *width, GLuint *height);
-
-    void (*lockDP)(__GLdrawablePrivate *glPriv, __GLcontext *gc);
-    void (*unlockDP)(__GLdrawablePrivate *glPriv);
-
-    /* exported */
-    void *wsPriv;	/* pointer to the window system DrawablePrivate */
-#ifdef __cplusplus
-    void *privatePtr;
-#else
-    void *private;
-#endif
-    void (*freePrivate)(__GLdrawablePrivate *);
-
-    /* client data */
-    void *other;
-};
-
-/*
-** Macros to lock/unlock the drawable private
-*/
-#if defined(DEBUG)
-#define __GL_LOCK_DP(glPriv,gc) \
-    (*(glPriv)->lockDP)(glPriv,gc); \
-    (glPriv)->lockLine[(glPriv)->lockRefCount] = __LINE__; \
-    (glPriv)->lockFile[(glPriv)->lockRefCount] = __FILE__; \
-    (glPriv)->lockRefCount++
-#define __GL_UNLOCK_DP(glPriv) \
-    (glPriv)->lockRefCount--; \
-    (glPriv)->lockLine[(glPriv)->lockRefCount] = 0; \
-    (glPriv)->lockFile[(glPriv)->lockRefCount] = NULL; \
-    (*(glPriv)->unlockDP)(glPriv)
-#else /* DEBUG */
-#define __GL_LOCK_DP(glPriv,gc)		(*(glPriv)->lockDP)(glPriv,gc)
-#define	__GL_UNLOCK_DP(glPriv)		(*(glPriv)->unlockDP)(glPriv)
-#endif /* DEBUG */
-
-
-/*
-** Procedures which are imported by the GL from the surrounding
-** "operating system".  Math functions are not considered part of the
-** "operating system".
-*/
-typedef struct __GLimportsRec {
-    /* Memory management */
-    void * (*malloc)(__GLcontext *gc, size_t size);
-    void *(*calloc)(__GLcontext *gc, size_t numElem, size_t elemSize);
-    void *(*realloc)(__GLcontext *gc, void *oldAddr, size_t newSize);
-    void (*free)(__GLcontext *gc, void *addr);
-
-    /* Error handling */
-    void (*warning)(__GLcontext *gc, char *fmt);
-    void (*fatal)(__GLcontext *gc, char *fmt);
-
-    /* other system calls */
-    char *(CAPI *getenv)(__GLcontext *gc, const char *var);
-    int (CAPI *atoi)(__GLcontext *gc, const char *str);
-    int (CAPI *sprintf)(__GLcontext *gc, char *str, const char *fmt, ...);
-    void *(CAPI *fopen)(__GLcontext *gc, const char *path, const char *mode);
-    int (CAPI *fclose)(__GLcontext *gc, void *stream);
-    int (CAPI *fprintf)(__GLcontext *gc, void *stream, const char *fmt, ...);
-
-    /* Drawing surface management */
-    __GLdrawablePrivate *(*getDrawablePrivate)(__GLcontext *gc);
-
-    /* Pointer to the window system context */
-    void *wscx;
-
-    /* Operating system dependent data goes here */
-    void *other;
-} __GLimports;
-
-/************************************************************************/
-
-/*
-** Procedures which are exported by the GL to the surrounding "operating
-** system" so that it can manage multiple GL context's.
-*/
-typedef struct __GLexportsRec {
-    /* Context management (return GL_FALSE on failure) */
-    GLboolean (*destroyContext)(__GLcontext *gc);
-    GLboolean (*loseCurrent)(__GLcontext *gc);
-    GLboolean (*makeCurrent)(__GLcontext *gc);
-    GLboolean (*shareContext)(__GLcontext *gc, __GLcontext *gcShare);
-    GLboolean (*copyContext)(__GLcontext *dst, const __GLcontext *src, GLuint mask);
-    GLboolean (*forceCurrent)(__GLcontext *gc);
-
-    /* Drawing surface notification callbacks */
-    GLboolean (*notifyResize)(__GLcontext *gc);
-    void (*notifyDestroy)(__GLcontext *gc);
-    void (*notifySwapBuffers)(__GLcontext *gc);
-
-    /* Dispatch table override control for external agents like libGLS */
-    struct __GLdispatchStateRec* (*dispatchExec)(__GLcontext *gc);
-    void (*beginDispatchOverride)(__GLcontext *gc);
-    void (*endDispatchOverride)(__GLcontext *gc);
-} __GLexports;
-
-/************************************************************************/
-
-/*
-** This must be the first member of a __GLcontext structure.  This is the
-** only part of a context that is exposed to the outside world; everything
-** else is opaque.
-*/
-struct __GLinterfaceRec {
-    __GLimports imports;
-    __GLexports exports;
-};
-
-extern __GLcontext *__glCoreCreateContext(__GLimports *, __GLcontextModes *);
-extern void __glCoreNopDispatch(void);
-
-#endif /* __gl_core_h_ */

include/GL/mesa_wgl.h

@@ -1,125 +1,88 @@
-/* $Id: mesa_wgl.h,v 1.6 2001/05/07 13:58:00 gareth Exp $ */
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.1
- *
- * Copyright (C) 1999  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.
- */
-
-
-/* prototypes for the Mesa WGL functions */
-/* relocated here so that I could make GLUT get them properly */
-
-#define _mesa_wgl_h_
-
-#ifndef _mesa_wgl_h_
-#define _mesa_wgl_h_
-
-
-#include <gl/gl.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__))
-#  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
-#    define GLAPI __declspec(dllexport)
-#    define WGLAPI __declspec(dllexport)
-#  elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
-#    define GLAPI __declspec(dllimport)
-#    define WGLAPI __declspec(dllimport)
-#  else /* for use with static link lib build of Win32 edition only */
-#    define GLAPI extern
-#    define WGLAPI __declspec(dllimport)
-#  endif /* _STATIC_MESA support */
-#  define GLAPIENTRY __stdcall
-#else
-/* non-Windows compilation */
-#  define GLAPI extern
-#  define GLAPIENTRY
-#endif /* WIN32 / CYGWIN32 bracket */
-
-
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP)
-#ifndef _GNU_H_WINDOWS32_FUNCTIONS
-#	ifdef UNICODE
-#		define wglUseFontBitmaps  wglUseFontBitmapsW
-#		define wglUseFontOutlines  wglUseFontOutlinesW
-#	else
-#		define wglUseFontBitmaps  wglUseFontBitmapsA
-#		define wglUseFontOutlines  wglUseFontOutlinesA
-#	endif /* !UNICODE */
-#endif /* _GNU_H_WINDOWS32_FUNCTIONS */
-typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
-typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
-typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
-#endif
-
-
-#ifdef _MSC_VER
-#  pragma warning( disable : 4615 ) /* pragma warning : unknown user warning type*/
-#  pragma warning( push )
-#  pragma warning( disable : 4273 ) /* 'function' : inconsistent DLL linkage. dllexport assumed. */
-#endif
-
-WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);
-WGLAPI int   GLAPIENTRY wglMakeCurrent(HDC,HGLRC);
-WGLAPI int   GLAPIENTRY wglSetPixelFormat(HDC, int, const PIXELFORMATDESCRIPTOR *);
-WGLAPI int   GLAPIENTRY wglSwapBuffers(HDC hdc);
-WGLAPI HDC   GLAPIENTRY wglGetCurrentDC(void);
-WGLAPI HGLRC GLAPIENTRY wglCreateContext(HDC);
-WGLAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC,int);
-WGLAPI HGLRC GLAPIENTRY wglGetCurrentContext(void);
-WGLAPI PROC  GLAPIENTRY wglGetProcAddress(const char*);
-WGLAPI int   GLAPIENTRY wglChoosePixelFormat(HDC, const PIXELFORMATDESCRIPTOR *);
-WGLAPI int   GLAPIENTRY wglCopyContext(HGLRC, HGLRC, unsigned int);
-WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);
-WGLAPI int   GLAPIENTRY wglDescribeLayerPlane(HDC, int, int, unsigned int,LPLAYERPLANEDESCRIPTOR);
-WGLAPI int   GLAPIENTRY wglDescribePixelFormat(HDC,int, unsigned int, LPPIXELFORMATDESCRIPTOR);
-WGLAPI int   GLAPIENTRY wglGetLayerPaletteEntries(HDC, int, int, int,COLORREF *);
-WGLAPI int   GLAPIENTRY wglGetPixelFormat(HDC hdc);
-WGLAPI int   GLAPIENTRY wglMakeCurrent(HDC, HGLRC);
-WGLAPI int   GLAPIENTRY wglRealizeLayerPalette(HDC, int, int);
-WGLAPI int   GLAPIENTRY wglSetLayerPaletteEntries(HDC, int, int, int,const COLORREF *);
-WGLAPI int   GLAPIENTRY wglShareLists(HGLRC, HGLRC);
-WGLAPI int   GLAPIENTRY wglSwapLayerBuffers(HDC, unsigned int);
-WGLAPI int   GLAPIENTRY wglUseFontBitmapsA(HDC, unsigned long, unsigned long, unsigned long);
-WGLAPI int   GLAPIENTRY wglUseFontBitmapsW(HDC, unsigned long, unsigned long, unsigned long);
-WGLAPI int   GLAPIENTRY wglUseFontOutlinesA(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
-WGLAPI int   GLAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
-WGLAPI int   GLAPIENTRY SwapBuffers(HDC);
-WGLAPI int   GLAPIENTRY ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR *);
-WGLAPI int   GLAPIENTRY DescribePixelFormat(HDC,int,unsigned int,LPPIXELFORMATDESCRIPTOR);
-WGLAPI int   GLAPIENTRY GetPixelFormat(HDC);
-WGLAPI int   GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);
-
-#ifdef _MSC_VER
-#  pragma warning( pop )
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _mesa_wgl_h_ */
+/* $Id: mesa_wgl.h,v 1.2.2.2 1999/11/22 14:05:15 brianp Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.1
+ *
+ * Copyright (C) 1999  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.
+ */
+
+
+/* prototypes for the Mesa WGL functions */
+/* relocated here so that I could make GLUT get them properly */
+
+#ifndef _mesa_wgl_h_
+#define _mesa_wgl_h_
+
+
+#include <gl/gl.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#ifdef _MSC_VER
+#  pragma warning( disable : 4615 ) /* pragma warning : unknown user warning type*/
+#  pragma warning( push )
+#  pragma warning( disable : 4273 ) /* 'function' : inconsistent DLL linkage. dllexport assumed. */
+#endif
+
+WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);
+WGLAPI int   GLAPIENTRY wglMakeCurrent(HDC,HGLRC);
+WGLAPI int   GLAPIENTRY wglSetPixelFormat(HDC, int, const PIXELFORMATDESCRIPTOR *);
+WGLAPI int   GLAPIENTRY wglSwapBuffers(HDC hdc);
+WGLAPI HDC   GLAPIENTRY wglGetCurrentDC(void);
+WGLAPI HGLRC GLAPIENTRY wglCreateContext(HDC);
+WGLAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC,int);
+WGLAPI HGLRC GLAPIENTRY wglGetCurrentContext(void);
+WGLAPI PROC  GLAPIENTRY wglGetProcAddress(const char*);
+WGLAPI int   GLAPIENTRY wglChoosePixelFormat(HDC, const PIXELFORMATDESCRIPTOR *);
+WGLAPI int   GLAPIENTRY wglCopyContext(HGLRC, HGLRC, unsigned int);
+WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);
+WGLAPI int   GLAPIENTRY wglDescribeLayerPlane(HDC, int, int, unsigned int,LPLAYERPLANEDESCRIPTOR);
+WGLAPI int   GLAPIENTRY wglDescribePixelFormat(HDC,int, unsigned int, LPPIXELFORMATDESCRIPTOR);
+WGLAPI int   GLAPIENTRY wglGetLayerPaletteEntries(HDC, int, int, int,COLORREF *);
+WGLAPI int   GLAPIENTRY wglGetPixelFormat(HDC hdc);
+WGLAPI int   GLAPIENTRY wglMakeCurrent(HDC, HGLRC);
+WGLAPI int   GLAPIENTRY wglRealizeLayerPalette(HDC, int, int);
+WGLAPI int   GLAPIENTRY wglSetLayerPaletteEntries(HDC, int, int, int,const COLORREF *);
+WGLAPI int   GLAPIENTRY wglShareLists(HGLRC, HGLRC);
+WGLAPI int   GLAPIENTRY wglSwapLayerBuffers(HDC, unsigned int);
+WGLAPI int   GLAPIENTRY wglUseFontBitmapsA(HDC, unsigned long, unsigned long, unsigned long);
+WGLAPI int   GLAPIENTRY wglUseFontBitmapsW(HDC, unsigned long, unsigned long, unsigned long);
+WGLAPI int   GLAPIENTRY wglUseFontOutlinesA(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
+WGLAPI int   GLAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
+WGLAPI int   GLAPIENTRY SwapBuffers(HDC);
+WGLAPI int   GLAPIENTRY ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR *);
+WGLAPI int   GLAPIENTRY DescribePixelFormat(HDC,int,unsigned int,LPPIXELFORMATDESCRIPTOR);
+WGLAPI int   GLAPIENTRY GetPixelFormat(HDC);
+WGLAPI int   GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);
+
+#ifdef _MSC_VER
+#  pragma warning( pop )
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _mesa_wgl_h_ */

include/GL/osmesa.h

@@ -1,8 +1,8 @@
-/* $Id: osmesa.h,v 1.6 2000/09/08 16:41:38 brianp Exp $ */
+/* $Id: osmesa.h,v 1.1.1.1.2.2 2000/02/09 18:53:55 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  3.2
  * 
  * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
@@ -50,20 +50,23 @@
  */
 
 
+
 #ifndef OSMESA_H
 #define OSMESA_H
 
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
-#include <GL/gl.h>
+#include "GL/gl.h"
+
 
 
 #define OSMESA_MAJOR_VERSION 3
-#define OSMESA_MINOR_VERSION 5
+#define OSMESA_MINOR_VERSION 2
 
 
 
@@ -96,6 +99,7 @@ extern "C" {
 #define OSMESA_TYPE		0x23
 
 
+
 typedef struct osmesa_context *OSMesaContext;
 
 
@@ -114,31 +118,18 @@ typedef struct osmesa_context *OSMesaContext;
  *                     display lists.  NULL indicates no sharing.
  * Return:  an OSMesaContext or 0 if error
  */
-GLAPI OSMesaContext GLAPIENTRY
-OSMesaCreateContext( GLenum format, OSMesaContext sharelist );
+GLAPI OSMesaContext GLAPIENTRY OSMesaCreateContext( GLenum format,
+                                          OSMesaContext sharelist );
 
 
 
-/*
- * Create an Off-Screen Mesa rendering context and specify desired
- * size of depth buffer, stencil buffer and accumulation buffer.
- * If you specify zero for depthBits, stencilBits, accumBits you
- * can save some memory.
- *
- * New in Mesa 3.5
- */
-GLAPI OSMesaContext GLAPIENTRY
-OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
-                        GLint accumBits, OSMesaContext sharelist);
-
 
 /*
  * Destroy an Off-Screen Mesa rendering context.
  *
  * Input:  ctx - the context to destroy
  */
-GLAPI void GLAPIENTRY
-OSMesaDestroyContext( OSMesaContext ctx );
+GLAPI void GLAPIENTRY OSMesaDestroyContext( OSMesaContext ctx );
 
 
 
@@ -169,9 +160,9 @@ OSMesaDestroyContext( OSMesaContext ctx );
  *          invalid buffer address, type!=GL_UNSIGNED_BYTE, width<1, height<1,
  *          width>internal limit or height>internal limit.
  */
-GLAPI GLboolean GLAPIENTRY
-OSMesaMakeCurrent( OSMesaContext ctx, void *buffer, GLenum type,
-                   GLsizei width, GLsizei height );
+GLAPI GLboolean GLAPIENTRY OSMesaMakeCurrent( OSMesaContext ctx,
+                                    void *buffer, GLenum type,
+                                    GLsizei width, GLsizei height );
 
 
 
@@ -179,8 +170,7 @@ OSMesaMakeCurrent( OSMesaContext ctx, void *buffer, GLenum type,
 /*
  * Return the current Off-Screen Mesa rendering context handle.
  */
-GLAPI OSMesaContext GLAPIENTRY
-OSMesaGetCurrentContext( void );
+GLAPI OSMesaContext GLAPIENTRY OSMesaGetCurrentContext( void );
 
 
 
@@ -197,13 +187,12 @@ OSMesaGetCurrentContext( void );
  *
  * New in version 2.0.
  */
-GLAPI void GLAPIENTRY
-OSMesaPixelStore( GLint pname, GLint value );
+GLAPI void GLAPIENTRY OSMesaPixelStore( GLint pname, GLint value );
 
 
 
 /*
- * Return an integer value like glGetIntegerv.
+ * Return context info.  This is like glGetIntegerv.
  * Input:  pname -
  *                 OSMESA_WIDTH  return current image width
  *                 OSMESA_HEIGHT  return current image height
@@ -213,8 +202,7 @@ OSMesaPixelStore( GLint pname, GLint value );
  *                 OSMESA_Y_UP returns 1 or 0 to indicate Y axis direction
  *         value - pointer to integer in which to return result.
  */
-GLAPI void GLAPIENTRY
-OSMesaGetIntegerv( GLint pname, GLint *value );
+GLAPI void GLAPIENTRY OSMesaGetIntegerv( GLint pname, GLint *value );
 
 
 
@@ -228,27 +216,12 @@ OSMesaGetIntegerv( GLint pname, GLint *value );
  *
  * New in Mesa 2.4.
  */
-GLAPI GLboolean GLAPIENTRY
-OSMesaGetDepthBuffer( OSMesaContext c, GLint *width, GLint *height,
-                      GLint *bytesPerValue, void **buffer );
+GLAPI GLboolean GLAPIENTRY OSMesaGetDepthBuffer( OSMesaContext c,
+                                       GLint *width, GLint *height,
+                                       GLint *bytesPerValue, void **buffer );
 
 
 
-/*
- * Return the color buffer associated with an OSMesa context.
- * Input:  c - the OSMesa context
- * Output:  width, height - size of buffer in pixels
- *          format - buffer format (OSMESA_FORMAT)
- *          buffer - pointer to depth buffer values
- * Return:  GL_TRUE or GL_FALSE to indicate success or failure.
- *
- * New in Mesa 3.3.
- */
-GLAPI GLboolean GLAPIENTRY
-OSMesaGetColorBuffer( OSMesaContext c, GLint *width, GLint *height,
-                      GLint *format, void **buffer );
-
-
 
 #if defined(__BEOS__) || defined(__QUICKDRAW__)
 #pragma export off

include/GL/svgamesa.h

@@ -1,9 +1,9 @@
-/* $Id: svgamesa.h,v 1.5 2001/06/20 19:52:11 brianp Exp $ */
+/* $Id: svgamesa.h,v 1.1.1.1.2.2 2000/01/22 19:58:02 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
- * Copyright (C) 1995-2001  Brian Paul
+ * Version:  3.2
+ * Copyright (C) 1995-2000  Brian Paul
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -53,7 +53,7 @@
 
 
 #define SVGAMESA_MAJOR_VERSION 3
-#define SVGAMESA_MINOR_VERSION 5
+#define SVGAMESA_MINOR_VERSION 2
 
 
 #ifdef __cplusplus

include/GL/vms_x_fix.h

@@ -1,880 +0,0 @@
-/***************************************************************************
- *                                                                         *
- * Repair definitions of Xlib when compileing with /name=(as_is) on VMS    *
- *                                                                         *
- * Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl)                        *
- *                                                                         *
- * Last revision : 22 August 2000                                          *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef VMS_X_FIX
-#define VMS_X_FIX
-
-#define _XRegisterFilterByType _XREGISTERFILTERBYTYPE 
-#define XAllocClassHint XALLOCCLASSHINT
-#define XAllocColor XALLOCCOLOR
-#define XAllocColorCells XALLOCCOLORCELLS
-#define XAllocSizeHints XALLOCSIZEHINTS
-#define XAllocWMHints XALLOCWMHINTS
-#define XAutoRepeatOff XAUTOREPEATOFF
-#define XAutoRepeatOn XAUTOREPEATON
-#define XBaseFontNameListOfFontSet XBASEFONTNAMELISTOFFONTSET
-#define XBell XBELL
-#define XBitmapPad XBITMAPPAD
-#define XChangeActivePointerGrab XCHANGEACTIVEPOINTERGRAB
-#define XChangeGC XCHANGEGC
-#define XChangeProperty XCHANGEPROPERTY
-#define XChangeWindowAttributes XCHANGEWINDOWATTRIBUTES
-#define XCheckIfEvent XCHECKIFEVENT
-#define XCheckMaskEvent XCHECKMASKEVENT
-#define XCheckTypedWindowEvent XCHECKTYPEDWINDOWEVENT
-#define XCheckWindowEvent XCHECKWINDOWEVENT
-#define XClearArea XCLEARAREA
-#define XClearWindow XCLEARWINDOW
-#define XClipBox XCLIPBOX
-#define XCloseDisplay XCLOSEDISPLAY
-#define XCloseIM XCLOSEIM
-#define XConfigureWindow XCONFIGUREWINDOW
-#define XConvertSelection XCONVERTSELECTION
-#define XCopyArea XCOPYAREA
-#define XCopyGC XCOPYGC
-#define XCopyPlane XCOPYPLANE
-#define XCreateBitmapFromData XCREATEBITMAPFROMDATA
-#define XCreateColormap XCREATECOLORMAP
-#define XCreateFontCursor XCREATEFONTCURSOR
-#define XCreateFontSet XCREATEFONTSET
-#define XCreateGC XCREATEGC
-#define XCreateIC XCREATEIC
-#define XCreateImage XCREATEIMAGE
-#define XCreatePixmap XCREATEPIXMAP
-#define XCreatePixmapCursor XCREATEPIXMAPCURSOR
-#define XCreatePixmapFromBitmapData XCREATEPIXMAPFROMBITMAPDATA
-#define XCreateRegion XCREATEREGION
-#define XCreateSimpleWindow XCREATESIMPLEWINDOW
-#define XCreateWindow XCREATEWINDOW
-#define XDefaultScreenOfDisplay XDEFAULTSCREENOFDISPLAY
-#define XDefineCursor XDEFINECURSOR
-#define XDeleteProperty XDELETEPROPERTY
-#define XDestroyIC XDESTROYIC
-#define XDestroyRegion XDESTROYREGION
-#define XDestroyWindow XDESTROYWINDOW
-#define XDisplayName XDISPLAYNAME
-#define XDisplayOfScreen XDISPLAYOFSCREEN
-#define XDrawArc XDRAWARC
-#define XDrawImageString XDRAWIMAGESTRING
-#define XDrawImageString16 XDRAWIMAGESTRING16
-#define XDrawLine XDRAWLINE
-#define XDrawLines XDRAWLINES
-#define XDrawPoint XDRAWPOINT
-#define XDrawPoints XDRAWPOINTS
-#define XDrawRectangle XDRAWRECTANGLE
-#define XDrawSegments XDRAWSEGMENTS
-#define XDrawString XDRAWSTRING
-#define XDrawString16 XDRAWSTRING16
-#define XEmptyRegion XEMPTYREGION
-#define XEqualRegion XEQUALREGION
-#define XEventsQueued XEVENTSQUEUED
-#define XExtentsOfFontSet XEXTENTSOFFONTSET
-#define XFillArc XFILLARC
-#define XFillPolygon XFILLPOLYGON
-#define XFillRectangle XFILLRECTANGLE
-#define XFillRectangles XFILLRECTANGLES
-#define XFilterEvent XFILTEREVENT
-#define XFlush XFLUSH
-#define XFontsOfFontSet XFONTSOFFONTSET
-#define XFree XFREE
-#define XFreeColormap XFREECOLORMAP
-#define XFreeColors XFREECOLORS
-#define XFreeCursor XFREECURSOR
-#define XFreeFont XFREEFONT
-#define XFreeFontInfo XFREEFONTINFO
-#define XFreeFontNames XFREEFONTNAMES
-#define XFreeFontSet XFREEFONTSET
-#define XFreeGC XFREEGC
-#define XFreeModifiermap XFREEMODIFIERMAP
-#define XFreePixmap XFREEPIXMAP
-#define XFreeStringList XFREESTRINGLIST
-#define XGetAtomName XGETATOMNAME
-#define XGetDefault XGETDEFAULT
-#define XGetErrorDatabaseText XGETERRORDATABASETEXT
-#define XGetErrorText XGETERRORTEXT
-#define XGetFontProperty XGETFONTPROPERTY
-#define XGetGCValues XGETGCVALUES
-#define XGetGeometry XGETGEOMETRY
-#define XGetICValues XGETICVALUES
-#define XGetIMValues XGETIMVALUES
-#define XGetImage XGETIMAGE
-#define XGetKeyboardControl XGETKEYBOARDCONTROL
-#define XGetModifierMapping XGETMODIFIERMAPPING
-#define XGetMotionEvents XGETMOTIONEVENTS
-#define XGetNormalHints XGETNORMALHINTS
-#define XGetSelectionOwner XGETSELECTIONOWNER
-#define XGetSubImage XGETSUBIMAGE
-#define XGetVisualInfo XGETVISUALINFO
-#define XGetWMColormapWindows XGETWMCOLORMAPWINDOWS
-#define XGetWMHints XGETWMHINTS
-#define XGetWMName XGETWMNAME
-#define XGetWMNormalHints XGETWMNORMALHINTS
-#define XGetWindowAttributes XGETWINDOWATTRIBUTES
-#define XGetWindowProperty XGETWINDOWPROPERTY
-#define XGrabKeyboard XGRABKEYBOARD
-#define XGrabPointer XGRABPOINTER
-#define XGrabServer XGRABSERVER
-#define XHeightOfScreen XHEIGHTOFSCREEN
-#define XIfEvent XIFEVENT
-#define XInternAtom XINTERNATOM
-#define XIntersectRegion XINTERSECTREGION
-#define XKeycodeToKeysym XKEYCODETOKEYSYM
-#define XKeysymToKeycode XKEYSYMTOKEYCODE
-#define XKeysymToString XKEYSYMTOSTRING
-#define XListFonts XLISTFONTS
-#define XListFontsWithInfo XLISTFONTSWITHINFO
-#define XListPixmapFormats XLISTPIXMAPFORMATS
-#define XListProperties XLISTPROPERTIES
-#define XLoadQueryFont XLOADQUERYFONT
-#define XLookupString XLOOKUPSTRING
-#define XLowerWindow XLOWERWINDOW
-#define XMapRaised XMAPRAISED
-#define XMapWindow XMAPWINDOW
-#define XMatchVisualInfo XMATCHVISUALINFO
-#define XMoveResizeWindow XMOVERESIZEWINDOW
-#define XMoveWindow XMOVEWINDOW
-#define XNextEvent XNEXTEVENT
-#define XOffsetRegion XOFFSETREGION
-#define XOpenDisplay XOPENDISPLAY
-#define XOpenIM XOPENIM
-#define XParseColor XPARSECOLOR
-#define XParseGeometry XPARSEGEOMETRY
-#define XPeekEvent XPEEKEVENT
-#define XPending XPENDING
-#define XPointInRegion XPOINTINREGION
-#define XPolygonRegion XPOLYGONREGION
-#define XPutBackEvent XPUTBACKEVENT
-#define XPutImage XPUTIMAGE
-#define XQueryColor XQUERYCOLOR
-#define XQueryColors XQUERYCOLORS
-#define XQueryExtension XQUERYEXTENSION
-#define XQueryPointer XQUERYPOINTER
-#define XQueryTree XQUERYTREE
-#define XRaiseWindow XRAISEWINDOW
-#define XReconfigureWMWindow XRECONFIGUREWMWINDOW
-#define XRectInRegion XRECTINREGION
-#define XRefreshKeyboardMapping XREFRESHKEYBOARDMAPPING
-#define XReparentWindow XREPARENTWINDOW
-#define XResizeWindow XRESIZEWINDOW
-#define XRestackWindows XRESTACKWINDOWS
-#define XRootWindowOfScreen XROOTWINDOWOFSCREEN
-#define XScreenNumberOfScreen XSCREENNUMBEROFSCREEN
-#define XSelectAsyncEvent XSELECTASYNCEVENT
-#define XSelectAsyncInput XSELECTASYNCINPUT
-#define XSelectInput XSELECTINPUT
-#define XSendEvent XSENDEVENT
-#define XServerVendor XSERVERVENDOR
-#define XSetBackground XSETBACKGROUND
-#define XSetClassHint XSETCLASSHINT
-#define XSetClipMask XSETCLIPMASK
-#define XSetClipOrigin XSETCLIPORIGIN
-#define XSetClipRectangles XSETCLIPRECTANGLES
-#define XSetCloseDownMode XSETCLOSEDOWNMODE
-#define XSetCommand XSETCOMMAND
-#define XSetDashes XSETDASHES
-#define XSetErrorHandler XSETERRORHANDLER
-#define XSetFillStyle XSETFILLSTYLE
-#define XSetFont XSETFONT
-#define XSetForeground XSETFOREGROUND
-#define XSetFunction XSETFUNCTION
-#define XSetGraphicsExposures XSETGRAPHICSEXPOSURES
-#define XSetICFocus XSETICFOCUS
-#define XSetICValues XSETICVALUES
-#define XSetIOErrorHandler XSETIOERRORHANDLER
-#define XSetInputFocus XSETINPUTFOCUS
-#define XSetLineAttributes XSETLINEATTRIBUTES
-#define XSetLocaleModifiers XSETLOCALEMODIFIERS
-#define XSetNormalHints XSETNORMALHINTS
-#define XSetRegion XSETREGION
-#define XSetSelectionOwner XSETSELECTIONOWNER
-#define XSetStipple XSETSTIPPLE
-#define XSetSubwindowMode XSETSUBWINDOWMODE
-#define XSetTSOrigin XSETTSORIGIN
-#define XSetTile XSETTILE
-#define XSetTransientForHint XSETTRANSIENTFORHINT
-#define XSetWMColormapWindows XSETWMCOLORMAPWINDOWS
-#define XSetWMHints XSETWMHINTS
-#define XSetWMIconName XSETWMICONNAME
-#define XSetWMName XSETWMNAME
-#define XSetWMNormalHints XSETWMNORMALHINTS
-#define XSetWMProperties XSETWMPROPERTIES
-#define XSetWMProtocols XSETWMPROTOCOLS
-#define XSetWindowBackground XSETWINDOWBACKGROUND
-#define XSetWindowBackgroundPixmap XSETWINDOWBACKGROUNDPIXMAP
-#define XSetWindowColormap XSETWINDOWCOLORMAP
-#define XShapeCombineMask XSHAPECOMBINEMASK
-#define XShapeCombineRectangles XSHAPECOMBINERECTANGLES
-#define XShapeGetRectangles XSHAPEGETRECTANGLES
-#define XShrinkRegion XSHRINKREGION
-#define XStoreColor XSTORECOLOR
-#define XStoreColors XSTORECOLORS
-#define XStoreName XSTORENAME
-#define XStringToKeysym XSTRINGTOKEYSYM
-#define XSubtractRegion XSUBTRACTREGION
-#define XSupportsLocale XSUPPORTSLOCALE
-#define XSync XSYNC
-#define XSynchronize XSYNCHRONIZE
-#define XTextExtents XTEXTEXTENTS
-#define XTextExtents16 XTEXTEXTENTS16
-#define XTextWidth XTEXTWIDTH
-#define XTextWidth16 XTEXTWIDTH16
-#define XTranslateCoordinates XTRANSLATECOORDINATES
-#define XUndefineCursor XUNDEFINECURSOR
-#define XUngrabKeyboard XUNGRABKEYBOARD
-#define XUngrabPointer XUNGRABPOINTER
-#define XUngrabServer XUNGRABSERVER
-#define XUnionRectWithRegion XUNIONRECTWITHREGION
-#define XUnionRegion XUNIONREGION
-#define XUnmapWindow XUNMAPWINDOW
-#define _XUnregisterFilter _XUNREGISTERFILTER
-#define XUnsetICFocus XUNSETICFOCUS
-#define XVaCreateNestedList XVACREATENESTEDLIST
-#define XVisualIDFromVisual XVISUALIDFROMVISUAL
-#define XWidthOfScreen XWIDTHOFSCREEN
-#define XWindowEvent XWINDOWEVENT
-#define XWithdrawWindow XWITHDRAWWINDOW
-#define XXorRegion XXORREGION
-#define XmAddProtocolCallback XMADDPROTOCOLCALLBACK
-#define XmAddProtocols XMADDPROTOCOLS
-#define XmChangeColor XMCHANGECOLOR
-#define XmClipboardCopy XMCLIPBOARDCOPY
-#define XmClipboardEndCopy XMCLIPBOARDENDCOPY
-#define XmClipboardInquireLength XMCLIPBOARDINQUIRELENGTH
-#define XmClipboardLock XMCLIPBOARDLOCK
-#define XmClipboardRetrieve XMCLIPBOARDRETRIEVE
-#define XmClipboardStartCopy XMCLIPBOARDSTARTCOPY
-#define XmClipboardUnlock XMCLIPBOARDUNLOCK
-#define XmCreateArrowButton XMCREATEARROWBUTTON
-#define XmCreateArrowButtonGadget XMCREATEARROWBUTTONGADGET
-#define XmCreateCascadeButton XMCREATECASCADEBUTTON
-#define XmCreateDialogShell XMCREATEDIALOGSHELL
-#define XmCreateDragIcon XMCREATEDRAGICON
-#define XmCreateDrawingArea XMCREATEDRAWINGAREA
-#define XmCreateDrawnButton XMCREATEDRAWNBUTTON
-#define XmCreateFileSelectionBox XMCREATEFILESELECTIONBOX
-#define XmCreateFileSelectionDialog XMCREATEFILESELECTIONDIALOG
-#define XmCreateForm XMCREATEFORM
-#define XmCreateFormDialog XMCREATEFORMDIALOG
-#define XmCreateFrame XMCREATEFRAME
-#define XmCreateInformationDialog XMCREATEINFORMATIONDIALOG
-#define XmCreateLabelGadget XMCREATELABELGADGET
-#define XmCreateMainWindow XMCREATEMAINWINDOW
-#define XmCreateMenuBar XMCREATEMENUBAR
-#define XmCreateMessageBox XMCREATEMESSAGEBOX
-#define XmCreateMessageDialog XMCREATEMESSAGEDIALOG
-#define XmCreateOptionMenu XMCREATEOPTIONMENU
-#define XmCreatePanedWindow XMCREATEPANEDWINDOW
-#define XmCreatePopupMenu XMCREATEPOPUPMENU
-#define XmCreatePromptDialog XMCREATEPROMPTDIALOG
-#define XmCreatePulldownMenu XMCREATEPULLDOWNMENU
-#define XmCreatePushButton XMCREATEPUSHBUTTON
-#define XmCreatePushButtonGadget XMCREATEPUSHBUTTONGADGET
-#define XmCreateQuestionDialog XMCREATEQUESTIONDIALOG
-#define XmCreateRadioBox XMCREATERADIOBOX
-#define XmCreateRowColumn XMCREATEROWCOLUMN
-#define XmCreateScale XMCREATESCALE
-#define XmCreateScrollBar XMCREATESCROLLBAR
-#define XmCreateScrolledList XMCREATESCROLLEDLIST
-#define XmCreateScrolledText XMCREATESCROLLEDTEXT
-#define XmCreateScrolledWindow XMCREATESCROLLEDWINDOW
-#define XmCreateSelectionDialog XMCREATESELECTIONDIALOG
-#define XmCreateSeparator XMCREATESEPARATOR
-#define XmCreateSeparatorGadget XMCREATESEPARATORGADGET
-#define XmCreateTemplateDialog XMCREATETEMPLATEDIALOG
-#define XmCreateText XMCREATETEXT
-#define XmCreateTextField XMCREATETEXTFIELD
-#define XmCreateToggleButton XMCREATETOGGLEBUTTON
-#define XmCreateToggleButtonGadget XMCREATETOGGLEBUTTONGADGET
-#define XmDragStart XMDRAGSTART
-#define XmDropSiteRegister XMDROPSITEREGISTER
-#define XmDropSiteUnregister XMDROPSITEUNREGISTER
-#define XmDropSiteUpdate XMDROPSITEUPDATE
-#define XmDropTransferStart XMDROPTRANSFERSTART
-#define XmFileSelectionBoxGetChild XMFILESELECTIONBOXGETCHILD
-#define XmFileSelectionDoSearch XMFILESELECTIONDOSEARCH
-#define XmFontListAppendEntry XMFONTLISTAPPENDENTRY
-#define XmFontListCopy XMFONTLISTCOPY
-#define XmFontListCreate XMFONTLISTCREATE
-#define XmFontListEntryCreate XMFONTLISTENTRYCREATE
-#define XmFontListEntryFree XMFONTLISTENTRYFREE
-#define XmFontListEntryGetFont XMFONTLISTENTRYGETFONT
-#define XmFontListEntryGetTag XMFONTLISTENTRYGETTAG
-#define XmFontListEntryLoad XMFONTLISTENTRYLOAD
-#define XmFontListFree XMFONTLISTFREE
-#define XmFontListFreeFontContext XMFONTLISTFREEFONTCONTEXT
-#define XmFontListGetNextFont XMFONTLISTGETNEXTFONT
-#define XmFontListInitFontContext XMFONTLISTINITFONTCONTEXT
-#define XmFontListNextEntry XMFONTLISTNEXTENTRY
-#define XmGetColors XMGETCOLORS
-#define XmGetFocusWidget XMGETFOCUSWIDGET
-#define XmGetMenuCursor XMGETMENUCURSOR
-#define XmGetPixmapByDepth XMGETPIXMAPBYDEPTH
-#define XmGetTearOffControl XMGETTEAROFFCONTROL
-#define XmGetXmDisplay XMGETXMDISPLAY
-#define XmImMbLookupString XMIMMBLOOKUPSTRING
-#define XmImRegister XMIMREGISTER
-#define XmImSetFocusValues XMIMSETFOCUSVALUES
-#define XmImSetValues XMIMSETVALUES
-#define XmImUnregister XMIMUNREGISTER
-#define XmImUnsetFocus XMIMUNSETFOCUS
-#define XmInternAtom XMINTERNATOM
-#define XmIsMotifWMRunning XMISMOTIFWMRUNNING
-#define XmListAddItem XMLISTADDITEM
-#define XmListAddItemUnselected XMLISTADDITEMUNSELECTED
-#define XmListAddItemsUnselected XMLISTADDITEMSUNSELECTED
-#define XmListDeleteAllItems XMLISTDELETEALLITEMS
-#define XmListDeleteItemsPos XMLISTDELETEITEMSPOS
-#define XmListDeletePos XMLISTDELETEPOS
-#define XmListDeselectAllItems XMLISTDESELECTALLITEMS
-#define XmListDeselectPos XMLISTDESELECTPOS
-#define XmListGetKbdItemPos XMLISTGETKBDITEMPOS
-#define XmListGetMatchPos XMLISTGETMATCHPOS
-#define XmListGetSelectedPos XMLISTGETSELECTEDPOS
-#define XmListPosSelected XMLISTPOSSELECTED
-#define XmListSelectItem XMLISTSELECTITEM
-#define XmListSelectPos XMLISTSELECTPOS
-#define XmListSetBottomPos XMLISTSETBOTTOMPOS
-#define XmListSetItem XMLISTSETITEM
-#define XmListSetKbdItemPos XMLISTSETKBDITEMPOS
-#define XmListSetPos XMLISTSETPOS
-#define XmMainWindowSetAreas XMMAINWINDOWSETAREAS
-#define XmMenuPosition XMMENUPOSITION
-#define XmMessageBoxGetChild XMMESSAGEBOXGETCHILD
-#define XmOptionButtonGadget XMOPTIONBUTTONGADGET
-#define XmOptionLabelGadget XMOPTIONLABELGADGET
-#define XmProcessTraversal XMPROCESSTRAVERSAL
-#define XmQmotif XMQMOTIF
-#define XmRemoveProtocolCallback XMREMOVEPROTOCOLCALLBACK
-#define XmRepTypeGetId XMREPTYPEGETID
-#define XmRepTypeGetRecord XMREPTYPEGETRECORD
-#define XmRepTypeRegister XMREPTYPEREGISTER
-#define XmRepTypeValidValue XMREPTYPEVALIDVALUE
-#define XmScrollBarSetValues XMSCROLLBARSETVALUES
-#define XmScrolledWindowSetAreas XMSCROLLEDWINDOWSETAREAS
-#define XmSelectionBoxGetChild XMSELECTIONBOXGETCHILD
-#define XmStringByteCompare XMSTRINGBYTECOMPARE
-#define XmStringCompare XMSTRINGCOMPARE
-#define XmStringConcat XMSTRINGCONCAT
-#define XmStringCopy XMSTRINGCOPY
-#define XmStringCreate XMSTRINGCREATE
-#define XmStringCreateLocalized XMSTRINGCREATELOCALIZED
-#define XmStringCreateLtoR XMSTRINGCREATELTOR
-#define XmStringCreateSimple XMSTRINGCREATESIMPLE
-#define XmStringDraw XMSTRINGDRAW
-#define XmStringDrawUnderline XMSTRINGDRAWUNDERLINE
-#define XmStringExtent XMSTRINGEXTENT
-#define XmStringFree XMSTRINGFREE
-#define XmStringFreeContext XMSTRINGFREECONTEXT
-#define XmStringGetLtoR XMSTRINGGETLTOR
-#define XmStringGetNextComponent XMSTRINGGETNEXTCOMPONENT
-#define XmStringGetNextSegment XMSTRINGGETNEXTSEGMENT
-#define XmStringInitContext XMSTRINGINITCONTEXT
-#define XmStringLength XMSTRINGLENGTH
-#define XmStringLtoRCreate XMSTRINGLTORCREATE
-#define XmStringNConcat XMSTRINGNCONCAT
-#define XmStringSegmentCreate XMSTRINGSEGMENTCREATE
-#define XmStringWidth XMSTRINGWIDTH
-#define XmTextClearSelection XMTEXTCLEARSELECTION
-#define XmTextFieldGetEditable XMTEXTFIELDGETEDITABLE
-#define XmTextFieldGetInsertionPosition XMTEXTFIELDGETINSERTIONPOSITION
-#define XmTextFieldGetLastPosition XMTEXTFIELDGETLASTPOSITION
-#define XmTextFieldGetSelection XMTEXTFIELDGETSELECTION
-#define XmTextFieldGetString XMTEXTFIELDGETSTRING
-#define XmTextFieldInsert XMTEXTFIELDINSERT
-#define XmTextFieldRemove XMTEXTFIELDREMOVE
-#define XmTextFieldSetSelection XMTEXTFIELDSETSELECTION
-#define XmTextFieldSetString XMTEXTFIELDSETSTRING
-#define XmTextGetCursorPosition XMTEXTGETCURSORPOSITION
-#define XmTextGetInsertionPosition XMTEXTGETINSERTIONPOSITION
-#define XmTextGetLastPosition XMTEXTGETLASTPOSITION
-#define XmTextGetMaxLength XMTEXTGETMAXLENGTH
-#define XmTextGetSelection XMTEXTGETSELECTION
-#define XmTextGetSelectionPosition XMTEXTGETSELECTIONPOSITION
-#define XmTextGetString XMTEXTGETSTRING
-#define XmTextInsert XMTEXTINSERT
-#define XmTextRemove XMTEXTREMOVE
-#define XmTextReplace XMTEXTREPLACE
-#define XmTextSetCursorPosition XMTEXTSETCURSORPOSITION
-#define XmTextSetHighlight XMTEXTSETHIGHLIGHT
-#define XmTextSetInsertionPosition XMTEXTSETINSERTIONPOSITION
-#define XmTextSetSelection XMTEXTSETSELECTION
-#define XmTextSetString XMTEXTSETSTRING
-#define XmToggleButtonGadgetGetState XMTOGGLEBUTTONGADGETGETSTATE
-#define XmToggleButtonGadgetSetState XMTOGGLEBUTTONGADGETSETSTATE
-#define XmToggleButtonGetState XMTOGGLEBUTTONGETSTATE
-#define XmToggleButtonSetState XMTOGGLEBUTTONSETSTATE
-#define XmUpdateDisplay XMUPDATEDISPLAY
-#define XmVaCreateSimpleRadioBox XMVACREATESIMPLERADIOBOX
-#define XmbDrawString XMBDRAWSTRING
-#define XmbLookupString XMBLOOKUPSTRING
-#define XmbResetIC XMBRESETIC
-#define XmbSetWMProperties XMBSETWMPROPERTIES
-#define XmbTextEscapement XMBTEXTESCAPEMENT
-#define XmbTextExtents XMBTEXTEXTENTS
-#define XmbTextListToTextProperty XMBTEXTLISTTOTEXTPROPERTY
-#define XmbTextPropertyToTextList XMBTEXTPROPERTYTOTEXTLIST
-#define XmuClientWindow XMUCLIENTWINDOW
-#define XmuPrintDefaultErrorMessage XMUPRINTDEFAULTERRORMESSAGE
-#define XrmGetDatabase XRMGETDATABASE
-#define XrmGetResource XRMGETRESOURCE
-#define XrmPutStringResource XRMPUTSTRINGRESOURCE
-#define XrmQuarkToString XRMQUARKTOSTRING
-#define XrmStringToQuark XRMSTRINGTOQUARK
-#define XtAddCallback XTADDCALLBACK
-#define XtAddCallbacks XTADDCALLBACKS
-#define XtAddEventHandler XTADDEVENTHANDLER
-#define XtAddGrab XTADDGRAB
-#define XtAllocateGC XTALLOCATEGC
-#define XtAppAddActions XTAPPADDACTIONS
-#define XtAppAddInput XTAPPADDINPUT
-#define XtAppAddTimeOut XTAPPADDTIMEOUT
-#define XtAppCreateShell XTAPPCREATESHELL
-#define XtAppInitialize XTAPPINITIALIZE
-#define XtAppNextEvent XTAPPNEXTEVENT
-#define XtAppPeekEvent XTAPPPEEKEVENT
-#define XtAppPending XTAPPPENDING
-#define XtAppProcessEvent XTAPPPROCESSEVENT
-#define XtAppSetErrorHandler XTAPPSETERRORHANDLER
-#define XtAppSetFallbackResources XTAPPSETFALLBACKRESOURCES
-#define XtAppSetWarningHandler XTAPPSETWARNINGHANDLER
-#define XtAppSetWarningMsgHandler XTAPPSETWARNINGMSGHANDLER
-#define XtAppWarning XTAPPWARNING
-#define XtCallActionProc XTCALLACTIONPROC
-#define XtCallCallbackList XTCALLCALLBACKLIST
-#define XtCallCallbacks XTCALLCALLBACKS
-#define XtConfigureWidget XTCONFIGUREWIDGET
-#define XtConvertAndStore XTCONVERTANDSTORE
-#define XtCreateApplicationContext XTCREATEAPPLICATIONCONTEXT
-#define XtCreateManagedWidget XTCREATEMANAGEDWIDGET
-#define XtCreatePopupShell XTCREATEPOPUPSHELL
-#define XtCreateWidget XTCREATEWIDGET
-#define XtDatabase XTDATABASE
-#define XtDestroyWidget XTDESTROYWIDGET
-#define XtDisownSelection XTDISOWNSELECTION
-#define XtDispatchEvent XTDISPATCHEVENT
-#define XtDisplayOfObject XTDISPLAYOFOBJECT
-#define XtDisplayStringConvWarning XTDISPLAYSTRINGCONVWARNING
-#define XtDisplayToApplicationContext XTDISPLAYTOAPPLICATIONCONTEXT
-#define XtAppAddWorkProc XTAPPADDWORKPROC
-#define XtRemoveWorkProc XTREMOVEWORKPROC
-#define XtFree XTFREE
-#define XtGetActionKeysym XTGETACTIONKEYSYM
-#define XtGetActionList XTGETACTIONLIST
-#define XtGetApplicationNameAndClass XTGETAPPLICATIONNAMEANDCLASS
-#define XtGetApplicationResources XTGETAPPLICATIONRESOURCES
-#define XtGetGC XTGETGC
-#define XtGetMultiClickTime XTGETMULTICLICKTIME
-#define XtGetSelectionValue XTGETSELECTIONVALUE
-#define XtGetSelectionValues XTGETSELECTIONVALUES
-#define XtGetSubresources XTGETSUBRESOURCES
-#define XtGetValues XTGETVALUES
-#define XtGrabKeyboard XTGRABKEYBOARD
-#define XtGrabPointer XTGRABPOINTER
-#define XtHasCallbacks XTHASCALLBACKS
-#define XtInitializeWidgetClass XTINITIALIZEWIDGETCLASS
-#define XtInsertEventHandler XTINSERTEVENTHANDLER
-#define XtIsManaged XTISMANAGED
-#define XtIsObject XTISOBJECT
-#define XtIsSensitive XTISSENSITIVE
-#define XtIsSubclass XTISSUBCLASS
-#define XtLastTimestampProcessed XTLASTTIMESTAMPPROCESSED
-#define XtMakeGeometryRequest XTMAKEGEOMETRYREQUEST
-#define XtMakeResizeRequest XTMAKERESIZEREQUEST
-#define XtMalloc XTMALLOC
-#define XtManageChild XTMANAGECHILD
-#define XtManageChildren XTMANAGECHILDREN
-#define XtMergeArgLists XTMERGEARGLISTS
-#define XtMoveWidget XTMOVEWIDGET
-#define XtName XTNAME
-#define XtNameToWidget XTNAMETOWIDGET
-#define XtOpenDisplay XTOPENDISPLAY
-#define XtOverrideTranslations XTOVERRIDETRANSLATIONS
-#define XtOwnSelection XTOWNSELECTION
-#define XtParseTranslationTable XTPARSETRANSLATIONTABLE
-#define XtPopdown XTPOPDOWN
-#define XtPopup XTPOPUP
-#define XtQueryGeometry XTQUERYGEOMETRY
-#define XtRealizeWidget XTREALIZEWIDGET
-#define XtRealloc XTREALLOC
-#define XtReleaseGC XTRELEASEGC
-#define XtRemoveAllCallbacks XTREMOVEALLCALLBACKS
-#define XtRemoveCallback XTREMOVECALLBACK
-#define XtRemoveEventHandler XTREMOVEEVENTHANDLER
-#define XtRemoveGrab XTREMOVEGRAB
-#define XtRemoveInput XTREMOVEINPUT
-#define XtRemoveTimeOut XTREMOVETIMEOUT
-#define XtResizeWidget XTRESIZEWIDGET
-#define XtResolvePathname XTRESOLVEPATHNAME
-#define XtSetKeyboardFocus XTSETKEYBOARDFOCUS
-#define XtSetMappedWhenManaged XTSETMAPPEDWHENMANAGED
-#define XtSetSensitive XTSETSENSITIVE
-#define XtSetTypeConverter XTSETTYPECONVERTER
-#define XtSetValues XTSETVALUES
-#define XtShellStrings XTSHELLSTRINGS
-#define XtStrings XTSTRINGS
-#define XtToolkitInitialize XTTOOLKITINITIALIZE
-#define XtTranslateCoords XTTRANSLATECOORDS
-#define XtTranslateKeycode XTTRANSLATEKEYCODE
-#define XtUngrabKeyboard XTUNGRABKEYBOARD
-#define XtUngrabPointer XTUNGRABPOINTER
-#define XtUnmanageChild XTUNMANAGECHILD
-#define XtUnmanageChildren XTUNMANAGECHILDREN
-#define XtUnrealizeWidget XTUNREALIZEWIDGET
-#define XtVaCreateManagedWidget XTVACREATEMANAGEDWIDGET
-#define XtVaCreateWidget XTVACREATEWIDGET
-#define XtVaGetValues XTVAGETVALUES
-#define XtVaSetValues XTVASETVALUES
-#define XtWarning XTWARNING
-#define XtWidgetToApplicationContext XTWIDGETTOAPPLICATIONCONTEXT
-#define XtWindowOfObject XTWINDOWOFOBJECT
-#define XtWindowToWidget XTWINDOWTOWIDGET
-#define XwcDrawString XWCDRAWSTRING
-#define XwcFreeStringList XWCFREESTRINGLIST
-#define XwcTextEscapement XWCTEXTESCAPEMENT
-#define XwcTextExtents XWCTEXTEXTENTS
-#define XwcTextListToTextProperty XWCTEXTLISTTOTEXTPROPERTY
-#define XwcTextPropertyToTextList XWCTEXTPROPERTYTOTEXTLIST
-#define _XmBottomShadowColorDefault _XMBOTTOMSHADOWCOLORDEFAULT
-#define _XmClearBorder _XMCLEARBORDER
-#define _XmConfigureObject _XMCONFIGUREOBJECT
-#define _XmDestroyParentCallback _XMDESTROYPARENTCALLBACK
-#define _XmDrawArrow _XMDRAWARROW
-#define _XmDrawShadows _XMDRAWSHADOWS
-#define _XmFontListGetDefaultFont _XMFONTLISTGETDEFAULTFONT
-#define _XmFromHorizontalPixels _XMFROMHORIZONTALPIXELS
-#define _XmFromVerticalPixels _XMFROMVERTICALPIXELS
-#define _XmGetClassExtensionPtr _XMGETCLASSEXTENSIONPTR
-#define _XmGetDefaultFontList _XMGETDEFAULTFONTLIST
-#define _XmGetTextualDragIcon _XMGETTEXTUALDRAGICON
-#define _XmGetWidgetExtData _XMGETWIDGETEXTDATA
-#define _XmGrabKeyboard _XMGRABKEYBOARD
-#define _XmGrabPointer _XMGRABPOINTER
-#define _XmInheritClass _XMINHERITCLASS
-#define _XmInputInGadget _XMINPUTINGADGET
-#define _XmMakeGeometryRequest _XMMAKEGEOMETRYREQUEST
-#define _XmMenuPopDown _XMMENUPOPDOWN
-#define _XmMoveObject _XMMOVEOBJECT
-#define _XmNavigChangeManaged _XMNAVIGCHANGEMANAGED
-#define _XmOSBuildFileList _XMOSBUILDFILELIST
-#define _XmOSFileCompare _XMOSFILECOMPARE
-#define _XmOSFindPatternPart _XMOSFINDPATTERNPART
-#define _XmOSQualifyFileSpec _XMOSQUALIFYFILESPEC
-#define _XmPostPopupMenu _XMPOSTPOPUPMENU
-#define _XmPrimitiveEnter _XMPRIMITIVEENTER
-#define _XmPrimitiveLeave _XMPRIMITIVELEAVE
-#define _XmRedisplayGadgets _XMREDISPLAYGADGETS
-#define _XmShellIsExclusive _XMSHELLISEXCLUSIVE
-#define _XmStringDraw _XMSTRINGDRAW
-#define _XmStringGetTextConcat _XMSTRINGGETTEXTCONCAT
-#define _XmStrings _XMSTRINGS
-#define _XmToHorizontalPixels _XMTOHORIZONTALPIXELS
-#define _XmToVerticalPixels _XMTOVERTICALPIXELS
-#define _XmTopShadowColorDefault _XMTOPSHADOWCOLORDEFAULT
-#define _Xm_fastPtr _XM_FASTPTR
-#define _XtCheckSubclassFlag _XTCHECKSUBCLASSFLAG
-#define _XtInherit _XTINHERIT
-#define _XtInheritTranslations _XTINHERITTRANSLATIONS
-#define applicationShellWidgetClass APPLICATIONSHELLWIDGETCLASS
-#define compositeWidgetClass COMPOSITEWIDGETCLASS
-#define overrideShellWidgetClass OVERRIDESHELLWIDGETCLASS
-#define shellWidgetClass SHELLWIDGETCLASS
-#define topLevelShellClassRec TOPLEVELSHELLCLASSREC
-#define topLevelShellWidgetClass TOPLEVELSHELLWIDGETCLASS
-#define transientShellWidgetClass TRANSIENTSHELLWIDGETCLASS
-#define vendorShellClassRec VENDORSHELLCLASSREC
-#define vendorShellWidgetClass VENDORSHELLWIDGETCLASS
-#define wmShellWidgetClass WMSHELLWIDGETCLASS
-#define xmArrowButtonWidgetClass XMARROWBUTTONWIDGETCLASS
-#define xmCascadeButtonClassRec XMCASCADEBUTTONCLASSREC
-#define xmCascadeButtonGadgetClass XMCASCADEBUTTONGADGETCLASS
-#define xmCascadeButtonWidgetClass XMCASCADEBUTTONWIDGETCLASS
-#define xmDialogShellWidgetClass XMDIALOGSHELLWIDGETCLASS
-#define xmDrawingAreaWidgetClass XMDRAWINGAREAWIDGETCLASS
-#define xmDrawnButtonWidgetClass XMDRAWNBUTTONWIDGETCLASS
-#define xmFileSelectionBoxWidgetClass XMFILESELECTIONBOXWIDGETCLASS
-#define xmFormWidgetClass XMFORMWIDGETCLASS
-#define xmFrameWidgetClass XMFRAMEWIDGETCLASS
-#define xmGadgetClass XMGADGETCLASS
-#define xmLabelGadgetClass XMLABELGADGETCLASS
-#define xmLabelWidgetClass XMLABELWIDGETCLASS
-#define xmListWidgetClass XMLISTWIDGETCLASS
-#define xmMainWindowWidgetClass XMMAINWINDOWWIDGETCLASS
-#define xmManagerClassRec XMMANAGERCLASSREC
-#define xmManagerWidgetClass XMMANAGERWIDGETCLASS
-#define xmMenuShellWidgetClass XMMENUSHELLWIDGETCLASS
-#define xmMessageBoxWidgetClass XMMESSAGEBOXWIDGETCLASS
-#define xmPrimitiveClassRec XMPRIMITIVECLASSREC
-#define xmPrimitiveWidgetClass XMPRIMITIVEWIDGETCLASS
-#define xmPushButtonClassRec XMPUSHBUTTONCLASSREC
-#define xmPushButtonGadgetClass XMPUSHBUTTONGADGETCLASS
-#define xmPushButtonWidgetClass XMPUSHBUTTONWIDGETCLASS
-#define xmRowColumnWidgetClass XMROWCOLUMNWIDGETCLASS
-#define xmSashWidgetClass XMSASHWIDGETCLASS
-#define xmScrollBarWidgetClass XMSCROLLBARWIDGETCLASS
-#define xmScrolledWindowClassRec XMSCROLLEDWINDOWCLASSREC
-#define xmScrolledWindowWidgetClass XMSCROLLEDWINDOWWIDGETCLASS
-#define xmSeparatorGadgetClass XMSEPARATORGADGETCLASS
-#define xmSeparatorWidgetClass XMSEPARATORWIDGETCLASS
-#define xmTextFieldWidgetClass XMTEXTFIELDWIDGETCLASS
-#define xmTextWidgetClass XMTEXTWIDGETCLASS
-#define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS
-#define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS
-#define XtRegisterDrawable _XTREGISTERWINDOW
-#define XtUnregisterDrawable _XTUNREGISTERWINDOW
-#define XQueryFont XQUERYFONT
-#define XSetPlaneMask XSETPLANEMASK
-#define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL
-#define XDestroySubwindows XDESTROYSUBWINDOWS
-#define XFreeDeviceList XFREEDEVICELIST
-#define XFreeDeviceState XFREEDEVICESTATE
-#define XGetExtensionVersion XGETEXTENSIONVERSION
-#define XGetRGBColormaps XGETRGBCOLORMAPS
-#define XIconifyWindow XICONIFYWINDOW
-#define XInstallColormap XINSTALLCOLORMAP
-#define XListInputDevices XLISTINPUTDEVICES
-#define XLookupKeysym XLOOKUPKEYSYM
-#define XOpenDevice XOPENDEVICE
-#define XQueryDeviceState XQUERYDEVICESTATE
-#define XSelectExtensionEvent XSELECTEXTENSIONEVENT
-#define XWarpPointer XWARPPOINTER
-#define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP
-#define XAllocNamedColor XALLOCNAMEDCOLOR
-#define XBlackPixelOfScreen XBLACKPIXELOFSCREEN
-#define XDefaultColormap XDEFAULTCOLORMAP
-#define XDefaultColormapOfScreen XDEFAULTCOLORMAPOFSCREEN
-#define XDefaultDepth XDEFAULTDEPTH
-#define XDefaultScreen XDEFAULTSCREEN
-#define XDefaultVisual XDEFAULTVISUAL
-#define XSetIconName XSETICONNAME
-#define XtInitialize XTINITIALIZE
-#define XtMainLoop XTMAINLOOP
-#define DtSaverGetWindows DTSAVERGETWINDOWS
-#define XAddHosts XADDHOSTS
-#define XDisableAccessControl XDISABLEACCESSCONTROL
-#define XEnableAccessControl XENABLEACCESSCONTROL
-#define XFillArcs XFILLARCS
-#define XForceScreenSaver XFORCESCREENSAVER
-#define XGetScreenSaver XGETSCREENSAVER
-#define XListHosts XLISTHOSTS
-#define XReadBitmapFile XREADBITMAPFILE
-#define XRemoveHosts XREMOVEHOSTS
-#define XResetScreenSaver XRESETSCREENSAVER
-#define XResourceManagerString XRESOURCEMANAGERSTRING
-#define XSetScreenSaver XSETSCREENSAVER
-#define XStringListToTextProperty XSTRINGLISTTOTEXTPROPERTY
-#define XrmDestroyDatabase XRMDESTROYDATABASE
-#define XrmGetFileDatabase XRMGETFILEDATABASE
-#define XrmGetStringDatabase XRMGETSTRINGDATABASE
-#define XrmInitialize XRMINITIALIZE
-#define XrmMergeDatabases XRMMERGEDATABASES
-#define XrmParseCommand XRMPARSECOMMAND
-#define XrmPutLineResource XRMPUTLINERESOURCE
-#define XrmQPutStringResource XRMQPUTSTRINGRESOURCE
-#define XrmStringToBindingQuarkList XRMSTRINGTOBINDINGQUARKLIST
-#define XrmStringToQuark XRMSTRINGTOQUARK
-#define XmCreateLabel XMCREATELABEL
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern void XtFree(char*);
-#ifdef __cplusplus
-}
-#endif
-
-#define pthread_attr_create PTHREAD_ATTR_CREATE
-#define pthread_attr_delete PTHREAD_ATTR_DELETE
-#define pthread_attr_destroy PTHREAD_ATTR_DESTROY
-#define pthread_attr_getdetach_np PTHREAD_ATTR_GETDETACH_NP
-#define pthread_attr_getguardsize_np PTHREAD_ATTR_GETGUARDSIZE_NP
-#define pthread_attr_getinheritsched PTHREAD_ATTR_GETINHERITSCHED
-#define pthread_attr_getprio PTHREAD_ATTR_GETPRIO
-#define pthread_attr_getsched PTHREAD_ATTR_GETSCHED
-#define pthread_attr_getschedparam PTHREAD_ATTR_GETSCHEDPARAM
-#define pthread_attr_getstacksize PTHREAD_ATTR_GETSTACKSIZE
-#define pthread_attr_init PTHREAD_ATTR_INIT
-#define pthread_attr_setdetach_np PTHREAD_ATTR_SETDETACH_NP
-#define pthread_attr_setdetachstate PTHREAD_ATTR_SETDETACHSTATE
-#define pthread_attr_setguardsize_np PTHREAD_ATTR_SETGUARDSIZE_NP
-#define pthread_attr_setinheritsched PTHREAD_ATTR_SETINHERITSCHED
-#define pthread_attr_setprio PTHREAD_ATTR_SETPRIO
-#define pthread_attr_setsched PTHREAD_ATTR_SETSCHED
-#define pthread_attr_setschedparam PTHREAD_ATTR_SETSCHEDPARAM
-#define pthread_attr_setschedpolicy PTHREAD_ATTR_SETSCHEDPOLICY
-#define pthread_attr_setstacksize PTHREAD_ATTR_SETSTACKSIZE
-#define pthread_cancel PTHREAD_CANCEL
-#define pthread_cancel_e PTHREAD_CANCEL_E
-#define pthread_cond_broadcast PTHREAD_COND_BROADCAST
-#define pthread_cond_destroy PTHREAD_COND_DESTROY
-#define pthread_cond_init PTHREAD_COND_INIT
-#define pthread_cond_sig_preempt_int_np PTHREAD_COND_SIG_PREEMPT_INT_NP
-#define pthread_cond_signal PTHREAD_COND_SIGNAL
-#define pthread_cond_signal_int_np PTHREAD_COND_SIGNAL_INT_NP
-#define pthread_cond_timedwait PTHREAD_COND_TIMEDWAIT
-#define pthread_cond_wait PTHREAD_COND_WAIT
-#define pthread_condattr_create PTHREAD_CONDATTR_CREATE
-#define pthread_condattr_delete PTHREAD_CONDATTR_DELETE
-#define pthread_condattr_init PTHREAD_CONDATTR_INIT
-#define pthread_create PTHREAD_CREATE
-#define pthread_delay_np PTHREAD_DELAY_NP
-#define pthread_detach PTHREAD_DETACH
-#define pthread_equal PTHREAD_EQUAL
-#define pthread_exc_fetch_fp_np PTHREAD_EXC_FETCH_FP_NP
-#define pthread_exc_handler_np PTHREAD_EXC_HANDLER_NP
-#define pthread_exc_pop_ctx_np PTHREAD_EXC_POP_CTX_NP
-#define pthread_exc_push_ctx_np PTHREAD_EXC_PUSH_CTX_NP
-#define pthread_exc_savecontext_np PTHREAD_EXC_SAVECONTEXT_NP
-#define pthread_exit PTHREAD_EXIT
-#define pthread_get_expiration_np PTHREAD_GET_EXPIRATION_NP
-#define pthread_getprio PTHREAD_GETPRIO
-#define pthread_getschedparam PTHREAD_GETSCHEDPARAM
-#define pthread_getscheduler PTHREAD_GETSCHEDULER
-#define pthread_getspecific PTHREAD_GETSPECIFIC
-#define pthread_getunique_np PTHREAD_GETUNIQUE_NP
-#define pthread_join PTHREAD_JOIN
-#define pthread_join32 PTHREAD_JOIN32
-#define pthread_keycreate PTHREAD_KEYCREATE
-#define pthread_key_create PTHREAD_KEY_CREATE
-#define pthread_kill PTHREAD_KILL
-#define pthread_lock_global_np PTHREAD_LOCK_GLOBAL_NP
-#define pthread_mutex_destroy PTHREAD_MUTEX_DESTROY
-#define pthread_mutex_init PTHREAD_MUTEX_INIT
-#define pthread_mutex_lock PTHREAD_MUTEX_LOCK
-#define pthread_mutex_trylock PTHREAD_MUTEX_TRYLOCK
-#define pthread_mutex_unlock PTHREAD_MUTEX_UNLOCK
-#define pthread_mutexattr_create PTHREAD_MUTEXATTR_CREATE
-#define pthread_mutexattr_delete PTHREAD_MUTEXATTR_DELETE
-#define pthread_mutexattr_destroy PTHREAD_MUTEXATTR_DESTROY
-#define pthread_mutexattr_getkind_np PTHREAD_MUTEXATTR_GETKIND_NP
-#define pthread_mutexattr_init PTHREAD_MUTEXATTR_INIT
-#define pthread_mutexattr_setkind_np PTHREAD_MUTEXATTR_SETKIND_NP
-#define pthread_mutexattr_settype_np PTHREAD_MUTEXATTR_SETTYPE_NP
-#define pthread_once PTHREAD_ONCE
-#define pthread_resume_np PTHREAD_RESUME_NP
-#define pthread_self PTHREAD_SELF
-#define pthread_setasynccancel PTHREAD_SETASYNCCANCEL
-#define pthread_setcancel PTHREAD_SETCANCEL
-#define pthread_setcancelstate PTHREAD_SETCANCELSTATE
-#define pthread_setprio PTHREAD_SETPRIO
-#define pthread_setschedparam PTHREAD_SETSCHEDPARAM
-#define pthread_setscheduler PTHREAD_SETSCHEDULER
-#define pthread_setspecific PTHREAD_SETSPECIFIC
-#define pthread_suspend_np PTHREAD_SUSPEND_NP
-#define pthread_testcancel PTHREAD_TESTCANCEL
-#define pthread_unlock_global_np PTHREAD_UNLOCK_GLOBAL_NP
-#define pthread_yield PTHREAD_YIELD
-#define pthread_yield_np PTHREAD_YIELD_NP
-#define XDefaultRootWindow XDEFAULTROOTWINDOW
-#define XDisplayCells XDISPLAYCELLS
-#define XMaxRequestSize XMAXREQUESTSIZE
-#define XScreenOfDisplay XSCREENOFDISPLAY
-#define XSetFillRule XSETFILLRULE
-#define XmActivateProtocol XMACTIVATEPROTOCOL
-#define XmCreateBulletinBoardDialog XMCREATEBULLETINBOARDDIALOG
-#define XmCreateErrorDialog XMCREATEERRORDIALOG
-#define XmCreateWarningDialog XMCREATEWARNINGDIALOG
-#define XmCvtCTToXmString XMCVTCTTOXMSTRING
-#define XmDestroyPixmap XMDESTROYPIXMAP
-#define XmGetPixmap XMGETPIXMAP
-#define XmInstallImage XMINSTALLIMAGE
-#define XmListAddItems XMLISTADDITEMS
-#define XmListDeleteItem XMLISTDELETEITEM
-#define XmListItemExists XMLISTITEMEXISTS
-#define XmListItemPos XMLISTITEMPOS
-#define XmListReplaceItems XMLISTREPLACEITEMS
-#define XmListReplaceItemsPos XMLISTREPLACEITEMSPOS
-#define XmRemoveProtocols XMREMOVEPROTOCOLS
-#define XmRemoveTabGroup XMREMOVETABGROUP
-#define XmSetColorCalculation XMSETCOLORCALCULATION
-#define XmTextCopy XMTEXTCOPY
-#define XmTextCut XMTEXTCUT
-#define XmTextFieldClearSelection XMTEXTFIELDCLEARSELECTION
-#define XmTextFieldCopy XMTEXTFIELDCOPY
-#define XmTextFieldCut XMTEXTFIELDCUT
-#define XmTextFieldGetMaxLength XMTEXTFIELDGETMAXLENGTH
-#define XmTextFieldGetSelectionPosition XMTEXTFIELDGETSELECTIONPOSITION
-#define XmTextFieldPaste XMTEXTFIELDPASTE
-#define XmTextFieldReplace XMTEXTFIELDREPLACE
-#define XmTextFieldSetAddMode XMTEXTFIELDSETADDMODE
-#define XmTextFieldSetHighlight XMTEXTFIELDSETHIGHLIGHT
-#define XmTextFieldSetInsertionPosition XMTEXTFIELDSETINSERTIONPOSITION
-#define XmTextFieldSetMaxLength XMTEXTFIELDSETMAXLENGTH
-#define XmTextFieldShowPosition XMTEXTFIELDSHOWPOSITION
-#define XmTextGetEditable XMTEXTGETEDITABLE
-#define XmTextPaste XMTEXTPASTE
-#define XmTextPosToXY XMTEXTPOSTOXY
-#define XmTextSetEditable XMTEXTSETEDITABLE
-#define XmTextShowPosition XMTEXTSHOWPOSITION
-#define XmUninstallImage XMUNINSTALLIMAGE
-#define XmuCvtStringToBitmap XMUCVTSTRINGTOBITMAP
-#define XrmPutFileDatabase XRMPUTFILEDATABASE
-#define XtAddConverter XTADDCONVERTER
-#define XtError XTERROR
-#define XtVaCreatePopupShell XTVACREATEPOPUPSHELL
-#define pthread_attr_getschedpolicy PTHREAD_ATTR_GETSCHEDPOLICY
-#define pthread_key_delete PTHREAD_KEY_DELETE
-#define xmBulletinBoardWidgetClass XMBULLETINBOARDWIDGETCLASS
-#define xmScaleWidgetClass XMSCALEWIDGETCLASS
-#define XtDisplay XTDISPLAY
-#define XtScreen XTSCREEN
-#define XAllocIconSize XALLOCICONSIZE
-#define XAllocStandardColormap XALLOCSTANDARDCOLORMAP
-#define XAllowEvents XALLOWEVENTS
-#define XBlackPixel XBLACKPIXEL
-#define XCopyColormapAndFree XCOPYCOLORMAPANDFREE
-#define XDefaultGC XDEFAULTGC
-#define XDisplayHeight XDISPLAYHEIGHT
-#define XDisplayWidth XDISPLAYWIDTH
-#define XGetCommand XGETCOMMAND
-#define XGetIconSizes XGETICONSIZES
-#define XKillClient XKILLCLIENT
-#define XListInstalledColormaps XLISTINSTALLEDCOLORMAPS
-#define XRootWindow XROOTWINDOW
-#define XWMGeometry XWMGEOMETRY
-#define XWhitePixel XWHITEPIXEL
-#define XrmCombineDatabase XRMCOMBINEDATABASE
-#define XrmCombineFileDatabase XRMCOMBINEFILEDATABASE
-#define XSetStandardProperties XSETSTANDARDPROPERTIES
-#define XSetState XSETSTATE
-#define XDrawRectangles XDRAWRECTANGLES
-#define XGrabButton XGRABBUTTON
-#define XLookupColor XLOOKUPCOLOR
-#define XMapSubwindows XMAPSUBWINDOWS
-#define XRecolorCursor XRECOLORCURSOR
-#define XStoreBytes XSTOREBYTES
-#define XUngrabButton XUNGRABBUTTON
-#define XUninstallColormap XUNINSTALLCOLORMAP
-#define lib$wait LIB$WAIT
-#define lib$find_file LIB$FIND_FILE
-#define lib$find_file_end LIB$FIND_FILE_END
-#define lib$set_symbol LIB$SET_SYMBOL
-#define lib$sfree1_dd LIB$SFREE1_DD
-#define lib$spawn LIB$SPAWN
-#define sys$assign SYS$ASSIGN
-#define sys$crembx SYS$CREMBX
-#define sys$dassgn SYS$DASSGN
-#define sys$dclexh SYS$DCLEXH
-#define sys$getdviw SYS$GETDVIW
-#define sys$getsyiw SYS$GETSYIW
-#define sys$qio SYS$QIO
-#define sys$qiow SYS$QIOW
-#define sys$setef SYS$SETEF
-#define sys$synch SYS$SYNCH
-#define XDrawText XDRAWTEXT
-#define XtCloseDisplay XTCLOSEDISPLAY
-#define XtDestroyApplicationContext XTDESTROYAPPLICATIONCONTEXT
-#define lib$ediv LIB$EDIV
-#define lib$subx LIB$SUBX
-#define sys$bintim SYS$BINTIM
-#define sys$gettim SYS$GETTIM
-#define XFetchName XFETCHNAME
-#define XPeekIfEvent XPEEKIFEVENT
-#define XQueryKeymap XQUERYKEYMAP
-#endif

include/GL/xmesa.h

@@ -1,10 +1,10 @@
-/* $Id: xmesa.h,v 1.11 2001/06/20 19:52:11 brianp Exp $ */
+/* $Id: xmesa.h,v 1.1.1.1.2.3 2000/02/09 18:53:55 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  3.2
  * 
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  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"),
@@ -58,6 +58,7 @@ and create a window, you must do the following to use the X/Mesa interface:
 
 8. Before exiting, call XMesaDestroyVisual and XMesaDestroyContext.
 
+See the demos/xdemo.c and xmesa1.c files for examples.
 */
 
 
@@ -66,20 +67,21 @@ and create a window, you must do the following to use the X/Mesa interface:
 #ifndef XMESA_H
 #define XMESA_H
 
-#ifdef __VMS
-#include <GL/vms_x_fix.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
 #ifdef XFree86Server
 #include "xmesa_xf86.h"
 #else
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include "xmesa_x.h"
+#ifdef GLX_DIRECT_RENDERING
+#include "dri_mesa.h"
+#endif
 #endif
 #include "GL/gl.h"
 
@@ -90,7 +92,7 @@ extern struct Library *XLibBase;
 
 
 #define XMESA_MAJOR_VERSION 3
-#define XMESA_MINOR_VERSION 5
+#define XMESA_MINOR_VERSION 2
 
 
 
@@ -115,6 +117,17 @@ typedef struct xmesa_visual *XMesaVisual;
 
 typedef struct xmesa_buffer *XMesaBuffer;
 
+#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
+/*
+ * Initialize the XMesa driver.
+ */
+extern GLboolean XMesaInitDriver( __DRIscreenPrivate *driScrnPriv );
+
+/*
+ * Reset the XMesa driver when the X server resets.
+ */
+extern void XMesaResetDriver( __DRIscreenPrivate *driScrnPriv );
+#endif
 
 
 /*
@@ -127,35 +140,24 @@ typedef struct xmesa_buffer *XMesaBuffer;
  *         db_flag - GL_TRUE = double-buffered,
  *                   GL_FALSE = single buffered
  *         stereo_flag - stereo visual?
- *         ximage_flag - GL_TRUE = use an XImage for back buffer,
- *                       GL_FALSE = use an off-screen pixmap for back buffer
  *         depth_size - requested bits/depth values, or zero
  *         stencil_size - requested bits/stencil values, or zero
- *         accum_red_size - requested bits/red accum values, or zero
- *         accum_green_size - requested bits/green accum values, or zero
- *         accum_blue_size - requested bits/blue accum values, or zero
- *         accum_alpha_size - requested bits/alpha accum values, or zero
- *         num_samples - number of samples/pixel if multisampling, or zero
- *         level - visual level, usually 0
- *         visualCaveat - ala the GLX extension, usually GLX_NONE_EXT
+ *         accum_size - requested bits/component values, or zero
+ *         ximage_flag - GL_TRUE = use an XImage for back buffer,
+ *                       GL_FALSE = use an off-screen pixmap for back buffer
  * Return;  a new XMesaVisual or 0 if error.
  */
 extern XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
-                                      XMesaVisualInfo visinfo,
-                                      GLboolean rgb_flag,
-                                      GLboolean alpha_flag,
-                                      GLboolean db_flag,
-                                      GLboolean stereo_flag,
-                                      GLboolean ximage_flag,
-                                      GLint depth_size,
-                                      GLint stencil_size,
-                                      GLint accum_red_size,
-                                      GLint accum_green_size,
-                                      GLint accum_blue_size,
-                                      GLint accum_alpha_size,
-                                      GLint num_samples,
-                                      GLint level,
-                                      GLint visualCaveat );
+				      XMesaVisualInfo visinfo,
+				      GLboolean rgb_flag,
+				      GLboolean alpha_flag,
+				      GLboolean db_flag,
+				      GLboolean stereo_flag,
+				      GLboolean ximage_flag,
+				      GLint depth_size,
+				      GLint stencil_size,
+				      GLint accum_size,
+				      GLint level );
 
 /*
  * Destroy an XMesaVisual, but not the associated XVisualInfo.
@@ -173,7 +175,11 @@ extern void XMesaDestroyVisual( XMesaVisual v );
  * Return:  an XMesaContext or NULL if error.
  */
 extern XMesaContext XMesaCreateContext( XMesaVisual v,
-					XMesaContext share_list );
+					XMesaContext share_list
+#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
+					, __DRIcontextPrivate *driContextPriv
+#endif
+				      );
 
 
 /*
@@ -185,7 +191,13 @@ extern void XMesaDestroyContext( XMesaContext c );
 /*
  * Create an XMesaBuffer from an X window.
  */
-extern XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v, XMesaWindow w );
+extern XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v,
+					    XMesaWindow w
+#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
+					    , __DRIdrawablePrivate *driDrawPriv
+#endif
+					  );
+
 
 
 /*
@@ -193,7 +205,12 @@ extern XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v, XMesaWindow w );
  */
 extern XMesaBuffer XMesaCreatePixmapBuffer( XMesaVisual v,
 					    XMesaPixmap p,
-					    XMesaColormap cmap );
+					    XMesaColormap cmap
+#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
+					    , __DRIdrawablePrivate *driDrawPriv
+#endif
+					  );
+
 
 
 /*
@@ -219,22 +236,6 @@ extern GLboolean XMesaMakeCurrent( XMesaContext c,
 				   XMesaBuffer b );
 
 
-/*
- * Bind two buffers (read and draw) to a context and make the
- * context the current one.
- * New in Mesa 3.3
- */
-extern GLboolean XMesaMakeCurrent2( XMesaContext c,
-                                    XMesaBuffer drawBuffer,
-                                    XMesaBuffer readBuffer );
-
-
-/*
- * Unbind the current context from its buffer.
- */
-extern GLboolean XMesaUnbindContext( XMesaContext c );
-
-
 /*
  * Return a handle to the current context.
  */
@@ -242,18 +243,11 @@ extern XMesaContext XMesaGetCurrentContext( void );
 
 
 /*
- * Return handle to the current (draw) buffer.
+ * Return handle to the current buffer.
  */
 extern XMesaBuffer XMesaGetCurrentBuffer( void );
 
 
-/*
- * Return handle to the current read buffer.
- * New in Mesa 3.3
- */
-extern XMesaBuffer XMesaGetCurrentReadBuffer( void );
-
-
 /*
  * Swap the front and back buffers for the given buffer.  No action is
  * taken if the buffer is not double buffered.

include/GL/xmesa_x.h

@@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * Authors:
  *   Kevin E. Martin <kevin@precisioninsight.com>
  *
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/include/GL/xmesa_x.h,v 1.2 2000/02/25 20:31:11 brianp Exp $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/include/GL/xmesa_x.h,v 1.1 1999/08/19 00:55:40 jtg Exp $
  */
 
 #ifndef _XMESA_X_H_
@@ -78,6 +78,7 @@ typedef XColor       XMesaColor;
 #define GET_REDMASK(__v)        __v->visinfo->red_mask
 #define GET_GREENMASK(__v)      __v->visinfo->green_mask
 #define GET_BLUEMASK(__v)       __v->visinfo->blue_mask
+#define GET_BITS_PER_PIXEL(__v) bits_per_pixel(__v->display, __v->visinfo)
 #if defined(__cplusplus) || defined(c_plusplus)
 #define GET_VISUAL_CLASS(__v)   __v->visinfo->c_class
 #else

include/GL/xmesa_xf86.h

@@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * Authors:
  *   Kevin E. Martin <kevin@precisioninsight.com>
  *
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/include/GL/xmesa_xf86.h,v 1.5 2000/04/05 22:09:10 brianp Exp $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/include/GL/xmesa_xf86.h,v 1.1.1.1.2.1 1999/12/13 21:54:19 brianp Exp $
  */
 
 #ifndef _XMESA_XF86_H_
@@ -128,12 +128,12 @@ do { \
 do { \
     xRectangle __r[1]; \
     (void) __d; \
-    ValidateGC((DrawablePtr)__b, __gc); \
+    ValidateGC(__b, __gc); \
     __r[0].x = __x; \
     __r[0].y = __y; \
     __r[0].width = __w; \
     __r[0].height = __h; \
-    (*__gc->ops->PolyFillRect)((DrawablePtr)__b, __gc, 1, __r); \
+    (*__gc->ops->PolyFillRect)(__b, __gc, 1, __r); \
 } while (0)
 
 #define XMesaPutImage(__d,__b,__gc,__i,__sx,__sy,__x,__y,__w,__h) \
@@ -179,6 +179,7 @@ do { \
 #define GET_REDMASK(__v)        __v->visinfo->redMask
 #define GET_GREENMASK(__v)      __v->visinfo->greenMask
 #define GET_BLUEMASK(__v)       __v->visinfo->blueMask
+#define GET_BITS_PER_PIXEL(__v) __v->visinfo->bitsPerRGBValue
 #define GET_VISUAL_CLASS(__v)   __v->visinfo->class
 #define GET_VISUAL_DEPTH(__v)   __v->visinfo->nplanes
 #define GET_BLACK_PIXEL(__v)    __v->display->blackPixel

progs/demos/Makefile.BeOS-R4

@@ -1,8 +1,8 @@
-# $Id: Makefile.BeOS-R4,v 1.14 2001/02/20 17:04:52 brianp Exp $
+# $Id: Makefile.BeOS-R4,v 1.3 1999/10/22 20:36:38 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.5
-# Copyright (C) 1995-2001  Brian Paul
+# Version:  3.1
+# Copyright (C) 1995-1999  Brian Paul
 
 
 # Makefile for GLUT-based demo programs for BeOS R4
@@ -17,46 +17,9 @@ GL_LIBS = -L$(LIBDIR) -L/boot/home/config/lib -Xlinker -rpath $(LIBDIR) -lbe -lg
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
 
-PROGS = bounce \
-	clearspd \
-	cubemap \
-	drawpix \
-	fire \
-	gamma \
-	gears \
-	geartrain \
-	glinfo \
-	gloss \
-	gltestperf \
-	glutfx \
-	isosurf \
-	ipers \
-	lodbias \
-	morph3d \
-	multiarb \
-	occlude \
-	osdemo \
-	paltex \
-	pixeltex \
-	pointblast \
-	ray \
-	readpix \
-	reflect \
-	renormal \
-	shadowtex \
-	spectex \
-	stex3d \
-	teapot \
-	terrain \
-	tessdemo \
-	texcyl \
-	texdown \
-	texenv \
-	texobj \
-	trispd \
-	tunnel \
-	tunnel2 \
-	winpos
+PROGS = bounce clearspd drawpix gamma gears glinfo gloss isosurf \
+	morph3d multiarb osdemo paltex pointblast reflect \
+	renormal spectex stex3d texcyl texobj trispd winpos
 
 
 ##### RULES #####
@@ -65,7 +28,7 @@ PROGS = bounce \
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
 
 
 

progs/demos/Makefile.X11

@@ -1,8 +1,9 @@
-# $Id: Makefile.X11,v 1.19 2001/03/27 17:44:35 brianp Exp $
+# $Id: Makefile.X11,v 1.3 1999/10/27 10:09:53 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.5
-# Copyright (C) 1995-2001  Brian Paul
+# Version:  3.1
+# Copyright (C) 1995-1998  Brian Paul
+
 
 # Makefile for GLUT-based demo programs for Unix/X11
 
@@ -12,53 +13,13 @@
 INCDIR = ../include
 LIBDIR = ../lib
 
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
-
-OSMESA_LIBS = -L$(LIBDIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
+GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(XLIBS)
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
 
-PROGS = anisotropic \
-	bounce \
-	clearspd \
-	cubemap \
-	drawpix \
-	fire \
-	gamma \
-	gears \
-	geartrain \
-	glinfo \
-	gloss \
-	gltestperf \
-	glutfx \
-	isosurf \
-	ipers \
-	lodbias \
-	morph3d \
-	multiarb \
-	occlude \
-	osdemo \
-	paltex \
-	pixeltex \
-	pointblast \
-	ray \
-	readpix \
-	reflect \
-	renormal \
-	shadowtex \
-	spectex \
-	stex3d \
-	teapot \
-	terrain \
-	tessdemo \
-	texcyl \
-	texdown \
-	texenv \
-	texobj \
-	trispd \
-	tunnel \
-	tunnel2 \
-	winpos
+PROGS = bounce clearspd drawpix gamma gears glinfo gloss glutfx isosurf \
+	morph3d multiarb osdemo paltex pointblast reflect \
+	renormal spectex stex3d tessdemo texcyl texobj trispd winpos \
 
 
 ##### RULES #####
@@ -66,14 +27,9 @@ PROGS = anisotropic \
 .SUFFIXES:
 .SUFFIXES: .c
 
-
-# make executable from .c file:
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
 
-# special case: need the -lOSMesa library:
-osdemo: osdemo.c
-	$(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
 
 
 ##### TARGETS #####
@@ -87,17 +43,8 @@ clean:
 realclean:
 	-rm $(PROGS)
 	-rm *.o *~
-	-rm readtex.[ch]
-
-targets: readtex.c readtex.h $(PROGS)
-
-
-readtex.c:
-	cp ../util/readtex.c .
-
-readtex.h:
-	cp ../util/readtex.c .
 
+targets: $(PROGS)
 
 # execute all programs
 exec: $(PROGS)
@@ -110,3 +57,4 @@ exec: $(PROGS)
 
 
 include ../Make-config
+

progs/demos/Makefile.cygnus

@@ -1,8 +1,8 @@
-# $Id: Makefile.cygnus,v 1.12 2000/12/24 22:53:54 pesco Exp $
+# $Id: Makefile.cygnus,v 1.2 1999/10/22 20:37:23 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.3
-# Copyright (C) 1995-2000  Brian Paul
+# Version:  3.1
+# Copyright (C) 1995-1999  Brian Paul
 
 
 # Makefile for demo programs for cygnus
@@ -19,45 +19,9 @@ GL_LIBS = -L$(LIBDIR) -lglut -lMesaGLU -lMesaGL -lm $(WLIBS)
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
 
-PROGS = bounce \
-	clearspd \
-	cubemap \
-	drawpix \
-	fire \
-	gamma \
-	gears \
-	geartrain \
-	glinfo \
-	gloss \
-	gltestperf \
-	glutfx \
-	isosurf \
-	ipers \
-	lodbias \
-	morph3d \
-	multiarb \
-	occlude \
-	osdemo \
-	paltex \
-	pixeltex \
-	pointblast \
-	ray \
-	readpix \
-	reflect \
-	renormal \
-	spectex \
-	stex3d \
-	teapot \
-	terrain \
-	tessdemo \
-	texcyl \
-	texdown \
-	texenv \
-	texobj \
-	trispd \
-	tunnel \
-	tunnel2 \
-	winpos
+PROGS = clearspd drawpix gamma gears glinfo glutfx gloss isosurf \
+	morph3d multiext osdemo paltex pointblast reflect \
+	renormal spectex stex3d tessdemo texcyl texobj trispd winpos
 
 
 ##### RULES #####
@@ -66,7 +30,7 @@ PROGS = bounce \
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
 
 
 ##### TARGETS #####

progs/demos/README

@@ -1,230 +0,0 @@
-INTRODUCTION
-------------
-
-This directory is usually included in the Mesa demos distribution or
-in the GLUT distribution.
-
-I have written the demos included in this directory mainly for showing
-the capabilities of the Mesa library when using the Voodoo driver.
-However all the demos are written using the GLUT and OpenGL so they
-work with any GLUT/OpenGL platform (tested: Linux+Mesa+Voodoo driver,
-Linux+Mesa+X11 driver, Win95+Mesa+Voodoo driver and SGI Onyx IR thanks
-to Mark Kilgard).
-
-All the demos make an heavy use of texture mapping, blending, etc. so
-you _need_ some kind of hardware support for the OpenGL otherwise they
-will run at ~1fps. You need also a OpenGL 1.1 compliant library.
-
-You can find some screenshot of these demos at
-http://www-hmw.caribel.pisa.it/fxmesa/fxdemos.hmtl
-
-Write me if you find some bug in the demos.
-
-David Bucciarelli (tech.hmw@plus.it)
-
-Humanware s.r.l.
-Via XXIV Maggio 62
-Pisa, Italy
-Tel./Fax +39-50-554108
-email: info.hmw@plus.it
-www: www-hmw.caribel.pisa.it
-
-
-A BRIEF DESCRIPTION OF THE DEMOS
---------------------------------
-
-
-IPERS
------
-
-Sources: ipers.c image.c
-
-A nice spinning fractal object.
-
-
-RAY
----
-
-Sources: ray.c
-
-I'm using ray tracing to dynamically generate texture maps with
-specular, diffuse, shadows, and mirror colors. Each frame the texture
-maps of the plane and of the sphere are partially updated.  With this
-technique you can obtain true mirrors, shadows, specular highlights,
-bump mapping, etc. in realtime.  This demo is really CPU intensive
-(~25fps on a PentiumII@300MHz with a Pure3D).  Support on-the-fly
-switching between fullscreen and in-window rendering under Linux/Mesa
-(start your X server in 16 bpp mode and press the spacebar).
-
-
-TUNNEL
-------
-
-Sources: tunnel.c image.c sources.c
-Data: bw.rgb tile.rgb
-
-The model was designed and prelighted with Alias|Wavefront
-PowerAnimator V8. Triangle strips were built with a tool written by me
-and then statically included in the sources.  This demo doesn't
-require the ZBuffer and use antialiased polygons.  Support on-the-fly
-switching between fullscreen and in-window rendering under Linux/Mesa
-(start your X server in 16 bpp mode and press the spacebar).
-
-
-TUNNEL2
-------
-
-Sources: tunnel2.c image.c sources.c
-Data: bw.rgb tile.rgb
-
-The some tunnel demo but with two output channels. A nice
-example of the Mesa/Voodoo support for multiple boards in
-the some PC.
-
-
-TEAPOT
-------
-
-Sources: teapot.c image.c dteapot.c shadow.c
-Data: bw.rgb tile.rgb
-
-The shadow is drawn projecting the teapot geometry over the plane. All
-other light effects are drawn using the standard OpenGL capabilities.
-Support on-the-fly switching between fullscreen and in-window
-rendering under Linux/Mesa (start your X server in 16 bpp mode and
-press the spacebar).
-
-
-FIRE
-----
-
-Sources: fire.c image.c
-Data: s128.rgb tree2.rgb
-
-The demo use a small particle system to draw some nice visual effect.
-You can interactively change many parameters of the particle system
-and you can choose the number of particles at the startup ('fire
-4000').  This demo should be called fountain.  Support on-the-fly
-switching between fullscreen and in-window rendering under Linux/Mesa
-(start your X server in 16 bpp mode and press the spacebar).
-
-
-TERRAIN
--------
-
-Sources: mesaland.c
-
-This demo is base on another demo written by Mikael SkiZoWalker.  I
-have added the capabilities to freely fly around, view culling and
-some nice color.  Support on-the-fly switching between fullscreen and
-in-window rendering under Linux/Mesa (start your X server in 16 bpp
-mode and press the spacebar).
-
-
-GLTEST
-------
-
-Sources: gltest.c
-
-This is a simple benchmark suite that I'm using in the development of
-the Mesa/Voodoo driver. Type 'gltest >my.res' and you will get some
-data about the performances of your OpenGL. Follow the results with my
-PC (Linux+Mesa-2.6+PentiumII@300MHz+Pure3D):
-
-Simple Points
-587900.080674 Pnts/sec
-
-Smooth Lines
-SIZE=480 => 39007.426183 Lins/sec
-SIZE=250 => 74575.016485 Lins/sec
-SIZE=100 => 179734.882409 Lins/sec
-SIZE=050 => 183987.795297 Lins/sec
-SIZE=025 => 183820.086309 Lins/sec
-
-
-ZSmooth Triangles
-SIZE=480 => 784.954997 Tris/sec
-SIZE=250 => 2862.325889 Tris/sec
-SIZE=100 => 17779.492938 Tris/sec
-SIZE=050 => 159339.829844 Tris/sec
-SIZE=025 => 428602.984008 Tris/sec
-
-
-ZSmooth Tex Blend Triangles
-SIZE=480 => 784.473931 Tris/sec
-SIZE=250 => 2853.781513 Tris/sec
-SIZE=100 => 17598.252146 Tris/sec
-SIZE=050 => 152632.578337 Tris/sec
-SIZE=025 => 377584.760048 Tris/sec
-
-
-ZSmooth Tex Blend TMesh Triangles
-SIZE=400 => 563.900695 Tris/sec, MPixel Fill/sec: 45.112056
-SIZE=250 => 1449.777225 Tris/sec, MPixel Fill/sec: 45.305538
-SIZE=100 => 8702.869121 Tris/sec, MPixel Fill/sec: 43.514346
-SIZE=050 => 31896.867466 Tris/sec, MPixel Fill/sec: 39.871084
-SIZE=025 => 114037.262894 Tris/sec, MPixel Fill/sec: 35.636645
-SIZE=010 => 220494.235839 Tris/sec, MPixel Fill/sec: 11.024712
-SIZE=005 => 225615.506651 Tris/sec, MPixel Fill/sec: 2.820194
-SIZE=002 => 225607.681439 Tris/sec, MPixel Fill/sec: 0.451215
-
-
-Color/Depth Buffer Clears
-295.042474 Clrs/sec, MPixel Fill/sec: 90.553256
-
-
-Follow the results with my
-PC (Linux+Mesa-3.0beta5+PentiumII@300MHz+Voodoo2):
-
-
-Simple Points
-1620113.525130 Pnts/sec
-
-Smooth Lines
-SIZE=480 => 73841.166065 Lins/sec
-SIZE=250 => 140794.035316 Lins/sec
-SIZE=100 => 344185.242157 Lins/sec
-SIZE=050 => 420399.008289 Lins/sec
-SIZE=025 => 420261.389773 Lins/sec
-
-
-ZSmooth Triangles
-SIZE=480 => 1434.668506 Tris/sec
-SIZE=250 => 5228.449614 Tris/sec
-SIZE=100 => 46603.815842 Tris/sec
-SIZE=050 => 325757.045961 Tris/sec
-SIZE=025 => 589022.403336 Tris/sec
-
-
-ZSmooth Tex Blend Triangles
-SIZE=480 => 1414.900041 Tris/sec
-SIZE=250 => 5006.055235 Tris/sec
-SIZE=100 => 43602.252031 Tris/sec
-SIZE=050 => 303497.092692 Tris/sec
-SIZE=025 => 517087.428669 Tris/sec
-
-
-ZSmooth Tex Blend TMesh Triangles
-SIZE=400 => 1023.273112 Tris/sec, MPixel Fill/sec: 81.861849
-SIZE=250 => 2595.692121 Tris/sec, MPixel Fill/sec: 81.115379
-SIZE=100 => 15788.198912 Tris/sec, MPixel Fill/sec: 78.940995
-SIZE=050 => 58784.121300 Tris/sec, MPixel Fill/sec: 73.480152
-SIZE=025 => 244233.873481 Tris/sec, MPixel Fill/sec: 76.323085
-SIZE=010 => 474995.004191 Tris/sec, MPixel Fill/sec: 23.749750
-SIZE=005 => 475124.354163 Tris/sec, MPixel Fill/sec: 5.939054
-SIZE=002 => 474959.089503 Tris/sec, MPixel Fill/sec: 0.949918
-
-
-Color/Depth Buffer Clears
-478.654830 Clrs/sec, MPixel Fill/sec: 146.906826
-
-
-PALTEX and GLBPALTX
--------------------
-
-Sources: paltex.c and glbpaltx.c
-
-The PALTEX example was written by Brian Paul and it shows the
-capabilities of the GL_EXT_paletted_texture extension.  I have written
-the other example in order to show the capabilities of the
-gl3DfxSetPaletteEXT() (it used only by GLQuake and Quake2).

progs/demos/anisotropic.c

@@ -1,220 +0,0 @@
-/* $Id: anisotropic.c,v 1.1 2001/03/22 15:24:15 gareth Exp $ */
-
-/*
- * GL_ARB_texture_filter_anisotropic demo
- *
- * Gareth Hughes
- * March 2001
- *
- * Copyright (C) 2000  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 fairly early version.  All it does is draw a couple of
- * textured quads with different forms of texture filtering.  Eventually,
- * you'll be able to adjust the maximum anisotropy and so on.
- */
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <GL/glut.h>
-
-#define TEXTURE_SIZE 256
-static GLubyte image[TEXTURE_SIZE][TEXTURE_SIZE][3];
-
-static GLfloat repeat = 1.0;
-
-static GLfloat texcoords[] = {
-   0.0, 0.0,
-   0.0, 1.0,
-   1.0, 0.0,
-   1.0, 1.0
-};
-
-static GLfloat vertices[] = {
-   -400.0, -400.0,     0.0,
-   -400.0,  400.0, -7000.0,
-    400.0, -400.0,     0.0,
-    400.0,  400.0, -7000.0
-};
-
-static GLfloat maxAnisotropy;
-
-
-static void init( void )
-{
-   int i, j;
-
-   if ( !glutExtensionSupported( "GL_EXT_texture_filter_anisotropic" ) ) {
-      fprintf( stderr, "Sorry, this demo requires GL_EXT_texture_filter_anisotropic.\n" );
-      exit( 0 );
-   }
-
-   glClearColor( 0.0, 0.0, 0.0, 0.0 );
-   glShadeModel( GL_SMOOTH );
-
-   /* Init the vertex arrays.
-    */
-   glEnableClientState( GL_VERTEX_ARRAY );
-   glEnableClientState( GL_TEXTURE_COORD_ARRAY );
-
-   glVertexPointer( 3, GL_FLOAT, 0, vertices );
-   glTexCoordPointer( 2, GL_FLOAT, 0, texcoords );
-
-   /* Init the texture environment.
-    */
-   glEnable( GL_TEXTURE_2D );
-   glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
-
-   glMatrixMode( GL_TEXTURE );
-   glScalef( repeat, repeat, 0 );
-
-   glMatrixMode( GL_MODELVIEW );
-
-   glGetFloatv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxAnisotropy );
-   printf( "Maximum supported anisotropy: %.2f\n", maxAnisotropy );
-
-   /* Make the texture image.
-    */
-   glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
-
-   for ( i = 0 ; i < TEXTURE_SIZE ; i++ ) {
-      for ( j = 0 ; j < TEXTURE_SIZE ; j++ ) {
-	 if ( (i/4 + j/4) & 1 ) {
-	    image[i][j][0] = 0;
-	    image[i][j][1] = 0;
-	    image[i][j][2] = 0;
-	 } else {
-	    image[i][j][0] = 255;
-	    image[i][j][1] = 255;
-	    image[i][j][2] = 255;
-	 }
-      }
-   }
-
-   gluBuild2DMipmaps( GL_TEXTURE_2D, GL_RGB, TEXTURE_SIZE, TEXTURE_SIZE,
-		      GL_RGB, GL_UNSIGNED_BYTE, image );
-}
-
-static void display( void )
-{
-   GLint vp[4], w, h;
-
-   glClear( GL_COLOR_BUFFER_BIT );
-
-   glGetIntegerv( GL_VIEWPORT, vp );
-   w = vp[2] / 2;
-   h = vp[3] / 2;
-
-   /* Upper left corner:
-    */
-   glViewport( 1, h + 1, w - 2, h - 2 );
-
-   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-   glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, maxAnisotropy );
-
-   glDrawArrays( GL_TRIANGLE_STRIP, 0, 4 );
-
-
-   /* Upper right corner:
-    */
-   glViewport( w + 1, h + 1, w - 2, h - 2 );
-
-   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST );
-   glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, maxAnisotropy );
-
-   glDrawArrays( GL_TRIANGLE_STRIP, 0, 4 );
-
-
-   /* Lower left corner:
-    */
-   glViewport( 1, 1, w - 2, h - 2 );
-
-   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR );
-   glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, maxAnisotropy );
-
-   glDrawArrays( GL_TRIANGLE_STRIP, 0, 4 );
-
-
-   /* Lower right corner:
-    */
-   glViewport( w + 1, 1, w - 2, h - 2 );
-
-   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR );
-   glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, maxAnisotropy );
-
-   glDrawArrays( GL_TRIANGLE_STRIP, 0, 4 );
-
-
-   glViewport( vp[0], vp[1], vp[2], vp[3] );
-
-   glutSwapBuffers();
-}
-
-static void reshape( int w, int h )
-{
-   glViewport( 0, 0, (GLsizei) w, (GLsizei) h );
-
-   glMatrixMode( GL_PROJECTION );
-   glLoadIdentity();
-   glFrustum( -1.0, 1.0, -1.0, 1.0, 10.0, 10000.0 );
-
-   glMatrixMode( GL_MODELVIEW );
-   glLoadIdentity();
-   glTranslatef( 0.0, 0.0, -10.0 );
-}
-
-static void key( unsigned char key, int x, int y )
-{
-   (void) x; (void) y;
-
-   switch ( key ) {
-   case 27:
-      exit( 0 );
-   }
-
-   glutPostRedisplay();
-}
-
-static void usage( void )
-{
-   /* Nothing yet... */
-}
-
-int main( int argc, char **argv )
-{
-   glutInit( &argc, argv );
-   glutInitDisplayMode( GLUT_DOUBLE | GLUT_RGB );
-   glutInitWindowSize( 600, 300 );
-   glutInitWindowPosition( 0, 0 );
-   glutCreateWindow( "Anisotropic Texture Filter Demo" );
-
-   init();
-
-   glutDisplayFunc( display );
-   glutReshapeFunc( reshape );
-   glutKeyboardFunc( key );
-
-   usage();
-
-   glutMainLoop();
-
-   return 0;
-}

progs/demos/bounce.c

@@ -1,13 +1,33 @@
-/* $Id: bounce.c,v 1.3 2000/08/16 20:36:34 brianp Exp $ */
+/* $Id: bounce.c,v 1.1 1999/08/19 00:55:40 jtg Exp $ */
 
 /*
- * Bouncing ball demo.
+ * Bouncing ball demo.  Color index mode only!
  *
  * This program is in the public domain
  *
  * Brian Paul
+ */
+
+/* Conversion to GLUT by Mark J. Kilgard */
+
+/*
+ * $Log: bounce.c,v $
+ * Revision 1.1  1999/08/19 00:55:40  jtg
+ * Initial revision
+ *
+ * Revision 3.3  1999/03/18 08:16:14  joukj
+ *
+ *     cmpstr needs string.h to included to avoid warnings
+ *
+ * Revision 3.2  1998/11/28 01:13:02  brianp
+ * now sets an initial window position and size
+ *
+ * Revision 3.1  1998/11/28 01:06:57  brianp
+ * now works in RGB mode by default
+ *
+ * Revision 3.0  1998/02/14 18:42:29  brianp
+ * initial rev
  *
- * Conversion to GLUT by Mark J. Kilgard
  */
 
 
@@ -61,9 +81,9 @@ make_ball(void)
         glColor3f(1, 1, 1);
       }
 
-      x = radius * COS(b) * COS(a);
-      y = radius * SIN(b) * COS(a);
-      z = radius * SIN(a);
+      x = COS(b) * COS(a);
+      y = SIN(b) * COS(a);
+      z = SIN(a);
       glVertex3f(x, y, z);
 
       x = radius * COS(b) * COS(a + da);
@@ -175,7 +195,7 @@ idle(void)
   glutPostRedisplay();
 }
 
-static void 
+void 
 visible(int vis)
 {
   if (vis == GLUT_VISIBLE)

progs/demos/clearspd.c

@@ -1,4 +1,4 @@
-/* $Id: clearspd.c,v 1.3 2000/12/07 21:50:39 brianp Exp $ */
+/* $Id: clearspd.c,v 1.1 1999/08/19 00:55:40 jtg Exp $ */
 
 /*
  * Simple GLUT program to measure glClear() and glutSwapBuffers() speed.
@@ -7,14 +7,8 @@
 
 /*
  * $Log: clearspd.c,v $
- * Revision 1.3  2000/12/07 21:50:39  brianp
- * call glFinish() before getting t1 time
- *
- * Revision 1.2  2000/04/10 16:25:15  brianp
- * fixed visual selection and reporting results
- *
- * Revision 1.1.1.1  1999/08/19 00:55:40  jtg
- * Imported sources
+ * Revision 1.1  1999/08/19 00:55:40  jtg
+ * Initial revision
  *
  * Revision 3.3  1999/03/28 18:18:33  brianp
  * minor clean-up
@@ -74,7 +68,6 @@ static void Display( void )
          glClear( BufferMask );
          glutSwapBuffers();
       }
-      glFinish();
       t1 = glutGet(GLUT_ELAPSED_TIME) * 0.001;
    }
    else {
@@ -82,7 +75,6 @@ static void Display( void )
       for (i=0;i<Loops;i++) {
          glClear( BufferMask );
       }
-      glFinish();
       t1 = glutGet(GLUT_ELAPSED_TIME) * 0.001;
       glutSwapBuffers();
    }
@@ -96,12 +88,12 @@ static void Display( void )
    clearRate = Loops / (t1-t0);
    pixelRate = clearRate * Width * Height;
    if (SwapFlag) {
-      printf("Rate: %d clears+swaps in %gs = %g clears+swaps/s   %g pixels/s\n",
-             Loops, t1-t0, clearRate, pixelRate );
+      printf("Rate: %d clears+swaps in %gs = %g clears+swaps/s   %d pixels/s\n",
+             Loops, t1-t0, clearRate, (int)pixelRate );
    }
    else {
-      printf("Rate: %d clears in %gs = %g clears/s   %g pixels/s\n",
-             Loops, t1-t0, clearRate, pixelRate);
+      printf("Rate: %d clears in %gs = %g clears/s   %d pixels/s\n",
+             Loops, t1-t0, clearRate, (int)pixelRate);
    }
 }
 
@@ -202,8 +194,6 @@ static void Help( const char *program )
 
 int main( int argc, char *argv[] )
 {
-   GLint mode;
-
    printf("For options:  %s -help\n", argv[0]);
 
    Init( argc, argv );
@@ -212,15 +202,7 @@ int main( int argc, char *argv[] )
    glutInitWindowSize( (int) Width, (int) Height );
    glutInitWindowPosition( 0, 0 );
 
-   mode = ColorMode | GLUT_DOUBLE;
-   if (BufferMask & GL_STENCIL_BUFFER_BIT)
-      mode |= GLUT_STENCIL;
-   if (BufferMask & GL_ACCUM_BUFFER_BIT)
-      mode |= GLUT_ACCUM;
-   if (BufferMask & GL_DEPTH_BUFFER_BIT)
-      mode |= GLUT_DEPTH;
-         
-   glutInitDisplayMode(mode);
+   glutInitDisplayMode( ColorMode | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL | GLUT_ACCUM );
 
    glutCreateWindow( argv[0] );
 

progs/demos/cubemap.c

@@ -1,250 +0,0 @@
-/* $Id: cubemap.c,v 1.3 2000/06/27 17:04:43 brianp Exp $ */
-
-/*
- * GL_ARB_texture_cube_map demo
- *
- * Brian Paul
- * May 2000
- *
- *
- * Copyright (C) 2000  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 pretty minimalistic demo for now.  Eventually, use some
- * interesting cube map textures and 3D objects.
- * For now, we use 6 checkerboard "walls" and a sphere (good for
- * verification purposes).
- */
-
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "GL/glut.h"
-
-static GLfloat Xrot = 0, Yrot = 0;
-
-
-static void draw( void )
-{
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-   glMatrixMode(GL_TEXTURE);
-   glLoadIdentity();
-   glRotatef(Xrot, 1, 0, 0);
-   glRotatef(Yrot, 0, 1, 0);
-   glutSolidSphere(2.0, 20, 20);
-   glMatrixMode(GL_MODELVIEW);
-
-   glutSwapBuffers();
-}
-
-
-static void idle(void)
-{
-   Yrot += 5.0;
-   glutPostRedisplay();
-}
-
-
-static void set_mode(GLuint mode)
-{
-   if (mode == 0) {
-      glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_ARB);
-      glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_ARB);
-      glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_ARB);
-      printf("GL_REFLECTION_MAP_ARB mode\n");
-   }
-   else if (mode == 1) {
-      glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_ARB);
-      glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_ARB);
-      glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_ARB);
-      printf("GL_NORMAL_MAP_ARB mode\n");
-   }
-   glEnable(GL_TEXTURE_GEN_S);
-   glEnable(GL_TEXTURE_GEN_T);
-   glEnable(GL_TEXTURE_GEN_R);
-}
-
-
-static void key(unsigned char k, int x, int y)
-{
-   static GLboolean anim = GL_TRUE;
-   static GLuint mode = 0;
-   (void) x;
-   (void) y;
-   switch (k) {
-      case ' ':
-         anim = !anim;
-         if (anim)
-            glutIdleFunc(idle);
-         else
-            glutIdleFunc(NULL);
-         break;
-      case 'm':
-         mode = !mode;
-         set_mode(mode);
-         break;
-      case 27:
-         exit(0);
-   }
-   glutPostRedisplay();
-}
-
-
-static void specialkey(int key, int x, int y)
-{
-   GLfloat step = 10;
-   (void) x;
-   (void) y;
-   switch (key) {
-      case GLUT_KEY_UP:
-         Xrot -= step;
-         break;
-      case GLUT_KEY_DOWN:
-         Xrot += step;
-         break;
-      case GLUT_KEY_LEFT:
-         Yrot -= step;
-         break;
-      case GLUT_KEY_RIGHT:
-         Yrot += step;
-         break;
-   }
-   glutPostRedisplay();
-}
-
-
-/* new window size or exposure */
-static void reshape(int width, int height)
-{
-   glViewport(0, 0, (GLint)width, (GLint)height);
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   glFrustum( -2.0, 2.0, -2.0, 2.0, 6.0, 20.0 );
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-   glTranslatef( 0.0, 0.0, -8.0 );
-}
-
-
-static void init( void )
-{
-#define CUBE_TEX_SIZE 64
-   GLubyte image[CUBE_TEX_SIZE][CUBE_TEX_SIZE][3];
-   static const GLubyte colors[6][3] = {
-      { 255,   0,   0 },
-      {   0, 255, 255 },
-      {   0, 255,   0 },
-      { 255,   0, 255 },
-      {   0,   0, 255 },
-      { 255, 255,   0 }
-   };
-   static const GLenum targets[6] = {
-      GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB,
-      GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB,
-      GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB,
-      GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB,
-      GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB,
-      GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB
-   };
-
-   GLint i, j, f;
-
-   /* check for extension */
-   {
-      char *exten = (char *) glGetString(GL_EXTENSIONS);
-      if (!strstr(exten, "GL_ARB_texture_cube_map")) {
-         printf("Sorry, this demo requires GL_ARB_texture_cube_map\n");
-         exit(0);
-      }
-   }
-
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-
-   /* make colored checkerboard cube faces */
-   for (f = 0; f < 6; f++) {
-      for (i = 0; i < CUBE_TEX_SIZE; i++) {
-         for (j = 0; j < CUBE_TEX_SIZE; j++) {
-            if ((i/4 + j/4) & 1) {
-               image[i][j][0] = colors[f][0];
-               image[i][j][1] = colors[f][1];
-               image[i][j][2] = colors[f][2];
-            }
-            else {
-               image[i][j][0] = 255;
-               image[i][j][1] = 255;
-               image[i][j][2] = 255;
-            }
-         }
-      }
-
-      glTexImage2D(targets[f], 0, GL_RGB, CUBE_TEX_SIZE, CUBE_TEX_SIZE, 0,
-                   GL_RGB, GL_UNSIGNED_BYTE, image);
-   }
-
-#if 1
-   glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-   glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-#else
-   glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-   glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-#endif
-   glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-   glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-   glEnable(GL_TEXTURE_CUBE_MAP_ARB);
-
-   glClearColor(.3, .3, .3, 0);
-   glColor3f( 1.0, 1.0, 1.0 );
-
-   set_mode(0);
-}
-
-
-static void usage(void)
-{
-   printf("keys:\n");
-   printf("  SPACE - toggle animation\n");
-   printf("  CURSOR KEYS - rotation\n");
-   printf("  m - toggle texgen reflection mode\n");
-}
-
-
-int main( int argc, char *argv[] )
-{
-   glutInitWindowPosition(0, 0);
-   glutInitWindowSize(300, 300);
-   glutInitDisplayMode( GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE );
-   glutCreateWindow("Texture Cube Maping");
-   init();
-   glutReshapeFunc( reshape );
-   glutKeyboardFunc( key );
-   glutSpecialFunc( specialkey );
-   glutIdleFunc( idle );
-   glutDisplayFunc( draw );
-   usage();
-   glutMainLoop();
-   return 0;
-}

progs/demos/descrip.mms

@@ -9,8 +9,8 @@
 
 ##### MACROS #####
 
-INCDIR = ([-.include],[-.util])
-CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)
+INCDIR = [-.include]
+CFLAGS = /include=$(INCDIR)/prefix=all
 
 .ifdef SHARE
 GL_LIBS = $(XLIBS)
@@ -28,7 +28,7 @@ PROGS = bounce.exe;,clearspd.exe;,drawpix.exe;,gamma.exe;,gears.exe;,\
 
 ##### RULES #####
 .obj.exe :
-	cxxlink $(MMS$TARGET_NAME),$(GL_LIBS)
+	link $(MMS$TARGET_NAME),$(GL_LIBS)
 
 ##### TARGETS #####
 default :

progs/demos/drawpix.c

@@ -1,4 +1,4 @@
-/* $Id: drawpix.c,v 1.5 2000/12/24 22:53:54 pesco Exp $ */
+/* $Id: drawpix.c,v 1.3 1999/10/28 18:23:29 brianp Exp $ */
 
 /*
  * glDrawPixels demo/test/benchmark
@@ -8,35 +8,6 @@
 
 /*
  * $Log: drawpix.c,v $
- * Revision 1.5  2000/12/24 22:53:54  pesco
- * * demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util.
- * * demos/Makefile.X11, demos/Makefile.BeOS-R4, demos/Makefile.cygnus:
- * Essentially the same.
- * Program files updated to include "readtex.c", not "../util/readtex.c".
- * * demos/reflect.c: Likewise for "showbuffer.c".
- *
- *
- * * Makefile.am (EXTRA_DIST): Added top-level regular files.
- *
- * * include/GL/Makefile.am (INC_X11): Added glxext.h.
- *
- *
- * * src/GGI/include/ggi/mesa/Makefile.am (EXTRA_HEADERS): Include
- * Mesa GGI headers in dist even if HAVE_GGI is not given.
- *
- * * configure.in: Look for GLUT and demo source dirs in $srcdir.
- *
- * * src/swrast/Makefile.am (libMesaSwrast_la_SOURCES): Set to *.[ch].
- * More source list updates in various Makefile.am's.
- *
- * * Makefile.am (dist-hook): Remove CVS directory from distribution.
- * (DIST_SUBDIRS): List all possible subdirs here.
- * (SUBDIRS): Only list subdirs selected for build again.
- * The above two applied to all subdir Makefile.am's also.
- *
- * Revision 1.4  2000/09/08 21:45:21  brianp
- * added dither key option
- *
  * Revision 1.3  1999/10/28 18:23:29  brianp
  * minor changes to Usage() function
  *
@@ -66,7 +37,7 @@
 #include <math.h>
 #include <GL/glut.h>
 
-#include "readtex.c"
+#include "../util/readtex.c"  /* a hack, I know */
 
 #define IMAGE_FILE "../images/girl.rgb"
 
@@ -80,7 +51,7 @@ static int DrawWidth, DrawHeight;
 static int Scissor = 0;
 static float Xzoom, Yzoom;
 static GLboolean DrawFront = GL_FALSE;
-static GLboolean Dither = GL_TRUE;
+
 
 
 static void Reset( void )
@@ -183,13 +154,6 @@ static void Key( unsigned char key, int x, int y )
       case ' ':
          Reset();
          break;
-      case 'd':
-         Dither = !Dither;
-         if (Dither)
-            glEnable(GL_DITHER);
-         else
-            glDisable(GL_DITHER);
-         break;
       case 'w':
          if (DrawWidth > 0)
             DrawWidth--;
@@ -354,7 +318,7 @@ int main( int argc, char *argv[] )
    if (ciMode)
       glutInitDisplayMode( GLUT_INDEX | GLUT_DOUBLE );
    else
-      glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE);
+      glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
 
    glutCreateWindow(argv[0]);
 

progs/demos/fire.c

@@ -1,770 +0,0 @@
-/*
- * This program is under the GNU GPL.
- * Use at your own risk.
- *
- * written by David Bucciarelli (tech.hmw@plus.it)
- *            Humanware s.r.l.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <time.h>
-
-#ifdef WIN32
-#include <windows.h>
-#include <mmsystem.h>
-#endif
-
-#include <GL/glut.h>
-#include "readtex.c"
-
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen = 1;
-#endif
-
-#ifndef M_PI
-#define M_PI 3.1415926535
-#endif
-
-#define vinit(a,i,j,k) {\
-  (a)[0]=i;\
-  (a)[1]=j;\
-  (a)[2]=k;\
-}
-
-#define vinit4(a,i,j,k,w) {\
-  (a)[0]=i;\
-  (a)[1]=j;\
-  (a)[2]=k;\
-  (a)[3]=w;\
-}
-
-
-#define vadds(a,dt,b) {\
-  (a)[0]+=(dt)*(b)[0];\
-  (a)[1]+=(dt)*(b)[1];\
-  (a)[2]+=(dt)*(b)[2];\
-}
-
-#define vequ(a,b) {\
-  (a)[0]=(b)[0];\
-  (a)[1]=(b)[1];\
-  (a)[2]=(b)[2];\
-}
-
-#define vinter(a,dt,b,c) {\
-  (a)[0]=(dt)*(b)[0]+(1.0-dt)*(c)[0];\
-  (a)[1]=(dt)*(b)[1]+(1.0-dt)*(c)[1];\
-  (a)[2]=(dt)*(b)[2]+(1.0-dt)*(c)[2];\
-}
-
-#define clamp(a)        ((a) < 0.0 ? 0.0 : ((a) < 1.0 ? (a) : 1.0))
-
-#define vclamp(v) {\
-  (v)[0]=clamp((v)[0]);\
-  (v)[1]=clamp((v)[1]);\
-  (v)[2]=clamp((v)[2]);\
-}
-
-static int WIDTH = 640;
-static int HEIGHT = 480;
-
-static GLint T0 = 0;
-static GLint Frames = 0;
-static GLint NiceFog = 1;
-
-#define DIMP 20.0
-#define DIMTP 16.0
-
-#define RIDCOL 0.4
-
-#define NUMTREE 50
-#define TREEINR 2.5
-#define TREEOUTR 8.0
-
-#define AGRAV -9.8
-
-typedef struct
-{
-   int age;
-   float p[3][3];
-   float v[3];
-   float c[3][4];
-}
-part;
-
-static float treepos[NUMTREE][3];
-
-static float black[3] = { 0.0, 0.0, 0.0 };
-static float blu[3] = { 0.0, 0.2, 1.0 };
-static float blu2[3] = { 0.0, 1.0, 1.0 };
-
-static float fogcolor[4] = { 1.0, 1.0, 1.0, 1.0 };
-
-static float q[4][3] = {
-   {-DIMP, 0.0, -DIMP},
-   {DIMP, 0.0, -DIMP},
-   {DIMP, 0.0, DIMP},
-   {-DIMP, 0.0, DIMP}
-};
-
-static float qt[4][2] = {
-   {-DIMTP, -DIMTP},
-   {DIMTP, -DIMTP},
-   {DIMTP, DIMTP},
-   {-DIMTP, DIMTP}
-};
-
-static int win = 0;
-
-static int np;
-static float eject_r, dt, maxage, eject_vy, eject_vl;
-static short shadows;
-static float ridtri;
-static int fog = 1;
-static int help = 1;
-static int joyavailable = 0;
-static int joyactive = 0;
-
-static part *p;
-
-static GLuint groundid;
-static GLuint treeid;
-
-static float obs[3] = { 2.0, 1.0, 0.0 };
-static float dir[3];
-static float v = 0.0;
-static float alpha = -90.0;
-static float beta = 90.0;
-
-static float
-vrnd(void)
-{
-   return (((float) rand()) / RAND_MAX);
-}
-
-static void
-setnewpart(part * p)
-{
-   float a, v[3], *c;
-
-   p->age = 0;
-
-   a = vrnd() * 3.14159265359 * 2.0;
-
-   vinit(v, sin(a) * eject_r * vrnd(), 0.15, cos(a) * eject_r * vrnd());
-   vinit(p->p[0], v[0] + vrnd() * ridtri, v[1] + vrnd() * ridtri,
-	 v[2] + vrnd() * ridtri);
-   vinit(p->p[1], v[0] + vrnd() * ridtri, v[1] + vrnd() * ridtri,
-	 v[2] + vrnd() * ridtri);
-   vinit(p->p[2], v[0] + vrnd() * ridtri, v[1] + vrnd() * ridtri,
-	 v[2] + vrnd() * ridtri);
-
-   vinit(p->v, v[0] * eject_vl / (eject_r / 2),
-	 vrnd() * eject_vy + eject_vy / 2, v[2] * eject_vl / (eject_r / 2));
-
-   c = blu;
-
-   vinit4(p->c[0], c[0] * ((1.0 - RIDCOL) + vrnd() * RIDCOL),
-	  c[1] * ((1.0 - RIDCOL) + vrnd() * RIDCOL),
-	  c[2] * ((1.0 - RIDCOL) + vrnd() * RIDCOL), 1.0);
-   vinit4(p->c[1], c[0] * ((1.0 - RIDCOL) + vrnd() * RIDCOL),
-	  c[1] * ((1.0 - RIDCOL) + vrnd() * RIDCOL),
-	  c[2] * ((1.0 - RIDCOL) + vrnd() * RIDCOL), 1.0);
-   vinit4(p->c[2], c[0] * ((1.0 - RIDCOL) + vrnd() * RIDCOL),
-	  c[1] * ((1.0 - RIDCOL) + vrnd() * RIDCOL),
-	  c[2] * ((1.0 - RIDCOL) + vrnd() * RIDCOL), 1.0);
-}
-
-static void
-setpart(part * p)
-{
-   float fact;
-
-   if (p->p[0][1] < 0.1) {
-      setnewpart(p);
-      return;
-   }
-
-   p->v[1] += AGRAV * dt;
-
-   vadds(p->p[0], dt, p->v);
-   vadds(p->p[1], dt, p->v);
-   vadds(p->p[2], dt, p->v);
-
-   p->age++;
-
-   if ((p->age) > maxage) {
-      vequ(p->c[0], blu2);
-      vequ(p->c[1], blu2);
-      vequ(p->c[2], blu2);
-   }
-   else {
-      fact = 1.0 / maxage;
-      vadds(p->c[0], fact, blu2);
-      vclamp(p->c[0]);
-      p->c[0][3] = fact * (maxage - p->age);
-
-      vadds(p->c[1], fact, blu2);
-      vclamp(p->c[1]);
-      p->c[1][3] = fact * (maxage - p->age);
-
-      vadds(p->c[2], fact, blu2);
-      vclamp(p->c[2]);
-      p->c[2][3] = fact * (maxage - p->age);
-   }
-}
-
-static void
-drawtree(float x, float y, float z)
-{
-   glBegin(GL_QUADS);
-   glTexCoord2f(0.0, 0.0);
-   glVertex3f(x - 1.5, y + 0.0, z);
-
-   glTexCoord2f(1.0, 0.0);
-   glVertex3f(x + 1.5, y + 0.0, z);
-
-   glTexCoord2f(1.0, 1.0);
-   glVertex3f(x + 1.5, y + 3.0, z);
-
-   glTexCoord2f(0.0, 1.0);
-   glVertex3f(x - 1.5, y + 3.0, z);
-
-
-   glTexCoord2f(0.0, 0.0);
-   glVertex3f(x, y + 0.0, z - 1.5);
-
-   glTexCoord2f(1.0, 0.0);
-   glVertex3f(x, y + 0.0, z + 1.5);
-
-   glTexCoord2f(1.0, 1.0);
-   glVertex3f(x, y + 3.0, z + 1.5);
-
-   glTexCoord2f(0.0, 1.0);
-   glVertex3f(x, y + 3.0, z - 1.5);
-
-   glEnd();
-
-}
-
-static void
-calcposobs(void)
-{
-   dir[0] = sin(alpha * M_PI / 180.0);
-   dir[2] = cos(alpha * M_PI / 180.0) * sin(beta * M_PI / 180.0);
-   dir[1] = cos(beta * M_PI / 180.0);
-
-   if (dir[0] < 1.0e-5 && dir[0] > -1.0e-5)
-      dir[0] = 0;
-   if (dir[1] < 1.0e-5 && dir[1] > -1.0e-5)
-      dir[1] = 0;
-   if (dir[2] < 1.0e-5 && dir[2] > -1.0e-5)
-      dir[2] = 0;
-
-   obs[0] += v * dir[0];
-   obs[1] += v * dir[1];
-   obs[2] += v * dir[2];
-}
-
-static void
-printstring(void *font, char *string)
-{
-   int len, i;
-
-   len = (int) strlen(string);
-   for (i = 0; i < len; i++)
-      glutBitmapCharacter(font, string[i]);
-}
-
-static void
-reshape(int width, int height)
-{
-   WIDTH = width;
-   HEIGHT = height;
-   glViewport(0, 0, (GLint) width, (GLint) height);
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   gluPerspective(70.0, width / (float) height, 0.1, 30.0);
-
-   glMatrixMode(GL_MODELVIEW);
-}
-
-static void
-printhelp(void)
-{
-   glColor4f(0.0, 0.0, 0.0, 0.5);
-   glRecti(40, 40, 600, 440);
-
-   glColor3f(1.0, 0.0, 0.0);
-   glRasterPos2i(300, 420);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Help");
-
-   glRasterPos2i(60, 390);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Togle Help");
-
-   glRasterPos2i(60, 360);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "t - Increase particle size");
-   glRasterPos2i(60, 330);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "T - Decrease particle size");
-
-   glRasterPos2i(60, 300);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "r - Increase emission radius");
-   glRasterPos2i(60, 270);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "R - Decrease emission radius");
-
-   glRasterPos2i(60, 240);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Togle Fog");
-   glRasterPos2i(60, 210);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "s - Togle shadows");
-   glRasterPos2i(60, 180);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Arrow Keys - Rotate");
-   glRasterPos2i(60, 150);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "a - Increase velocity");
-   glRasterPos2i(60, 120);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "z - Decrease velocity");
-
-   glRasterPos2i(60, 90);
-   if (joyavailable)
-      printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "j - Togle jostick control (Joystick control available)");
-   else
-      printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "(No Joystick control available)");
-}
-
-static void
-dojoy(void)
-{
-#ifdef WIN32
-   static UINT max[2] = { 0, 0 };
-   static UINT min[2] = { 0xffffffff, 0xffffffff }, center[2];
-   MMRESULT res;
-   JOYINFO joy;
-
-   res = joyGetPos(JOYSTICKID1, &joy);
-
-   if (res == JOYERR_NOERROR) {
-      joyavailable = 1;
-
-      if (max[0] < joy.wXpos)
-	 max[0] = joy.wXpos;
-      if (min[0] > joy.wXpos)
-	 min[0] = joy.wXpos;
-      center[0] = (max[0] + min[0]) / 2;
-
-      if (max[1] < joy.wYpos)
-	 max[1] = joy.wYpos;
-      if (min[1] > joy.wYpos)
-	 min[1] = joy.wYpos;
-      center[1] = (max[1] + min[1]) / 2;
-
-      if (joyactive) {
-	 if (fabs(center[0] - (float) joy.wXpos) > 0.1 * (max[0] - min[0]))
-	    alpha +=
-	       2.5 * (center[0] - (float) joy.wXpos) / (max[0] - min[0]);
-	 if (fabs(center[1] - (float) joy.wYpos) > 0.1 * (max[1] - min[1]))
-	    beta += 2.5 * (center[1] - (float) joy.wYpos) / (max[1] - min[1]);
-
-	 if (joy.wButtons & JOY_BUTTON1)
-	    v += 0.01;
-	 if (joy.wButtons & JOY_BUTTON2)
-	    v -= 0.01;
-      }
-   }
-   else
-      joyavailable = 0;
-#endif
-}
-
-static void
-drawfire(void)
-{
-   static char frbuf[80] = "";
-   int j;
-
-   dojoy();
-
-   if (NiceFog)
-      glHint(GL_FOG_HINT, GL_NICEST);
-   else
-      glHint(GL_FOG_HINT, GL_DONT_CARE);
-
-   glEnable(GL_DEPTH_TEST);
-
-   if (fog)
-      glEnable(GL_FOG);
-   else
-      glDisable(GL_FOG);
-
-   glDepthMask(GL_TRUE);
-   glClearColor(1.0, 1.0, 1.0, 1.0);
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-   glPushMatrix();
-   calcposobs();
-   gluLookAt(obs[0], obs[1], obs[2],
-	     obs[0] + dir[0], obs[1] + dir[1], obs[2] + dir[2],
-	     0.0, 1.0, 0.0);
-
-   glColor4f(1.0, 1.0, 1.0, 1.0);
-
-   glEnable(GL_TEXTURE_2D);
-
-   glBindTexture(GL_TEXTURE_2D, groundid);
-#if 1
-   glBegin(GL_QUADS);
-   glTexCoord2fv(qt[0]);
-   glVertex3fv(q[0]);
-   glTexCoord2fv(qt[1]);
-   glVertex3fv(q[1]);
-   glTexCoord2fv(qt[2]);
-   glVertex3fv(q[2]);
-   glTexCoord2fv(qt[3]);
-   glVertex3fv(q[3]);
-   glEnd();
-#else
-   /* Subdivide the ground into a bunch of quads.  This improves fog
-    * if GL_FOG_HINT != GL_NICEST
-    */
-   {
-      float x, y;
-      float dx = 1.0, dy = 1.0;
-      glBegin(GL_QUADS);
-      for (y = -DIMP; y < DIMP; y += 1.0) {
-         for (x = -DIMP; x < DIMP; x += 1.0) {
-            glTexCoord2f(0, 0);   glVertex3f(x, 0, y);
-            glTexCoord2f(1, 0);   glVertex3f(x+dx, 0, y);
-            glTexCoord2f(1, 1);   glVertex3f(x+dx, 0, y+dy);
-            glTexCoord2f(0, 1);   glVertex3f(x, 0, y+dy);
-         }
-      }
-      glEnd();
-   }
-#endif
-
-
-   glEnable(GL_ALPHA_TEST);
-   glAlphaFunc(GL_GEQUAL, 0.9);
-
-   glBindTexture(GL_TEXTURE_2D, treeid);
-   for (j = 0; j < NUMTREE; j++)
-      drawtree(treepos[j][0], treepos[j][1], treepos[j][2]);
-
-   glDisable(GL_TEXTURE_2D);
-   glDepthMask(GL_FALSE);
-   glDisable(GL_ALPHA_TEST);
-
-   if (shadows) {
-      glBegin(GL_TRIANGLES);
-      for (j = 0; j < np; j++) {
-	 glColor4f(black[0], black[1], black[2], p[j].c[0][3]);
-	 glVertex3f(p[j].p[0][0], 0.1, p[j].p[0][2]);
-
-	 glColor4f(black[0], black[1], black[2], p[j].c[1][3]);
-	 glVertex3f(p[j].p[1][0], 0.1, p[j].p[1][2]);
-
-	 glColor4f(black[0], black[1], black[2], p[j].c[2][3]);
-	 glVertex3f(p[j].p[2][0], 0.1, p[j].p[2][2]);
-      }
-      glEnd();
-   }
-
-   glBegin(GL_TRIANGLES);
-   for (j = 0; j < np; j++) {
-      glColor4fv(p[j].c[0]);
-      glVertex3fv(p[j].p[0]);
-
-      glColor4fv(p[j].c[1]);
-      glVertex3fv(p[j].p[1]);
-
-      glColor4fv(p[j].c[2]);
-      glVertex3fv(p[j].p[2]);
-
-      setpart(&p[j]);
-   }
-   glEnd();
-
-   glDisable(GL_TEXTURE_2D);
-   glDisable(GL_ALPHA_TEST);
-   glDisable(GL_DEPTH_TEST);
-   glDisable(GL_FOG);
-
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   glOrtho(-0.5, 639.5, -0.5, 479.5, -1.0, 1.0);
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-
-   glColor3f(1.0, 0.0, 0.0);
-   glRasterPos2i(10, 10);
-   printstring(GLUT_BITMAP_HELVETICA_18, frbuf);
-   glRasterPos2i(370, 470);
-   printstring(GLUT_BITMAP_HELVETICA_10,
-	       "Fire V1.5 Written by David Bucciarelli (tech.hmw@plus.it)");
-
-   if (help)
-      printhelp();
-
-   reshape(WIDTH, HEIGHT);
-   glPopMatrix();
-
-   glutSwapBuffers();
-
-   Frames++;
-   {
-      GLint t = glutGet(GLUT_ELAPSED_TIME);
-      if (t - T0 >= 2000) {
-         GLfloat seconds = (t - T0) / 1000.0;
-         GLfloat fps = Frames / seconds;
-         sprintf(frbuf, "Frame rate: %f", fps);
-         T0 = t;
-         Frames = 0;
-      }
-   }
-}
-
-
-static void
-idle(void)
-{
-   glutPostRedisplay();
-}
-
-
-static void
-special(int key, int x, int y)
-{
-   switch (key) {
-   case GLUT_KEY_LEFT:
-      alpha += 2.0;
-      break;
-   case GLUT_KEY_RIGHT:
-      alpha -= 2.0;
-      break;
-   case GLUT_KEY_DOWN:
-      beta -= 2.0;
-      break;
-   case GLUT_KEY_UP:
-      beta += 2.0;
-      break;
-   }
-   glutPostRedisplay();
-}
-
-static void
-key(unsigned char key, int x, int y)
-{
-   switch (key) {
-   case 27:
-      exit(0);
-      break;
-
-   case 'a':
-      v += 0.01;
-      break;
-   case 'z':
-      v -= 0.01;
-      break;
-
-   case 'j':
-      joyactive = (!joyactive);
-      break;
-   case 'h':
-      help = (!help);
-      break;
-   case 'f':
-      fog = (!fog);
-      break;
-   case 's':
-      shadows = !shadows;
-      break;
-   case 'R':
-      eject_r -= 0.03;
-      break;
-   case 'r':
-      eject_r += 0.03;
-      break;
-   case 't':
-      ridtri += 0.005;
-      break;
-   case 'T':
-      ridtri -= 0.005;
-      break;
-#ifdef XMESA
-   case ' ':
-      XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
-      fullscreen = (!fullscreen);
-      break;
-#endif
-   case 'n':
-      NiceFog = !NiceFog;
-      printf("NiceFog %d\n", NiceFog);
-      break;
-   }
-   glutPostRedisplay();
-}
-
-static void
-inittextures(void)
-{
-   GLenum gluerr;
-   GLubyte tex[128][128][4];
-
-   glGenTextures(1, &groundid);
-   glBindTexture(GL_TEXTURE_2D, groundid);
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-   if (!LoadRGBMipmaps("../images/s128.rgb", GL_RGB)) {
-      fprintf(stderr, "Error reading a texture.\n");
-      exit(-1);
-   }
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-		   GL_LINEAR_MIPMAP_LINEAR);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
-
-   glGenTextures(1, &treeid);
-   glBindTexture(GL_TEXTURE_2D, treeid);
-
-   if (1)
-   {
-      int w, h;
-      GLenum format;
-      int x, y;
-      GLubyte *image = LoadRGBImage("../images/tree3.rgb", &w, &h, &format);
-
-      if (!image) {
-	 fprintf(stderr, "Error reading a texture.\n");
-	 exit(-1);
-      }
-
-      for (y = 0; y < 128; y++)
-	 for (x = 0; x < 128; x++) {
-	    tex[x][y][0] = image[(y + x * 128) * 3];
-	    tex[x][y][1] = image[(y + x * 128) * 3 + 1];
-	    tex[x][y][2] = image[(y + x * 128) * 3 + 2];
-	    if ((tex[x][y][0] == tex[x][y][1]) &&
-		(tex[x][y][1] == tex[x][y][2]) && (tex[x][y][2] == 255))
-	       tex[x][y][3] = 0;
-	    else
-	       tex[x][y][3] = 255;
-	 }
-
-      if ((gluerr = gluBuild2DMipmaps(GL_TEXTURE_2D, 4, 128, 128, GL_RGBA,
-				      GL_UNSIGNED_BYTE, (GLvoid *) (tex)))) {
-	 fprintf(stderr, "GLULib%s\n", gluErrorString(gluerr));
-	 exit(-1);
-      }
-   }
-   else {
-      if (!LoadRGBMipmaps("../images/tree2.rgba", GL_RGBA)) {
-	 fprintf(stderr, "Error reading a texture.\n");
-	 exit(-1);
-      }
-   }
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-		   GL_LINEAR_MIPMAP_LINEAR);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-}
-
-static void
-inittree(void)
-{
-   int i;
-   float dist;
-
-   for (i = 0; i < NUMTREE; i++)
-      do {
-	 treepos[i][0] = vrnd() * TREEOUTR * 2.0 - TREEOUTR;
-	 treepos[i][1] = 0.0;
-	 treepos[i][2] = vrnd() * TREEOUTR * 2.0 - TREEOUTR;
-	 dist =
-	    sqrt(treepos[i][0] * treepos[i][0] +
-		 treepos[i][2] * treepos[i][2]);
-      } while ((dist < TREEINR) || (dist > TREEOUTR));
-}
-
-int
-main(int ac, char **av)
-{
-   int i;
-
-   fprintf(stderr,
-	   "Fire V1.5\nWritten by David Bucciarelli (tech.hmw@plus.it)\n");
-
-   /* Default settings */
-
-   np = 800;
-   eject_r = 0.1;
-   dt = 0.015;
-   eject_vy = 4;
-   eject_vl = 1;
-   shadows = 1;
-   ridtri = 0.1;
-
-   maxage = 1.0 / dt;
-
-   if (ac == 2)
-      np = atoi(av[1]);
-
-   if (ac == 4) {
-      WIDTH = atoi(av[2]);
-      HEIGHT = atoi(av[3]);
-   }
-
-   glutInitWindowPosition(0, 0);
-   glutInitWindowSize(WIDTH, HEIGHT);
-   glutInit(&ac, av);
-
-   glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
-
-   if (!(win = glutCreateWindow("Fire"))) {
-      fprintf(stderr, "Error opening a window.\n");
-      exit(-1);
-   }
-
-   reshape(WIDTH, HEIGHT);
-
-   inittextures();
-
-   glShadeModel(GL_FLAT);
-   glEnable(GL_DEPTH_TEST);
-
-   glEnable(GL_BLEND);
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-   glEnable(GL_FOG);
-   glFogi(GL_FOG_MODE, GL_EXP);
-   glFogfv(GL_FOG_COLOR, fogcolor);
-   glFogf(GL_FOG_DENSITY, 0.1);
-
-   p = malloc(sizeof(part) * np);
-
-   for (i = 0; i < np; i++)
-      setnewpart(&p[i]);
-
-   inittree();
-
-   glutKeyboardFunc(key);
-   glutSpecialFunc(special);
-   glutDisplayFunc(drawfire);
-   glutIdleFunc(idle);
-   glutReshapeFunc(reshape);
-   glutMainLoop();
-
-   return (0);
-}

progs/demos/gamma.c

@@ -1,5 +1,5 @@
 
-/* $Id: gamma.c,v 1.2 2000/03/18 01:13:29 brianp Exp $ */
+/* $Id: gamma.c,v 1.1.1.1.2.1 2000/03/18 01:14:01 brianp Exp $ */
 
 /* Draw test patterns to help determine correct gamma value for a display.
    When the intensities of the inner squares nearly match the intensities
@@ -25,6 +25,9 @@
 
 /*
  * $Log: gamma.c,v $
+ * Revision 1.1.1.1.2.1  2000/03/18 01:14:01  brianp
+ * colors were computed incorrectly (Hans Nelles)
+ *
  * Revision 1.2  2000/03/18 01:13:29  brianp
  * colors were computed incorrectly (Hans Nelles)
  *

progs/demos/gears.c

@@ -1,11 +1,10 @@
-/* $Id: gears.c,v 1.6 2000/04/06 02:22:59 brianp Exp $ */
+/* $Id: gears.c,v 1.2 1999/10/21 16:39:06 brianp Exp $ */
 
 /*
  * 3-D gear wheels.  This program is in the public domain.
  *
  * Command line options:
  *    -info      print GL implementation information
- *    -exit      automatically exit after 30 seconds
  *
  *
  * Brian Paul
@@ -13,6 +12,24 @@
 
 /* Conversion to GLUT by Mark J. Kilgard */
 
+/*
+ * $Log: gears.c,v $
+ * Revision 1.2  1999/10/21 16:39:06  brianp
+ * added -info command line option
+ *
+ * Revision 1.1.1.1  1999/08/19 00:55:40  jtg
+ * Imported sources
+ *
+ * Revision 3.2  1999/06/03 17:07:36  brianp
+ * an extra quad was being drawn in front and back faces
+ *
+ * Revision 3.1  1998/11/03 02:49:10  brianp
+ * added fps output
+ *
+ * Revision 3.0  1998/02/14 18:42:29  brianp
+ * initial rev
+ *
+ */
 
 
 #include <math.h>
@@ -27,7 +44,7 @@
 
 static GLint T0 = 0;
 static GLint Frames = 0;
-static GLint autoexit = 0;
+
 
 /**
 
@@ -170,44 +187,41 @@ 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);
+  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.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, -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();
+  glPushMatrix();
+  glTranslatef(-3.1, 4.2, 0.0);
+  glRotatef(-2.0 * angle - 25.0, 0.0, 0.0, 1.0);
+  glCallList(gear3);
+  glPopMatrix();
 
   glPopMatrix();
 
   glutSwapBuffers();
 
   Frames++;
-
   {
      GLint t = glutGet(GLUT_ELAPSED_TIME);
      if (t - T0 >= 5000) {
         GLfloat seconds = (t - T0) / 1000.0;
         GLfloat fps = Frames / seconds;
-        printf("%d frames in %6.3f seconds = %6.3f FPS\n", Frames, seconds, fps);
+        printf("%d frames in %g seconds = %g FPS\n", Frames, seconds, fps);
         T0 = t;
         Frames = 0;
-        if ((t >= 999.0 * autoexit) && (autoexit))
-           exit(0);
      }
   }
 }
@@ -283,11 +297,14 @@ reshape(int width, int height)
 static void
 init(int argc, char *argv[])
 {
-  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};
-  GLint i;
+  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);
@@ -316,21 +333,15 @@ init(int argc, char *argv[])
 
   glEnable(GL_NORMALIZE);
 
-  for ( i=1; i<argc; i++ ) {
-    if (strcmp(argv[i], "-info")==0) {
-      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));
-    }
-    else if ( strcmp(argv[i], "-exit")==0) {
-      autoexit = 30;
-      printf("Auto Exit after %i seconds.\n", autoexit );
-    }
+  if (argc > 1 && strcmp(argv[1], "-info")==0) {
+     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));
   }
 }
 
-static void 
+void 
 visible(int vis)
 {
   if (vis == GLUT_VISIBLE)

progs/demos/geartrain.dat

@@ -1,119 +0,0 @@
-BACKGROUND = 0.000 0.500 0.700
-
-ANAME = AXLE1
-ARADIUS = 1.000
-AAXIS = 2
-APOSITION = -7.000 0.000 0.000
-ACOLOR = 0.800 0.500 0.200
-ALENGTH = 6.000
-AMOTORED = 1
-AANGULARVELOCITY = 2.000
-ADIRECTION = 1
-
-ANAME = AXLE2
-ARADIUS = 1.000
-AAXIS = 2
-APOSITION = -3.000 0.000 0.000
-ACOLOR = 0.800 0.500 0.200
-ALENGTH = 12.000
-AMOTORED = 0
-
-ANAME = AXLE3
-ARADIUS = 1.000
-AAXIS = 2
-APOSITION = 1.000 0.000 0.000
-ACOLOR = 0.800 0.500 0.200
-ALENGTH = 6.000
-AMOTORED = 0
-
-ANAME = AXLE4
-ARADIUS = 1.000
-AAXIS = 2
-APOSITION = 8.000 0.000 0.000
-ACOLOR = 0.800 0.500 0.200
-ALENGTH = 18.000
-AMOTORED = 0
-
-ANAME = AXLE5
-ARADIUS = 1.000
-AAXIS = 1
-APOSITION = 8.000 -8.200 -7.400
-ACOLOR = 0.800 0.500 0.200
-ALENGTH = 12.000
-AMOTORED = 0
-
-GNAME = GEAR1
-GTYPE = NORMAL
-GRADIUS = 2.200
-GWIDTH = 3.000
-GTEETH = 40
-GTOOTHDEPTH = 0.500
-GCOLOR = 0.500 0.500 0.500
-GAXLE = AXLE1
-GPOSITION = 0.000
-
-GNAME = GEAR2
-GTYPE = NORMAL
-GRADIUS = 2.200
-GWIDTH = 3.000
-GTEETH = 30
-GTOOTHDEPTH = 0.500
-GCOLOR = 0.500 0.500 0.500
-GAXLE = AXLE2
-GPOSITION = 0.000
-
-GNAME = GEAR3
-GTYPE = NORMAL
-GRADIUS = 2.200
-GWIDTH = 3.000
-GTEETH = 20
-GTOOTHDEPTH = 0.500
-GCOLOR = 0.500 0.500 0.500
-GAXLE = AXLE3
-GPOSITION = 0.000
-
-GNAME = GEAR4
-GTYPE = NORMAL
-GRADIUS = 1.700
-GWIDTH = 1.000
-GTEETH = 20
-GTOOTHDEPTH = 0.500
-GCOLOR = 0.500 0.500 0.500
-GAXLE = AXLE2
-GPOSITION = 5.000
-
-GNAME = GEAR5
-GTYPE = NORMAL
-GRADIUS = 3.000
-GWIDTH = 1.000
-GTEETH = 20
-GTOOTHDEPTH = 0.500
-GCOLOR = 0.500 0.500 0.500
-GAXLE = AXLE4
-GPOSITION = 5.000
-
-GNAME = GEAR6
-GTYPE = BEVEL
-GFACE = 0
-GRADIUS = 4.000
-GWIDTH = 1.000
-GTEETH = 20
-GTOOTHDEPTH = 1.700
-GCOLOR = 0.500 0.500 0.500
-GAXLE = AXLE4
-GPOSITION = -4.000
-
-GNAME = GEAR7
-GTYPE = BEVEL
-GFACE = 0
-GRADIUS = 4.000
-GWIDTH = 1.000
-GTEETH = 20
-GTOOTHDEPTH = 1.700
-GCOLOR = 0.500 0.500 0.500
-GAXLE = AXLE5
-GPOSITION = 5.000
-
-BELTNAME = BELT1
-GEAR1NAME = GEAR5
-GEAR2NAME = GEAR4

progs/demos/gloss.c

@@ -1,4 +1,4 @@
-/* $Id: gloss.c,v 1.6 2000/12/24 22:53:54 pesco Exp $ */
+/* $Id: gloss.c,v 1.3 1999/10/26 17:08:31 brianp Exp $ */
 
 /*
  * Specular reflection demo.  The specular highlight is modulated by
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <GL/glut.h>
 
-#include "readtex.c"   /* I know, this is a hack. */
+#include "../util/readtex.c"   /* I know, this is a hack. */
 
 #define SPECULAR_TEXTURE_FILE "../images/reflect.rgb"
 #define BASE_TEXTURE_FILE "../images/tile.rgb"
@@ -46,7 +46,7 @@ static GLfloat DXrot = 1.0, DYrot = 2.5;
 static GLfloat Black[4] = { 0, 0, 0, 0 };
 static GLfloat White[4] = { 1, 1, 1, 1 };
 static GLfloat Diffuse[4] = { .3, .3, 1.0, 1.0 };  /* blue */
-static GLfloat Shininess = 6;
+static GLfloat Shininess = 15;
 
 static GLuint BaseTexture, SpecularTexture;
 static GLboolean DoSpecTexture = GL_TRUE;
@@ -245,7 +245,7 @@ static void Init( int argc, char *argv[] )
 
       glMatrixMode(GL_TEXTURE);
       glLoadIdentity();
-      /*glScalef(8.0, 4.0, 2.0);*/
+      glScalef(8.0, 4.0, 2.0);
       glMatrixMode(GL_MODELVIEW);
 
       /* cylinder */
@@ -322,14 +322,8 @@ static void Init( int argc, char *argv[] )
    glBindTexture(GL_TEXTURE_2D, SpecularTexture);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-#if 1
    glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
    glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-#else
-   glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV);
-   glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV);
-   glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV);
-#endif
    if (!LoadRGBMipmaps(SPECULAR_TEXTURE_FILE, GL_RGB)) {
       printf("Error: couldn't load texture image file %s\n", SPECULAR_TEXTURE_FILE);
       exit(1);

progs/demos/gltestperf.c

@@ -1,580 +0,0 @@
-/*
- * This program is under the GNU GPL.
- * Use at your own risk.
- *
- * written by David Bucciarelli (tech.hmw@plus.it)
- *            Humanware s.r.l.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <GL/glut.h>
-
-typedef struct
-{
-   char *name;
-   char *unit;
-   void (*init) (void);
-   int (*run) (int, int);
-   int type;
-   int numsize;
-   int size[10];
-}
-benchmark;
-
-static int frontbuffer = 1;
-
-/***************************************************************************/
-
-static void
-init_test01(void)
-{
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   gluOrtho2D(-0.5, 639.5, -0.5, 479.5);
-   glMatrixMode(GL_MODELVIEW);
-
-   glShadeModel(GL_FLAT);
-   glDisable(GL_DEPTH_TEST);
-
-   glClearColor(0.0, 0.1, 1.0, 0.0);
-   glClear(GL_COLOR_BUFFER_BIT);
-   glColor3f(1.0, 0.0, 0.0);
-}
-
-static int
-test01(int size, int num)
-{
-   int x, y;
-
-   glBegin(GL_POINTS);
-   for (y = 0; y < num; y++)
-      for (x = 0; x < 480; x++)
-	 glVertex2i(x, x);
-   glEnd();
-
-   return 480 * num;
-}
-
-/***************************************************************************/
-
-static void
-init_test02(void)
-{
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   gluOrtho2D(-0.5, 639.5, -0.5, 479.5);
-   glMatrixMode(GL_MODELVIEW);
-
-   glShadeModel(GL_SMOOTH);
-   glDisable(GL_DEPTH_TEST);
-
-   glClearColor(0.0, 0.1, 1.0, 0.0);
-   glClear(GL_COLOR_BUFFER_BIT);
-}
-
-static int
-test02(int size, int num)
-{
-   int x, y;
-
-   glBegin(GL_LINES);
-   for (y = 0; y < num; y++)
-      for (x = 0; x < size; x++) {
-	 glColor3f(0.0, 1.0, y / (float) num);
-	 glVertex2i(0, size - 1);
-	 glColor3f(1.0, 0.0, x / (float) size);
-	 glVertex2i(x, x);
-      }
-   glEnd();
-
-   return num * size;
-}
-
-/***************************************************************************/
-
-static void
-init_test03(void)
-{
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   glOrtho(-0.5, 639.5, -0.5, 479.5, 1.0, -1000.0 * 480.0);
-   glMatrixMode(GL_MODELVIEW);
-
-   glShadeModel(GL_SMOOTH);
-   glEnable(GL_DEPTH_TEST);
-
-   glClearColor(0.0, 0.1, 1.0, 0.0);
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-}
-
-static int
-test03(int size, int num)
-{
-   int x, y, z;
-
-   glBegin(GL_TRIANGLES);
-   for (y = 0; y < num; y++)
-      for (x = 0; x < size; x += 5) {
-	 z = num * size - (y * size + x);
-	 glColor3f(0.0, 1.0, 0.0);
-	 glVertex3i(0, x, z);
-
-	 glColor3f(1.0, 0.0, x / (float) size);
-	 glVertex3i(size - 1 - x, 0, z);
-
-	 glColor3f(1.0, x / (float) size, 0.0);
-	 glVertex3i(x, size - 1 - x, z);
-      }
-   glEnd();
-
-   return size * num / 5;
-}
-
-/***************************************************************************/
-
-static void
-init_test04(void)
-{
-   int x, y;
-   GLubyte tex[128 * 128 * 3];
-   GLenum gluerr;
-
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   glOrtho(-0.5, 639.5, -0.5, 479.5, 1.0, -1000.0 * 480.0);
-
-   glMatrixMode(GL_MODELVIEW);
-
-   glShadeModel(GL_SMOOTH);
-   glEnable(GL_DEPTH_TEST);
-
-   glEnable(GL_BLEND);
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-   for (y = 0; y < 128; y++)
-      for (x = 0; x < 128; x++) {
-	 tex[(x + y * 128) * 3 + 0] = ((x % (128 / 4)) < (128 / 8)) ? 255 : 0;
-	 tex[(x + y * 128) * 3 + 1] = ((y % (128 / 4)) < (128 / 8)) ? 255 : 0;
-	 tex[(x + y * 128) * 3 + 2] = x;
-      }
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   if ((gluerr = gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 128, 128, GL_RGB,
-				   GL_UNSIGNED_BYTE, (GLvoid *) (&tex[0])))) {
-      fprintf(stderr, "GLULib%s\n", gluErrorString(gluerr));
-      exit(-1);
-   }
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-		   GL_LINEAR_MIPMAP_NEAREST);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-   glEnable(GL_TEXTURE_2D);
-
-   glClearColor(0.0, 0.1, 1.0, 0.0);
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-}
-
-static int
-test04(int size, int num)
-{
-   int x, y, z;
-
-   glBegin(GL_TRIANGLES);
-   for (y = 0; y < num; y++)
-      for (x = 0; x < size; x += 5) {
-	 z = num * size - (y * size + x);
-	 glTexCoord2f(1.0, 1.0);
-	 glColor3f(1.0, 0.0, 0.0);
-	 glVertex3i(0, x, z);
-
-	 glTexCoord2f(0.0, 1.0);
-	 glColor3f(0.0, 1.0, 0.0);
-	 glVertex3i(size - 1 - x, 0, z);
-
-	 glTexCoord2f(1.0, 0.0);
-	 glColor3f(0.0, 0.0, 1.0);
-	 glVertex3i(x, size - 1 - x, z);
-      }
-   glEnd();
-
-   return num * size / 5;
-}
-
-/***************************************************************************/
-
-static void
-init_test05(void)
-{
-   int x, y;
-   GLubyte tex[128 * 128 * 3];
-   GLenum gluerr;
-
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   glOrtho(-0.5, 639.5, -0.5, 479.5, -1.0, 1.0);
-
-   glMatrixMode(GL_MODELVIEW);
-
-   glShadeModel(GL_SMOOTH);
-   glEnable(GL_DEPTH_TEST);
-
-   glEnable(GL_BLEND);
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-   for (y = 0; y < 128; y++)
-      for (x = 0; x < 128; x++) {
-	 tex[(x + y * 128) * 3 + 0] = ((x % (128 / 4)) < (128 / 8)) ? 255 : 0;
-	 tex[(x + y * 128) * 3 + 1] = ((y % (128 / 4)) < (128 / 8)) ? 255 : 0;
-	 tex[(x + y * 128) * 3 + 2] = x;
-      }
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   if ((gluerr = gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 128, 128, GL_RGB,
-				   GL_UNSIGNED_BYTE, (GLvoid *) (&tex[0])))) {
-      fprintf(stderr, "GLULib%s\n", gluErrorString(gluerr));
-      exit(-1);
-   }
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-		   GL_LINEAR_MIPMAP_NEAREST);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-   glEnable(GL_TEXTURE_2D);
-
-   glDepthFunc(GL_ALWAYS);
-
-   glClearColor(0.0, 0.1, 1.0, 0.0);
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-}
-
-static int
-test05(int size, int num)
-{
-   int y;
-   float v0[3], v1[3], v2[3], v3[3];
-   float cv0[3], cv1[3], cv2[3], cv3[3];
-   float tv0[3], tv1[3], tv2[3], tv3[3];
-
-   v0[0] = 320 - size / 2;
-   v0[1] = 240 - size / 2;
-   v0[2] = 0.0;
-   v1[0] = 320 + size / 2;
-   v1[1] = 240 - size / 2;
-   v1[2] = 0.0;
-   v2[0] = 320 - size / 2;
-   v2[1] = 240 + size / 2;
-   v2[2] = 0.0;
-   v3[0] = 320 + size / 2;
-   v3[1] = 240 + size / 2;
-   v3[2] = 0.0;
-   cv0[0] = 1.0;
-   cv0[1] = 0.0;
-   cv0[2] = 0.0;
-   cv1[0] = 1.0;
-   cv1[1] = 1.0;
-   cv1[2] = 0.0;
-   cv2[0] = 1.0;
-   cv2[1] = 0.0;
-   cv2[2] = 1.0;
-   cv3[0] = 1.0;
-   cv3[1] = 1.0;
-   cv3[2] = 1.0;
-   tv0[0] = 0.0;
-   tv0[1] = 0.0;
-   tv0[2] = 0.0;
-   tv1[0] = 1.0;
-   tv1[1] = 0.0;
-   tv1[2] = 0.0;
-   tv2[0] = 0.0;
-   tv2[1] = 1.0;
-   tv2[2] = 0.0;
-   tv3[0] = 1.0;
-   tv3[1] = 1.0;
-   tv3[2] = 0.0;
-
-   glBegin(GL_TRIANGLE_STRIP);
-   for (y = 0; y < num; y++) {
-      glColor3fv(cv0);
-      glTexCoord2fv(tv0);
-      glVertex3fv(v0);
-
-      glColor3fv(cv1);
-      glTexCoord2fv(tv1);
-      glVertex3fv(v1);
-
-      glColor3fv(cv2);
-      glTexCoord2fv(tv2);
-      glVertex3fv(v2);
-
-      glColor3fv(cv3);
-      glTexCoord2fv(tv3);
-      glVertex3fv(v3);
-   }
-   glEnd();
-
-   return 4 * num - 2;
-}
-
-/***************************************************************************/
-
-static void
-init_test06(void)
-{
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   gluOrtho2D(-0.5, 639.5, -0.5, 479.5);
-   glMatrixMode(GL_MODELVIEW);
-
-   glShadeModel(GL_SMOOTH);
-   glEnable(GL_DEPTH_TEST);
-
-   glClearColor(0.0, 0.1, 1.0, 0.0);
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-}
-
-static int
-test06(int size, int num)
-{
-   int y;
-
-   for (y = 0; y < num; y++) {
-      glClearColor(y / (float) num, 0.1, 1.0, 0.0);
-      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-   }
-
-   return num;
-}
-
-/***************************************************************************/
-
-#define BMARKS_TIME 5.0
-
-#define NUM_BMARKS 6
-
-/* 554 ~= sqrt(640*480) */
-
-static benchmark bmarks[NUM_BMARKS] = {
-   {"Simple Points", "Pnts", init_test01, test01, 0, 0,
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
-   {"Smooth Lines", "Lins", init_test02, test02, 1, 5,
-    {480, 250, 100, 50, 25, 0, 0, 0, 0, 0}},
-   {"ZSmooth Triangles", "Tris", init_test03, test03, 1, 5,
-    {480, 250, 100, 50, 25, 0, 0, 0, 0, 0}},
-   {"ZSmooth Tex Blend Triangles", "Tris", init_test04, test04, 1, 5,
-    {480, 250, 100, 50, 25, 0, 0, 0, 0, 0}},
-   {"ZSmooth Tex Blend TMesh Triangles", "Tris", init_test05, test05, 2, 8,
-    {400, 250, 100, 50, 25, 10, 5, 2, 0, 0}},
-   {"Color/Depth Buffer Clears", "Clrs", init_test06, test06, 3, 0,
-    {554, 0, 0, 0, 0, 0, 0, 0, 0, 0}}
-};
-
-/***************************************************************************/
-
-static void
-dotest0param(benchmark * bmark)
-{
-   float stime, etime, dtime, tottime, maxtime, mintime;
-   int num, numelem, calibnum, j;
-
-   glPushAttrib(GL_ALL_ATTRIB_BITS);
-   bmark->init();
-
-   stime = glutGet(GLUT_ELAPSED_TIME);
-
-   dtime = 0.0;
-   calibnum = 0;
-   while (dtime < 2.0) {
-      bmark->run(0, 1);
-      glFinish();
-      etime = glutGet(GLUT_ELAPSED_TIME);
-      dtime = (etime - stime) / 1000.0;
-      calibnum++;
-   }
-   glPopAttrib();
-
-   fprintf(stderr, "Elapsed time for the calibration test (%d): %f\n",
-	   calibnum, dtime);
-
-   num = (int) ((BMARKS_TIME / dtime) * calibnum);
-
-   if (num < 1)
-      num = 1;
-
-   fprintf(stderr, "Selected number of benchmark iterations: %d\n", num);
-
-   mintime = HUGE_VAL;
-   maxtime = -HUGE_VAL;
-
-   for (tottime = 0.0, j = 0; j < 5; j++) {
-      glPushAttrib(GL_ALL_ATTRIB_BITS);
-      bmark->init();
-
-      stime = glutGet(GLUT_ELAPSED_TIME);
-      numelem = bmark->run(0, num);
-      glFinish();
-      etime = glutGet(GLUT_ELAPSED_TIME);
-
-      glPopAttrib();
-
-      dtime = (etime - stime) / 1000.0;
-      tottime += dtime;
-
-      fprintf(stderr, "Elapsed time for run %d: %f\n", j, dtime);
-
-      if (dtime < mintime)
-	 mintime = dtime;
-      if (dtime > maxtime)
-	 maxtime = dtime;
-   }
-
-   tottime -= mintime + maxtime;
-
-   fprintf(stdout, "%s\n%f %s/sec", bmark->name, numelem / (tottime / 3.0),
-	   bmark->unit);
-
-   if (bmark->type == 3)
-      fprintf(stdout, ", MPixel Fill/sec: %f\n\n",
-	      (numelem * bmark->size[0] * (float) bmark->size[0]) /
-	      (1000000.0 * tottime / 3.0));
-   else
-      fprintf(stdout, "\n\n");
-}
-
-/***************************************************************************/
-
-static void
-dotest1param(benchmark * bmark)
-{
-   float stime, etime, dtime, tottime, maxtime, mintime;
-   int num, numelem, calibnum, j, k;
-
-   fprintf(stdout, "%s\n", bmark->name);
-
-   for (j = 0; j < bmark->numsize; j++) {
-      fprintf(stderr, "Current size: %d\n", bmark->size[j]);
-
-      glPushAttrib(GL_ALL_ATTRIB_BITS);
-      bmark->init();
-
-      stime = glutGet(GLUT_ELAPSED_TIME);
-
-      dtime = 0.0;
-      calibnum = 0;
-      while (dtime < 2.0) {
-	 bmark->run(bmark->size[j], 1);
-	 glFinish();
-	 etime = glutGet(GLUT_ELAPSED_TIME);
-	 dtime = (etime - stime) / 1000.0;
-	 calibnum++;
-      }
-      glPopAttrib();
-
-      fprintf(stderr, "Elapsed time for the calibration test (%d): %f\n",
-	      calibnum, dtime);
-
-      num = (int) ((BMARKS_TIME / dtime) * calibnum);
-
-      if (num < 1)
-	 num = 1;
-
-      fprintf(stderr, "Selected number of benchmark iterations: %d\n", num);
-
-      mintime = HUGE_VAL;
-      maxtime = -HUGE_VAL;
-
-      for (numelem = 1, tottime = 0.0, k = 0; k < 5; k++) {
-	 glPushAttrib(GL_ALL_ATTRIB_BITS);
-	 bmark->init();
-
-	 stime = glutGet(GLUT_ELAPSED_TIME);
-	 numelem = bmark->run(bmark->size[j], num);
-	 glFinish();
-	 etime = glutGet(GLUT_ELAPSED_TIME);
-
-	 glPopAttrib();
-
-	 dtime = (etime - stime) / 1000.0;
-	 tottime += dtime;
-
-	 fprintf(stderr, "Elapsed time for run %d: %f\n", k, dtime);
-
-	 if (dtime < mintime)
-	    mintime = dtime;
-	 if (dtime > maxtime)
-	    maxtime = dtime;
-      }
-
-      tottime -= mintime + maxtime;
-
-      fprintf(stdout, "SIZE=%03d => %f %s/sec", bmark->size[j],
-	      numelem / (tottime / 3.0), bmark->unit);
-      if (bmark->type == 2)
-	 fprintf(stdout, ", MPixel Fill/sec: %f\n",
-		 (numelem * bmark->size[j] * bmark->size[j] / 2) /
-		 (1000000.0 * tottime / 3.0));
-      else
-	 fprintf(stdout, "\n");
-   }
-
-   fprintf(stdout, "\n\n");
-}
-
-/***************************************************************************/
-
-static void
-display(void)
-{
-   int i;
-
-   if (frontbuffer)
-      glDrawBuffer(GL_FRONT);
-   else
-      glDrawBuffer(GL_BACK);
-
-   for (i = 0; i < NUM_BMARKS; i++) {
-      fprintf(stderr, "Benchmark: %d\n", i);
-
-      switch (bmarks[i].type) {
-      case 0:
-      case 3:
-	 dotest0param(&bmarks[i]);
-	 break;
-      case 1:
-      case 2:
-	 dotest1param(&bmarks[i]);
-	 break;
-      }
-   }
-
-   exit(0);
-}
-
-int
-main(int ac, char **av)
-{
-   fprintf(stderr, "GLTest v1.0\nWritten by David Bucciarelli\n");
-
-   if (ac == 2)
-      frontbuffer = 0;
-
-   glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
-   glutInitWindowPosition(0, 0);
-   glutInitWindowSize(640, 480);
-   glutCreateWindow("OpenGL/Mesa Performances");
-   glutDisplayFunc(display);
-   glutMainLoop();
-
-   return 0;
-}

progs/demos/glutfx.c

@@ -1,4 +1,4 @@
-/* $Id: glutfx.c,v 1.2 2000/06/27 17:04:43 brianp Exp $ */
+/* $Id: glutfx.c,v 1.1 1999/08/19 00:55:40 jtg Exp $ */
 
 /*
  * Example of how one might use GLUT with the 3Dfx driver in full-screen mode.
@@ -16,11 +16,8 @@
 
 /*
  * $Log: glutfx.c,v $
- * Revision 1.2  2000/06/27 17:04:43  brianp
- * fixed compiler warnings
- *
- * Revision 1.1.1.1  1999/08/19 00:55:40  jtg
- * Imported sources
+ * Revision 1.1  1999/08/19 00:55:40  jtg
+ * Initial revision
  *
  * Revision 3.2  1999/03/28 18:18:33  brianp
  * minor clean-up
@@ -167,6 +164,7 @@ int main( int argc, char *argv[] )
    printf("NOTE: if you've got 3Dfx VooDoo hardware you must run this");
    printf(" program as root.\n\n");
    printf("Move the mouse.  Press ESC to exit.\n\n");
+   sleep(2);
 #endif
 
    /* Tell Mesa GLX to use 3Dfx driver in fullscreen mode. */

progs/demos/ipers.c

@@ -1,706 +0,0 @@
-/*
- * This program is under the GNU GPL.
- * Use at your own risk.
- *
- * written by David Bucciarelli (tech.hmw@plus.it)
- *            Humanware s.r.l.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <time.h>
-
-#ifdef WIN32
-#include <windows.h>
-#include <mmsystem.h>
-#endif
-
-#include <GL/glut.h>
-
-#include "readtex.c"
-
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen = 1;
-#endif
-
-static int WIDTH = 640;
-static int HEIGHT = 480;
-
-static GLint T0;
-static GLint Frames;
-
-#define MAX_LOD 9
-
-#define TEX_SKY_WIDTH 256
-#define TEX_SKY_HEIGHT TEX_SKY_WIDTH
-
-#ifndef M_PI
-#define M_PI 3.1415926535
-#endif
-
-#define FROM_NONE   0
-#define FROM_DOWN   1
-#define FROM_UP     2
-#define FROM_LEFT   3
-#define FROM_RIGHT  4
-#define FROM_FRONT  5
-#define FROM_BACK   6
-
-static int win = 0;
-
-static float obs[3] = { 3.8, 0.0, 0.0 };
-static float dir[3];
-static float v = 0.0;
-static float alpha = -90.0;
-static float beta = 90.0;
-
-static int fog = 1;
-static int bfcull = 1;
-static int usetex = 1;
-static int help = 1;
-static int poutline = 0;
-static int normext = 1;
-static int joyavailable = 0;
-static int joyactive = 0;
-static int LODbias = 3;
-static int maxdepth = MAX_LOD;
-
-static unsigned int totpoly = 0;
-
-static GLuint t1id, t2id;
-static GLuint skydlist, LODdlist[MAX_LOD], LODnumpoly[MAX_LOD];
-
-static void
-initlight(void)
-{
-   GLfloat lspec[4] = { 1.0, 1.0, 1.0, 1.0 };
-   static GLfloat lightpos[4] = { 30, 15.0, 30.0, 1.0 };
-
-   glLightfv(GL_LIGHT0, GL_POSITION, lightpos);
-   glLightfv(GL_LIGHT0, GL_SPECULAR, lspec);
-
-   glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 32.0);
-   glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, lspec);
-}
-
-static void
-initdlists(void)
-{
-   static int slicetable[MAX_LOD][2] = {
-      {21, 10},
-      {18, 9},
-      {15, 8},
-      {12, 7},
-      {9, 6},
-      {7, 5},
-      {5, 4},
-      {4, 3},
-      {3, 2}
-   };
-   GLUquadricObj *obj;
-   int i, xslices, yslices;
-
-   obj = gluNewQuadric();
-
-   skydlist = glGenLists(1);
-   glNewList(skydlist, GL_COMPILE);
-   glBindTexture(GL_TEXTURE_2D, t2id);
-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-   glColor3f(1.0f, 1.0f, 1.0f);
-
-   gluQuadricDrawStyle(obj, GLU_FILL);
-   gluQuadricNormals(obj, GLU_NONE);
-   gluQuadricTexture(obj, GL_TRUE);
-   gluQuadricOrientation(obj, GLU_INSIDE);
-   gluSphere(obj, 40.0f, 18, 9);
-
-   glEndList();
-
-   for (i = 0; i < MAX_LOD; i++) {
-      LODdlist[i] = glGenLists(1);
-      glNewList(LODdlist[i], GL_COMPILE);
-
-      gluQuadricDrawStyle(obj, GLU_FILL);
-      gluQuadricNormals(obj, GLU_SMOOTH);
-      gluQuadricTexture(obj, GL_TRUE);
-      gluQuadricOrientation(obj, GLU_OUTSIDE);
-      xslices = slicetable[i][0];
-      yslices = slicetable[i][1];
-      gluSphere(obj, 1.0f, xslices, yslices);
-      LODnumpoly[i] = xslices * (yslices - 2) + 2 * (xslices - 1);
-
-      glEndList();
-   }
-}
-
-static void
-inittextures(void)
-{
-   GLubyte tsky[TEX_SKY_HEIGHT][TEX_SKY_WIDTH][3];
-   GLuint x, y;
-   GLfloat fact;
-   GLenum gluerr;
-
-   /* Brick */
-
-   glGenTextures(1, &t1id);
-   glBindTexture(GL_TEXTURE_2D, t1id);
-
-   if (!LoadRGBMipmaps("../images/bw.rgb", 3)) {
-      fprintf(stderr, "Error reading a texture.\n");
-      exit(-1);
-   }
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-		   GL_LINEAR_MIPMAP_LINEAR);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-   /* Sky */
-
-   glGenTextures(1, &t2id);
-   glBindTexture(GL_TEXTURE_2D, t2id);
-
-   for (y = 0; y < TEX_SKY_HEIGHT; y++)
-      for (x = 0; x < TEX_SKY_WIDTH; x++)
-	 if (y < TEX_SKY_HEIGHT / 2) {
-	    fact = y / (GLfloat) (TEX_SKY_HEIGHT / 2);
-	    tsky[y][x][0] =
-	       (GLubyte) (255.0f * (0.1f * fact + 0.3f * (1.0f - fact)));
-	    tsky[y][x][1] =
-	       (GLubyte) (255.0f * (0.2f * fact + 1.0f * (1.0f - fact)));
-	    tsky[y][x][2] = 255;
-	 }
-	 else {
-	    tsky[y][x][0] = tsky[TEX_SKY_HEIGHT - y - 1][x][0];
-	    tsky[y][x][1] = tsky[TEX_SKY_HEIGHT - y - 1][x][1];
-	    tsky[y][x][2] = 255;
-	 }
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   if (
-       (gluerr =
-	gluBuild2DMipmaps(GL_TEXTURE_2D, 3, TEX_SKY_WIDTH, TEX_SKY_HEIGHT,
-			  GL_RGB, GL_UNSIGNED_BYTE, (GLvoid *) (tsky)))) {
-      fprintf(stderr, "GLULib%s\n", gluErrorString(gluerr));
-      exit(-1);
-   }
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-		   GL_LINEAR_MIPMAP_LINEAR);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-}
-
-static void
-calcposobs(void)
-{
-   dir[0] = sin(alpha * M_PI / 180.0);
-   dir[1] = cos(alpha * M_PI / 180.0) * sin(beta * M_PI / 180.0);
-   dir[2] = cos(beta * M_PI / 180.0);
-
-   if (dir[0] < 1.0e-5 && dir[0] > -1.0e-5)
-      dir[0] = 0;
-   if (dir[1] < 1.0e-5 && dir[1] > -1.0e-5)
-      dir[1] = 0;
-   if (dir[2] < 1.0e-5 && dir[2] > -1.0e-5)
-      dir[2] = 0;
-
-   obs[0] += v * dir[0];
-   obs[1] += v * dir[1];
-   obs[2] += v * dir[2];
-}
-
-static void
-special(int k, int x, int y)
-{
-   switch (k) {
-   case GLUT_KEY_LEFT:
-      alpha -= 2.0;
-      break;
-   case GLUT_KEY_RIGHT:
-      alpha += 2.0;
-      break;
-   case GLUT_KEY_DOWN:
-      beta -= 2.0;
-      break;
-   case GLUT_KEY_UP:
-      beta += 2.0;
-      break;
-   }
-}
-
-static void
-key(unsigned char k, int x, int y)
-{
-   switch (k) {
-   case 27:
-      exit(0);
-      break;
-
-   case 'a':
-      v += 0.01;
-      break;
-   case 'z':
-      v -= 0.01;
-      break;
-
-#ifdef XMESA
-   case ' ':
-      fullscreen = (!fullscreen);
-      XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
-      break;
-#endif
-
-   case '+':
-      LODbias--;
-      break;
-   case '-':
-      LODbias++;
-      break;
-   case 'j':
-      joyactive = (!joyactive);
-      break;
-   case 'h':
-      help = (!help);
-      break;
-   case 'f':
-      fog = (!fog);
-      break;
-   case 't':
-      usetex = (!usetex);
-      break;
-   case 'n':
-      normext = (!normext);
-      break;
-   case 'b':
-      if (bfcull) {
-	 glDisable(GL_CULL_FACE);
-	 bfcull = 0;
-      }
-      else {
-	 glEnable(GL_CULL_FACE);
-	 bfcull = 1;
-      }
-      break;
-   case 'p':
-      if (poutline) {
-	 glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-	 poutline = 0;
-	 usetex = 1;
-      }
-      else {
-	 glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-	 poutline = 1;
-	 usetex = 0;
-      }
-      break;
-   }
-}
-
-static void
-reshape(int w, int h)
-{
-   WIDTH = w;
-   HEIGHT = h;
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   gluPerspective(90.0, w / (float) h, 0.8, 100.0);
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-   glViewport(0, 0, w, h);
-}
-
-static void
-printstring(void *font, char *string)
-{
-   int len, i;
-
-   len = (int) strlen(string);
-   for (i = 0; i < len; i++)
-      glutBitmapCharacter(font, string[i]);
-}
-
-static void
-printhelp(void)
-{
-   glEnable(GL_BLEND);
-   glColor4f(0.5, 0.5, 0.5, 0.5);
-   glRecti(40, 40, 600, 440);
-   glDisable(GL_BLEND);
-
-   glColor3f(1.0, 0.0, 0.0);
-   glRasterPos2i(300, 420);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Help");
-
-   glRasterPos2i(60, 390);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Toggle Help");
-   glRasterPos2i(60, 360);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "t - Toggle Textures");
-   glRasterPos2i(60, 330);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Toggle Fog");
-   glRasterPos2i(60, 300);
-   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);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "a - Increase velocity");
-   glRasterPos2i(60, 210);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "z - Decrease velocity");
-   glRasterPos2i(60, 180);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "p - Toggle Wire frame");
-   glRasterPos2i(60, 150);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-	       "b - Toggle GL_EXT_rescale_normal extension");
-   glRasterPos2i(60, 120);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-	       "+/- - Increase/decrease the Object maximum LOD");
-
-   glRasterPos2i(60, 90);
-   if (joyavailable)
-      printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "j - Toggle jostick control (Joystick control available)");
-   else
-      printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "(No Joystick control available)");
-}
-
-static void
-dojoy(void)
-{
-#ifdef _WIN32
-   static UINT max[2] = { 0, 0 };
-   static UINT min[2] = { 0xffffffff, 0xffffffff }, center[2];
-   MMRESULT res;
-   JOYINFO joy;
-
-   res = joyGetPos(JOYSTICKID1, &joy);
-
-   if (res == JOYERR_NOERROR) {
-      joyavailable = 1;
-
-      if (max[0] < joy.wXpos)
-	 max[0] = joy.wXpos;
-      if (min[0] > joy.wXpos)
-	 min[0] = joy.wXpos;
-      center[0] = (max[0] + min[0]) / 2;
-
-      if (max[1] < joy.wYpos)
-	 max[1] = joy.wYpos;
-      if (min[1] > joy.wYpos)
-	 min[1] = joy.wYpos;
-      center[1] = (max[1] + min[1]) / 2;
-
-      if (joyactive) {
-	 if (fabs(center[0] - (float) joy.wXpos) > 0.1 * (max[0] - min[0]))
-	    alpha -=
-	       2.0 * (center[0] - (float) joy.wXpos) / (max[0] - min[0]);
-	 if (fabs(center[1] - (float) joy.wYpos) > 0.1 * (max[1] - min[1]))
-	    beta += 2.0 * (center[1] - (float) joy.wYpos) / (max[1] - min[1]);
-
-	 if (joy.wButtons & JOY_BUTTON1)
-	    v += 0.01;
-	 if (joy.wButtons & JOY_BUTTON2)
-	    v -= 0.01;
-      }
-   }
-   else
-      joyavailable = 0;
-#endif
-}
-
-static void
-drawipers(int depth, int from)
-{
-   int lod;
-
-   if (depth == maxdepth)
-      return;
-
-   lod = depth + LODbias;
-   if (lod < 0)
-      lod = 0;
-   if (lod >= MAX_LOD)
-      return;
-
-   switch (from) {
-   case FROM_NONE:
-      glCallList(LODdlist[lod]);
-
-      depth++;
-      drawipers(depth, FROM_DOWN);
-      drawipers(depth, FROM_UP);
-      drawipers(depth, FROM_FRONT);
-      drawipers(depth, FROM_BACK);
-      drawipers(depth, FROM_LEFT);
-      drawipers(depth, FROM_RIGHT);
-      break;
-   case FROM_FRONT:
-      glPushMatrix();
-      glTranslatef(0.0f, -1.5f, 0.0f);
-      glScalef(0.5f, 0.5f, 0.5f);
-
-      glCallList(LODdlist[lod]);
-
-      depth++;
-      drawipers(depth, FROM_DOWN);
-      drawipers(depth, FROM_UP);
-      drawipers(depth, FROM_FRONT);
-      drawipers(depth, FROM_LEFT);
-      drawipers(depth, FROM_RIGHT);
-      glPopMatrix();
-      break;
-   case FROM_BACK:
-      glPushMatrix();
-      glTranslatef(0.0f, 1.5f, 0.0f);
-      glScalef(0.5f, 0.5f, 0.5f);
-
-      glCallList(LODdlist[lod]);
-
-      depth++;
-      drawipers(depth, FROM_DOWN);
-      drawipers(depth, FROM_UP);
-      drawipers(depth, FROM_BACK);
-      drawipers(depth, FROM_LEFT);
-      drawipers(depth, FROM_RIGHT);
-      glPopMatrix();
-      break;
-   case FROM_LEFT:
-      glPushMatrix();
-      glTranslatef(-1.5f, 0.0f, 0.0f);
-      glScalef(0.5f, 0.5f, 0.5f);
-
-      glCallList(LODdlist[lod]);
-
-      depth++;
-      drawipers(depth, FROM_DOWN);
-      drawipers(depth, FROM_UP);
-      drawipers(depth, FROM_FRONT);
-      drawipers(depth, FROM_BACK);
-      drawipers(depth, FROM_LEFT);
-      glPopMatrix();
-      break;
-   case FROM_RIGHT:
-      glPushMatrix();
-      glTranslatef(1.5f, 0.0f, 0.0f);
-      glScalef(0.5f, 0.5f, 0.5f);
-
-      glCallList(LODdlist[lod]);
-
-      depth++;
-      drawipers(depth, FROM_DOWN);
-      drawipers(depth, FROM_UP);
-      drawipers(depth, FROM_FRONT);
-      drawipers(depth, FROM_BACK);
-      drawipers(depth, FROM_RIGHT);
-      glPopMatrix();
-      break;
-   case FROM_DOWN:
-      glPushMatrix();
-      glTranslatef(0.0f, 0.0f, 1.5f);
-      glScalef(0.5f, 0.5f, 0.5f);
-
-      glCallList(LODdlist[lod]);
-
-      depth++;
-      drawipers(depth, FROM_DOWN);
-      drawipers(depth, FROM_FRONT);
-      drawipers(depth, FROM_BACK);
-      drawipers(depth, FROM_LEFT);
-      drawipers(depth, FROM_RIGHT);
-      glPopMatrix();
-      break;
-   case FROM_UP:
-      glPushMatrix();
-      glTranslatef(0.0f, 0.0f, -1.5f);
-      glScalef(0.5f, 0.5f, 0.5f);
-
-      glCallList(LODdlist[lod]);
-
-      depth++;
-      drawipers(depth, FROM_UP);
-      drawipers(depth, FROM_FRONT);
-      drawipers(depth, FROM_BACK);
-      drawipers(depth, FROM_LEFT);
-      drawipers(depth, FROM_RIGHT);
-      glPopMatrix();
-      break;
-   }
-
-   totpoly += LODnumpoly[lod];
-}
-
-static void
-draw(void)
-{
-   static char frbuf[80] = "";
-   static GLfloat alpha = 0.0f;
-   static GLfloat beta = 0.0f;
-   static float fr = 0.0;
-
-   dojoy();
-
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-   if (usetex)
-      glEnable(GL_TEXTURE_2D);
-   else
-      glDisable(GL_TEXTURE_2D);
-
-   if (fog)
-      glEnable(GL_FOG);
-   else
-      glDisable(GL_FOG);
-
-   glPushMatrix();
-   calcposobs();
-   gluLookAt(obs[0], obs[1], obs[2],
-	     obs[0] + dir[0], obs[1] + dir[1], obs[2] + dir[2],
-	     0.0, 0.0, 1.0);
-
-   /* Scene */
-   glEnable(GL_DEPTH_TEST);
-
-   glShadeModel(GL_SMOOTH);
-   glBindTexture(GL_TEXTURE_2D, t1id);
-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-   glColor3f(1.0f, 1.0f, 1.0f);
-   glEnable(GL_LIGHT0);
-   glEnable(GL_LIGHTING);
-
-   if (normext)
-      glEnable(GL_RESCALE_NORMAL_EXT);
-   else
-      glEnable(GL_NORMALIZE);
-
-   glPushMatrix();
-   glRotatef(alpha, 0.0f, 0.0f, 1.0f);
-   glRotatef(beta, 1.0f, 0.0f, 0.0f);
-   totpoly = 0;
-   drawipers(0, FROM_NONE);
-   glPopMatrix();
-
-   alpha += 0.5f;
-   beta += 0.3f;
-
-   glDisable(GL_LIGHTING);
-   glDisable(GL_LIGHT0);
-   glShadeModel(GL_FLAT);
-
-   if (normext)
-      glDisable(GL_RESCALE_NORMAL_EXT);
-   else
-      glDisable(GL_NORMALIZE);
-
-   glCallList(skydlist);
-
-   glPopMatrix();
-
-   /* Help Screen */
-
-   sprintf(frbuf,
-	   "Frame rate: %0.2f   LOD: %d   Tot. poly.: %d   Poly/sec: %.1f",
-	   fr, LODbias, totpoly, totpoly * fr);
-
-   glDisable(GL_TEXTURE_2D);
-   glDisable(GL_FOG);
-   glShadeModel(GL_FLAT);
-   glDisable(GL_DEPTH_TEST);
-
-   glMatrixMode(GL_PROJECTION);
-   glPushMatrix();
-   glLoadIdentity();
-   glOrtho(-0.5, 639.5, -0.5, 479.5, -1.0, 1.0);
-
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-
-   glColor3f(1.0, 0.0, 0.0);
-   glRasterPos2i(10, 10);
-   printstring(GLUT_BITMAP_HELVETICA_18, frbuf);
-   glRasterPos2i(350, 470);
-   printstring(GLUT_BITMAP_HELVETICA_10,
-	       "IperS V1.0 Written by David Bucciarelli (tech.hmw@plus.it)");
-
-   if (help)
-      printhelp();
-
-   glMatrixMode(GL_PROJECTION);
-   glPopMatrix();
-   glMatrixMode(GL_MODELVIEW);
-
-   glutSwapBuffers();
-
-   Frames++;
-   {
-      GLint t = glutGet(GLUT_ELAPSED_TIME);
-      if (t - T0 >= 2000) {
-         GLfloat seconds = (t - T0) / 1000.0;
-         fr = Frames / seconds;
-         T0 = t;
-         Frames = 0;
-      }
-   }
-}
-
-int
-main(int ac, char **av)
-{
-   float fogcolor[4] = { 0.7, 0.7, 0.7, 1.0 };
-
-   fprintf(stderr,
-	   "IperS V1.0\nWritten by David Bucciarelli (tech.hmw@plus.it)\n");
-
-   glutInitWindowPosition(0, 0);
-   glutInitWindowSize(WIDTH, HEIGHT);
-   glutInit(&ac, av);
-
-   glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
-
-   if (!(win = glutCreateWindow("IperS"))) {
-      fprintf(stderr, "Error, couldn't open window\n");
-      exit(-1);
-   }
-
-   reshape(WIDTH, HEIGHT);
-
-   glShadeModel(GL_SMOOTH);
-   glEnable(GL_DEPTH_TEST);
-   glEnable(GL_CULL_FACE);
-   glEnable(GL_TEXTURE_2D);
-
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-   glEnable(GL_FOG);
-   glFogi(GL_FOG_MODE, GL_EXP2);
-   glFogfv(GL_FOG_COLOR, fogcolor);
-
-   glFogf(GL_FOG_DENSITY, 0.006);
-
-   glHint(GL_FOG_HINT, GL_NICEST);
-
-   inittextures();
-   initdlists();
-   initlight();
-
-   glClearColor(fogcolor[0], fogcolor[1], fogcolor[2], fogcolor[3]);
-   glClear(GL_COLOR_BUFFER_BIT);
-
-   calcposobs();
-
-   glutReshapeFunc(reshape);
-   glutDisplayFunc(draw);
-   glutKeyboardFunc(key);
-   glutSpecialFunc(special);
-   glutIdleFunc(draw);
-
-   glutMainLoop();
-
-   return 0;
-}

progs/demos/lodbias.c

@@ -1,229 +0,0 @@
-/*
- * GL_EXT_texture_lod_bias demo
- *
- * Thanks to Michael Vance for implementing this extension in Mesa.
- *
- * Brian Paul
- * 20 March 2000
- *
- * Copyright (C) 2000  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 <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <GL/glut.h>
-#include <GL/glext.h>
-
-#include "readtex.c"   /* I know, this is a hack. */
-
-#define TEXTURE_FILE "../images/girl.rgb"
-
-static GLfloat Xrot = 0, Yrot = -30, Zrot = 0;
-static GLboolean Anim = GL_TRUE;
-static GLint Bias = 0, BiasStepSign = +1; /* ints avoid fp precision problem */
-static GLint BiasMin = -200, BiasMax = 500;
-
-
-
-static void
-PrintString(const char *s)
-{
-   while (*s) {
-      glutBitmapCharacter(GLUT_BITMAP_8_BY_13, (int) *s);
-      s++;
-   }
-}
-
-static void Idle( void )
-{
-   static int lastTime = 0;
-   int time = glutGet(GLUT_ELAPSED_TIME);
-   int step;
-
-   if (lastTime == 0)
-      lastTime = time;
-   else if (time - lastTime < 10)
-      return;
-
-   step = (time - lastTime) / 10 * BiasStepSign;
-   lastTime = time;
-
-   Bias += step;
-   if (Bias < BiasMin) {
-      Bias = BiasMin;
-      BiasStepSign = +1;
-   }
-   else if (Bias > BiasMax) {
-      Bias = BiasMax;
-      BiasStepSign = -1;
-   }
-
-   glutPostRedisplay();
-}
-
-
-static void Display( void )
-{
-   char str[100];
-
-   glClear( GL_COLOR_BUFFER_BIT );
-
-   glMatrixMode( GL_PROJECTION );
-   glLoadIdentity();
-   glOrtho(-1, 1, -1, 1, -1, 1);
-   glMatrixMode( GL_MODELVIEW );
-   glLoadIdentity();
-   
-   glDisable(GL_TEXTURE_2D);
-   glColor3f(1,1,1);
-   glRasterPos3f(-0.9, -0.9, 0.0);
-   sprintf(str, "Texture LOD Bias = %4.1f", Bias * 0.01);
-   PrintString(str);
-
-   glMatrixMode( GL_PROJECTION );
-   glLoadIdentity();
-   glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 25.0 );
-   glMatrixMode( GL_MODELVIEW );
-   glLoadIdentity();
-   glTranslatef( 0.0, 0.0, -8.0 );
-
-   glPushMatrix();
-   glRotatef(Xrot, 1, 0, 0);
-   glRotatef(Yrot, 0, 1, 0);
-   glRotatef(Zrot, 0, 0, 1);
-
-   glEnable(GL_TEXTURE_2D);
-   glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0.01 * Bias);
-
-   glBegin(GL_POLYGON);
-   glTexCoord2f(0, 0);  glVertex2f(-1, -1);
-   glTexCoord2f(2, 0);  glVertex2f( 1, -1);
-   glTexCoord2f(2, 2);  glVertex2f( 1,  1);
-   glTexCoord2f(0, 2);  glVertex2f(-1,  1);
-   glEnd();
-
-   glPopMatrix();
-
-   glutSwapBuffers();
-}
-
-
-static void Reshape( int width, int height )
-{
-   glViewport( 0, 0, width, height );
-}
-
-
-static void Key( unsigned char key, int x, int y )
-{
-   const GLfloat step = 3.0;
-   (void) x;
-   (void) y;
-   switch (key) {
-      case 'a':
-         Anim = !Anim;
-         if (Anim)
-            glutIdleFunc(Idle);
-         else
-            glutIdleFunc(NULL);
-         break;
-      case 'z':
-         Zrot -= step;
-         break;
-      case 'Z':
-         Zrot += step;
-         break;
-      case 'b':
-         Bias -= 10;
-         break;
-      case 'B':
-         Bias += 10;
-         break;
-      case 27:
-         exit(0);
-         break;
-   }
-   glutPostRedisplay();
-}
-
-
-static void SpecialKey( int key, int x, int y )
-{
-   const GLfloat step = 3.0;
-   (void) x;
-   (void) y;
-   switch (key) {
-      case GLUT_KEY_UP:
-         Xrot -= step;
-         break;
-      case GLUT_KEY_DOWN:
-         Xrot += step;
-         break;
-      case GLUT_KEY_LEFT:
-         Yrot -= step;
-         break;
-      case GLUT_KEY_RIGHT:
-         Yrot += step;
-         break;
-   }
-   glutPostRedisplay();
-}
-
-
-static void Init( void )
-{
-   const char *exten = (const char *) glGetString(GL_EXTENSIONS);
-   if (!strstr(exten, "GL_EXT_texture_lod_bias")) {
-      printf("Sorry, GL_EXT_texture_lod_bias not supported by this renderer.\n");
-      exit(1);
-   }
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   if (!LoadRGBMipmaps(TEXTURE_FILE, GL_RGB)) {
-      printf("Error: could not load texture image %s\n", TEXTURE_FILE);
-      exit(1);
-   }
-
-   /* mipmapping required for this extension */
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-}
-
-
-int main( int argc, char *argv[] )
-{
-   glutInit( &argc, argv );
-   glutInitWindowPosition( 0, 0 );
-   glutInitWindowSize( 350, 350 );
-   glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
-   glutCreateWindow(argv[0]);
-   glutReshapeFunc( Reshape );
-   glutKeyboardFunc( Key );
-   glutSpecialFunc( SpecialKey );
-   glutDisplayFunc( Display );
-   if (Anim)
-      glutIdleFunc(Idle);
-   Init();
-   glutMainLoop();
-   return 0;
-}

progs/demos/morph3d.c

@@ -1,11 +1,8 @@
-/* $Id: morph3d.c,v 1.4 2000/06/27 17:04:43 brianp Exp $ */
+/* $Id: morph3d.c,v 1.2.2.1 1999/12/15 13:00:24 brianp Exp $ */
 
 /*
  * $Log: morph3d.c,v $
- * Revision 1.4  2000/06/27 17:04:43  brianp
- * fixed compiler warnings
- *
- * Revision 1.3  1999/12/15 13:00:45  brianp
+ * Revision 1.2.2.1  1999/12/15 13:00:24  brianp
  * moved #define to column 0
  *
  * Revision 1.2  1999/09/17 12:27:01  brianp
@@ -833,7 +830,7 @@ static void pinit(void)
 
 }
 
-static void INIT(void)
+void INIT(void)
 {
   printf("Morph 3D - Shows morphing platonic polyhedra\n");
   printf("Author: Marcelo Fernandes Vianna (vianna@cat.cbpf.br)\n\n");

progs/demos/multiarb.c

@@ -1,4 +1,4 @@
-/* $Id: multiarb.c,v 1.10 2001/06/20 19:12:30 brianp Exp $ */
+/* $Id: multiarb.c,v 1.3.2.2 2000/02/02 17:32:15 brianp Exp $ */
 
 /*
  * GL_ARB_multitexture demo
@@ -12,48 +12,10 @@
 
 /*
  * $Log: multiarb.c,v $
- * Revision 1.10  2001/06/20 19:12:30  brianp
- * also print GL_MAX_TEXTURE_SIZE
- *
- * Revision 1.9  2001/06/13 14:33:16  brianp
- * moved glTexEnvi calls to better logical locations
- *
- * Revision 1.8  2000/12/24 22:53:54  pesco
- * * demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util.
- * * demos/Makefile.X11, demos/Makefile.BeOS-R4, demos/Makefile.cygnus:
- * Essentially the same.
- * Program files updated to include "readtex.c", not "../util/readtex.c".
- * * demos/reflect.c: Likewise for "showbuffer.c".
- *
- *
- * * Makefile.am (EXTRA_DIST): Added top-level regular files.
- *
- * * include/GL/Makefile.am (INC_X11): Added glxext.h.
- *
- *
- * * src/GGI/include/ggi/mesa/Makefile.am (EXTRA_HEADERS): Include
- * Mesa GGI headers in dist even if HAVE_GGI is not given.
- *
- * * configure.in: Look for GLUT and demo source dirs in $srcdir.
- *
- * * src/swrast/Makefile.am (libMesaSwrast_la_SOURCES): Set to *.[ch].
- * More source list updates in various Makefile.am's.
- *
- * * Makefile.am (dist-hook): Remove CVS directory from distribution.
- * (DIST_SUBDIRS): List all possible subdirs here.
- * (SUBDIRS): Only list subdirs selected for build again.
- * The above two applied to all subdir Makefile.am's also.
- *
- * Revision 1.7  2000/11/01 16:02:01  brianp
- * print number of texture units
- *
- * Revision 1.6  2000/05/23 23:21:00  brianp
- * set default window pos
- *
- * Revision 1.5  2000/02/02 17:31:45  brianp
+ * Revision 1.3.2.2  2000/02/02 17:32:15  brianp
  * changed > to >=
  *
- * Revision 1.4  2000/02/02 01:07:21  brianp
+ * Revision 1.3.2.1  2000/02/02 01:08:09  brianp
  * limit Drift to [0, 1]
  *
  * Revision 1.3  1999/10/21 16:40:32  brianp
@@ -83,7 +45,7 @@
 #include <string.h>
 #include <GL/glut.h>
 
-#include "readtex.c"   /* I know, this is a hack. */
+#include "../util/readtex.c"   /* I know, this is a hack. */
 
 #define TEXTURE_1_FILE "../images/girl.rgb"
 #define TEXTURE_2_FILE "../images/reflect.rgb"
@@ -281,7 +243,6 @@ static void SpecialKey( int key, int x, int y )
 static void Init( int argc, char *argv[] )
 {
    GLuint texObj[2];
-   GLint units, size;
 
    const char *exten = (const char *) glGetString(GL_EXTENSIONS);
    if (!strstr(exten, "GL_ARB_multitexture")) {
@@ -289,14 +250,6 @@ static void Init( int argc, char *argv[] )
       exit(1);
    }
 
-   glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &units);
-   printf("%d texture units supported\n", units);
-
-   glGetIntegerv(GL_MAX_TEXTURE_SIZE, &size);
-   printf("%d x %d max texture size\n", size, size);
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-
    /* allocate two texture objects */
    glGenTextures(2, texObj);
 
@@ -310,6 +263,11 @@ static void Init( int argc, char *argv[] )
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 #endif
+
+   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
+   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
    if (!LoadRGBMipmaps(TEXTURE_1_FILE, GL_RGB)) {
       printf("Error: couldn't load texture image\n");
       exit(1);
@@ -326,6 +284,9 @@ static void Init( int argc, char *argv[] )
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 #endif
+
+   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
    if (!LoadRGBMipmaps(TEXTURE_2_FILE, GL_RGB)) {
       printf("Error: couldn't load texture image\n");
       exit(1);
@@ -336,10 +297,8 @@ static void Init( int argc, char *argv[] )
 #ifdef GL_ARB_multitexture
    glActiveTextureARB(GL_TEXTURE0_ARB);
    glBindTexture(GL_TEXTURE_2D, texObj[0]);
-   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    glActiveTextureARB(GL_TEXTURE1_ARB);
    glBindTexture(GL_TEXTURE_2D, texObj[1]);
-   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 #endif
 
    glShadeModel(GL_FLAT);
@@ -360,7 +319,6 @@ int main( int argc, char *argv[] )
 {
    glutInit( &argc, argv );
    glutInitWindowSize( 300, 300 );
-   glutInitWindowPosition( 0, 0 );
    glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
    glutCreateWindow(argv[0] );
 

progs/demos/occlude.c

@@ -1,226 +0,0 @@
-/*
- * GL_HP_occlustion_test demo
- *
- * Brian Paul
- * 31 March 2000
- *
- * Copyright (C) 2000  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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <GL/glut.h>
-#include <GL/glext.h>
-
-
-static GLfloat Xpos = 0;
-
-
-static void
-PrintString(const char *s)
-{
-   while (*s) {
-      glutBitmapCharacter(GLUT_BITMAP_8_BY_13, (int) *s);
-      s++;
-   }
-}
-
-
-
-static void Idle(void)
-{
-   static int lastTime = 0;
-   static int sign = +1;
-   int time = glutGet(GLUT_ELAPSED_TIME);
-   float step;
-
-   if (lastTime == 0)
-      lastTime = time;
-   else if (time - lastTime < 20)  /* 50Hz update */
-      return;
-
-   step = (time - lastTime) / 1000.0 * sign;
-   lastTime = time;
-
-   Xpos += step;
-
-   if (Xpos > 2.5) {
-      Xpos = 2.5;
-      sign = -1;
-   }
-   else if (Xpos < -2.5) {
-      Xpos = -2.5;
-      sign = +1;
-   }
-   glutPostRedisplay();
-}
-
-
-static void Display( void )
-{
-   GLboolean result;
-
-   glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-
-   glMatrixMode( GL_PROJECTION );
-   glLoadIdentity();
-   glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 25.0 );
-   glMatrixMode( GL_MODELVIEW );
-   glLoadIdentity();
-   glTranslatef( 0.0, 0.0, -15.0 );
-
-   /* draw the occluding polygons */
-   glColor3f(0, 0.6, 0.8);
-   glBegin(GL_QUADS);
-   glVertex2f(-1.6, -1.5);
-   glVertex2f(-0.4, -1.5);
-   glVertex2f(-0.4,  1.5);
-   glVertex2f(-1.6,  1.5);
-
-   glVertex2f( 0.4, -1.5);
-   glVertex2f( 1.6, -1.5);
-   glVertex2f( 1.6,  1.5);
-   glVertex2f( 0.4,  1.5);
-   glEnd();
-
-   /* draw the test polygon with occlusion testing */
-   glPushMatrix();
-   glTranslatef(Xpos, 0, -0.5);
-   glScalef(0.3, 0.3, 1.0);
-   glRotatef(-90.0 * Xpos, 0, 0, 1);
-
-   glEnable(GL_OCCLUSION_TEST_HP);  /* NOTE: enabling the occlusion test */
-                                    /* doesn't clear the result flag! */
-   glColorMask(0, 0, 0, 0);
-   glDepthMask(GL_FALSE);
-   /* this call clear's the result flag.  Not really needed for this demo. */
-   glGetBooleanv(GL_OCCLUSION_TEST_RESULT_HP, &result);
-
-   glBegin(GL_POLYGON);
-   glVertex3f(-1, -1, 0);
-   glVertex3f( 1, -1, 0);
-   glVertex3f( 1,  1, 0);
-   glVertex3f(-1,  1, 0);
-   glEnd();
-
-   glGetBooleanv(GL_OCCLUSION_TEST_RESULT_HP, &result);
-   /* turn off occlusion testing */
-   glDisable(GL_OCCLUSION_TEST_HP);
-   glColorMask(1, 1, 1, 1);
-   glDepthMask(GL_TRUE);
-
-   /* draw the green rect, so we can see what's going on */
-   glColor3f(0.8, 0.5, 0);
-   glBegin(GL_POLYGON);
-   glVertex3f(-1, -1, 0);
-   glVertex3f( 1, -1, 0);
-   glVertex3f( 1,  1, 0);
-   glVertex3f(-1,  1, 0);
-   glEnd();
-
-   glPopMatrix();
-
-
-   /* Print result message */
-   glMatrixMode( GL_PROJECTION );
-   glLoadIdentity();
-   glOrtho( -1.0, 1.0, -1.0, 1.0, -1.0, 1.0 );
-   glMatrixMode( GL_MODELVIEW );
-   glLoadIdentity();
-
-   glColor3f(1, 1, 1);
-   glRasterPos3f(-0.25, -0.7, 0);
-
-   if (result)
-      PrintString("   Visible");
-   else
-      PrintString("Fully Occluded");
-
-   glutSwapBuffers();
-}
-
-
-static void Reshape( int width, int height )
-{
-   glViewport( 0, 0, 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 SpecialKey( int key, int x, int y )
-{
-   const GLfloat step = 0.1;
-   (void) x;
-   (void) y;
-   switch (key) {
-      case GLUT_KEY_LEFT:
-         Xpos -= step;
-         break;
-      case GLUT_KEY_RIGHT:
-         Xpos += step;
-         break;
-   }
-   glutPostRedisplay();
-}
-
-
-static void Init( void )
-{
-   const char *ext = (const char *) glGetString(GL_EXTENSIONS);
-   if (!strstr(ext, "GL_HP_occlusion_test")) {
-      printf("Sorry, this demo requires the GL_HP_occlusion_test extension\n");
-      exit(-1);
-   }
-
-   glEnable(GL_DEPTH_TEST);
-}
-
-
-int main( int argc, char *argv[] )
-{
-   glutInit( &argc, argv );
-   glutInitWindowPosition( 0, 0 );
-   glutInitWindowSize( 400, 400 );
-   glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH );
-   glutCreateWindow(argv[0]);
-   glutReshapeFunc( Reshape );
-   glutKeyboardFunc( Key );
-   glutSpecialFunc( SpecialKey );
-   glutIdleFunc( Idle );
-   glutDisplayFunc( Display );
-   Init();
-   glutMainLoop();
-   return 0;
-}

progs/demos/osdemo.c

@@ -1,4 +1,4 @@
-/* $Id: osdemo.c,v 1.5 2000/09/08 16:42:06 brianp Exp $ */
+/* $Id: osdemo.c,v 1.1 1999/08/19 00:55:40 jtg Exp $ */
 
 /*
  * Demo of off-screen Mesa rendering
@@ -17,14 +17,24 @@
  */
 
 
+/*
+ * $Log: osdemo.c,v $
+ * Revision 1.1  1999/08/19 00:55:40  jtg
+ * Initial revision
+ *
+ * Revision 3.0  1998/02/14 18:42:29  brianp
+ * initial rev
+ *
+ */
+
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "GL/osmesa.h"
 #include "GL/glut.h"
 
 
-#define SAVE_TARGA
-
 
 #define WIDTH 400
 #define HEIGHT 400
@@ -75,197 +85,76 @@ static void render_image( void )
    glutSolidCone(1.0, 2.0, 16, 1);
    glPopMatrix();
 
-#ifdef GL_HP_occlusion_test
-   {
-      GLboolean bRet;
-      glDepthMask(GL_FALSE);
-      glColorMask(GL_FALSE,GL_FALSE,GL_FALSE,GL_FALSE);
-      glEnable(GL_OCCLUSION_TEST_HP);
-      glGetBooleanv(GL_OCCLUSION_TEST_RESULT_HP,&bRet);
-
-      glPushMatrix();
-      glTranslatef(0.75, 0.0, -1.0);
-      glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue_mat );
-      glutSolidSphere(1.0, 20, 20);
-      glPopMatrix();
-
-      glGetBooleanv(GL_OCCLUSION_TEST_RESULT_HP,&bRet);
-      printf("Occlusion test 1 (result should be 1): %d\n",bRet);
-
-      glDepthMask(GL_TRUE);
-      glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE);
-      glDisable(GL_OCCLUSION_TEST_HP);
-   }
-#endif
-
    glPushMatrix();
    glTranslatef(0.75, 0.0, -1.0); 
    glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue_mat );
    glutSolidSphere(1.0, 20, 20);
    glPopMatrix();
 
-#ifdef GL_HP_occlusion_test
-   {
-      GLboolean bRet;
-
-      glDepthMask(GL_FALSE);
-      glColorMask(GL_FALSE,GL_FALSE,GL_FALSE,GL_FALSE);
-      glEnable(GL_OCCLUSION_TEST_HP);
-      glGetBooleanv(GL_OCCLUSION_TEST_RESULT_HP,&bRet);
-
-      /* draw a sphere inside the previous sphere */
-      glPushMatrix();
-      glTranslatef(0.75, 0.0, -1.0);
-      glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue_mat );
-      glutSolidSphere(0.5, 20, 20);
-      glPopMatrix();
-
-      glGetBooleanv(GL_OCCLUSION_TEST_RESULT_HP,&bRet);
-      printf("Occlusion test 2 (result should be 0): %d\n",bRet);
-
-      glDepthMask(GL_TRUE);
-      glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE);
-      glDisable(GL_OCCLUSION_TEST_HP);
-   }
-#endif
-
    glPopMatrix();
 }
 
 
 
-static void
-write_targa(const char *filename, const GLubyte *buffer, int width, int height)
-{
-   FILE *f = fopen( filename, "w" );
-   if (f) {
-      int i, x, y;
-      const GLubyte *ptr = buffer;
-      printf ("osdemo, writing tga file \n");
-      fputc (0x00, f);	/* ID Length, 0 => No ID	*/
-      fputc (0x00, f);	/* Color Map Type, 0 => No color map included	*/
-      fputc (0x02, f);	/* Image Type, 2 => Uncompressed, True-color Image */
-      fputc (0x00, f);	/* Next five bytes are about the color map entries */
-      fputc (0x00, f);	/* 2 bytes Index, 2 bytes length, 1 byte size */
-      fputc (0x00, f);
-      fputc (0x00, f);
-      fputc (0x00, f);
-      fputc (0x00, f);	/* X-origin of Image	*/
-      fputc (0x00, f);
-      fputc (0x00, f);	/* Y-origin of Image	*/
-      fputc (0x00, f);
-      fputc (WIDTH & 0xff, f);      /* Image Width	*/
-      fputc ((WIDTH>>8) & 0xff, f);
-      fputc (HEIGHT & 0xff, f);     /* Image Height	*/
-      fputc ((HEIGHT>>8) & 0xff, f);
-      fputc (0x18, f);		/* Pixel Depth, 0x18 => 24 Bits	*/
-      fputc (0x20, f);		/* Image Descriptor	*/
-      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+2], f); /* write blue */
-            fputc(ptr[i+1], f); /* write green */
-            fputc(ptr[i], f);   /* write red */
-         }
-      }
-   }
-}
-
-
-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);
-   }
-}
-
-
-
 int main( int argc, char *argv[] )
 {
+   OSMesaContext ctx;
    void *buffer;
 
    /* Create an RGBA-mode context */
-#if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305
-   /* specify Z, stencil, accum sizes */
-   OSMesaContext ctx = OSMesaCreateContextExt( GL_RGBA, 16, 0, 0, NULL );
-#else
-   OSMesaContext ctx = OSMesaCreateContext( GL_RGBA, NULL );
-#endif
-   if (!ctx) {
-      printf("OSMesaCreateContext failed!\n");
-      return 0;
-   }
+   ctx = OSMesaCreateContext( GL_RGBA, NULL );
 
    /* Allocate the image buffer */
    buffer = malloc( WIDTH * HEIGHT * 4 );
-   if (!buffer) {
-      printf("Alloc image buffer failed!\n");
-      return 0;
-   }
 
    /* Bind the buffer to the context and make it current */
    OSMesaMakeCurrent( ctx, buffer, GL_UNSIGNED_BYTE, WIDTH, HEIGHT );
 
-   {
-      int z, s, a;
-      glGetIntegerv(GL_DEPTH_BITS, &z);
-      glGetIntegerv(GL_STENCIL_BITS, &s);
-      glGetIntegerv(GL_ACCUM_RED_BITS, &a);
-      printf("%d %d %d\n", z, s, a);
-   }
-
    render_image();
 
    if (argc>1) {
-#ifdef SAVE_TARGA
-      write_targa(argv[1], buffer, WIDTH, HEIGHT);
-#else
-      write_ppm(argv[1], buffer, WIDTH, HEIGHT);
+      /* write PPM file */
+      FILE *f = fopen( argv[1], "w" );
+      if (f) {
+         int i, x, y;
+         GLubyte *ptr = (GLubyte *) buffer;
+#define BINARY 0
+#if BINARY
+         fprintf(f,"P6\n");
+         fprintf(f,"# ppm-file created by %s\n",  argv[0]);
+         fprintf(f,"%i %i\n", WIDTH,HEIGHT);
+         fprintf(f,"255\n");
+         fclose(f);
+         f = fopen( argv[1], "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 %s\n", argv[0]);
+         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");
+            }
+         }
 #endif
+         fclose(f);
+      }
    }
    else {
-      printf("Specify a filename if you want to make an image file\n");
+      printf("Specify a filename if you want to make a ppm file\n");
    }
 
    printf("all done\n");

progs/demos/paltex.c

@@ -1,45 +1,50 @@
-/* $Id: paltex.c,v 1.6 2000/10/05 07:17:43 joukj Exp $ */
+/* $Id: paltex.c,v 1.2 1999/11/02 15:09:04 brianp Exp $ */
 
 /*
  * Paletted texture demo.  Written by Brian Paul.
  * This program is in the public domain.
  */
 
+/*
+ * $Log: paltex.c,v $
+ * Revision 1.2  1999/11/02 15:09:04  brianp
+ * new texture image, cleaned-up code
+ *
+ * Revision 1.1.1.1  1999/08/19 00:55:40  jtg
+ * Imported sources
+ *
+ * Revision 3.1  1999/03/28 18:20:49  brianp
+ * minor clean-up
+ *
+ * Revision 3.0  1998/02/14 18:42:29  brianp
+ * initial rev
+ *
+ */
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <string.h>
-#define GL_GLEXT_LEGACY
 #include <GL/glut.h>
 
 
 static float Rot = 0.0;
-static GLboolean Anim = 1;
 
 
 static void Idle( void )
 {
-   float t = glutGet(GLUT_ELAPSED_TIME) * 0.001;  /* in seconds */
-   Rot = t * 360 / 4;  /* 1 rotation per 4 seconds */
+   Rot += 5.0;
    glutPostRedisplay();
 }
 
 
 static void Display( void )
 {
-   /* draw background gradient */
-   glDisable(GL_TEXTURE_2D);
-   glBegin(GL_POLYGON);
-   glColor3f(1.0, 0.0, 0.2); glVertex2f(-1.5, -1.0);
-   glColor3f(1.0, 0.0, 0.2); glVertex2f( 1.5, -1.0);
-   glColor3f(0.0, 0.0, 1.0); glVertex2f( 1.5,  1.0);
-   glColor3f(0.0, 0.0, 1.0); glVertex2f(-1.5,  1.0);
-   glEnd();
+   glClear( GL_COLOR_BUFFER_BIT );
 
    glPushMatrix();
    glRotatef(Rot, 0, 0, 1);
 
-   glEnable(GL_TEXTURE_2D);
    glBegin(GL_POLYGON);
    glTexCoord2f(0, 1);  glVertex2f(-1, -0.5);
    glTexCoord2f(1, 1);  glVertex2f( 1, -0.5);
@@ -58,9 +63,10 @@ static void Reshape( int width, int height )
    glViewport( 0, 0, width, height );
    glMatrixMode( GL_PROJECTION );
    glLoadIdentity();
-   glOrtho( -1.5, 1.5, -1.0, 1.0, -1.0, 1.0 );
+   glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 25.0 );
    glMatrixMode( GL_MODELVIEW );
    glLoadIdentity();
+   glTranslatef( 0.0, 0.0, -7.0 );
 }
 
 
@@ -72,16 +78,6 @@ static void Key( unsigned char key, int x, int y )
       case 27:
          exit(0);
          break;
-      case 's':
-         Rot += 0.5;
-         break;
-      case ' ':
-         Anim = !Anim;
-         if (Anim)
-            glutIdleFunc( Idle );
-         else
-            glutIdleFunc( NULL );
-         break;
    }
    glutPostRedisplay();
 }
@@ -102,6 +98,7 @@ static void Init( void )
          "                                "
       };
    GLubyte table[256][4];
+   int i;
 
    if (!glutExtensionSupported("GL_EXT_paletted_texture")) {
       printf("Sorry, GL_EXT_paletted_texture not supported\n");
@@ -109,27 +106,26 @@ static void Init( void )
    }
 
    /* load the color table for each texel-index */
-   memset(table, 0, 256*4);
-   table[' '][0] = 255;
-   table[' '][1] = 255;
-   table[' '][2] = 255;
-   table[' '][3] = 64;
+   table[' '][0] = 50;
+   table[' '][1] = 50;
+   table[' '][2] = 50;
+   table[' '][3] = 50;
    table['M'][0] = 255;
    table['M'][1] = 0;
    table['M'][2] = 0;
-   table['M'][3] = 255;
+   table['M'][3] = 0;
    table['E'][0] = 0;
    table['E'][1] = 255;
    table['E'][2] = 0;
-   table['E'][3] = 255;
-   table['S'][0] = 0;
-   table['S'][1] = 0;
+   table['E'][3] = 0;
+   table['S'][0] = 40;
+   table['S'][1] = 40;
    table['S'][2] = 255;
-   table['S'][3] = 255;
+   table['S'][3] = 0;
    table['A'][0] = 255;
    table['A'][1] = 255;
    table['A'][2] = 0;
-   table['A'][3] = 255;
+   table['A'][3] = 0;
 
 #ifdef GL_EXT_paletted_texture
 
@@ -165,81 +161,6 @@ static void Init( void )
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
    glEnable(GL_TEXTURE_2D);
-
-   glEnable(GL_BLEND);
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-#undef HEIGHT
-#undef WIDTH
-}
-
-
-
-/*
- * Color ramp test
- */
-static void Init2( void )
-{
-#define HEIGHT 32
-#define WIDTH 256
-   static char texture[HEIGHT][WIDTH];
-   GLubyte table[256][4];
-   int i, j;
-
-   if (!glutExtensionSupported("GL_EXT_paletted_texture")) {
-      printf("Sorry, GL_EXT_paletted_texture not supported\n");
-      exit(0);
-   }
-
-   for (j = 0; j < HEIGHT; j++) {
-      for (i = 0; i < WIDTH; i++) {
-         texture[j][i] = i;
-      }
-   }
-
-   for (i = 0; i < 255; i++) {
-      table[i][0] = i;
-      table[i][1] = 0;
-      table[i][2] = 0;
-      table[i][3] = 255;
-   }
-
-#ifdef GL_EXT_paletted_texture
-
-#if defined(GL_EXT_shared_texture_palette) && defined(USE_SHARED_PALETTE)
-   printf("Using shared palette\n");
-   glColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT,    /* target */
-                   GL_RGBA,          /* internal format */
-                   256,              /* table size */
-                   GL_RGBA,          /* table format */
-                   GL_UNSIGNED_BYTE, /* table type */
-                   table);           /* the color table */
-   glEnable(GL_SHARED_TEXTURE_PALETTE_EXT);
-#else
-   glColorTableEXT(GL_TEXTURE_2D,    /* target */
-                   GL_RGBA,          /* internal format */
-                   256,              /* table size */
-                   GL_RGBA,          /* table format */
-                   GL_UNSIGNED_BYTE, /* table type */
-                   table);           /* the color table */
-#endif
-
-   glTexImage2D(GL_TEXTURE_2D,       /* target */
-                0,                   /* level */
-                GL_COLOR_INDEX8_EXT, /* internal format */
-                WIDTH, HEIGHT,       /* width, height */
-                0,                   /* border */
-                GL_COLOR_INDEX,      /* texture format */
-                GL_UNSIGNED_BYTE,    /* texture type */
-                texture);            /* teh texture */
-#endif
-
-   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_REPLACE);
-   glEnable(GL_TEXTURE_2D);
-
-   glEnable(GL_BLEND);
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
 
 
@@ -247,7 +168,7 @@ int main( int argc, char *argv[] )
 {
    glutInit( &argc, argv );
    glutInitWindowPosition( 0, 0 );
-   glutInitWindowSize( 400, 300 );
+   glutInitWindowSize( 400, 400 );
 
    glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
 
@@ -258,8 +179,7 @@ int main( int argc, char *argv[] )
    glutReshapeFunc( Reshape );
    glutKeyboardFunc( Key );
    glutDisplayFunc( Display );
-   if (Anim)
-      glutIdleFunc( Idle );
+   glutIdleFunc( Idle );
 
    glutMainLoop();
    return 0;

progs/demos/particles.cxx

@@ -1,219 +0,0 @@
-/*
- * This program is under the GNU GPL.
- * Use at your own risk.
- *
- * written by David Bucciarelli (humanware@plus.it)
- *            Humanware s.r.l.
- */
-
-#include <stdlib.h>
-
-#include "particles.h"
-
-#define vinit(a,i,j,k) {\
-  (a)[0]=i;\
-  (a)[1]=j;\
-  (a)[2]=k;\
-}
-
-#define vadds(a,dt,b) {\
-  (a)[0]+=(dt)*(b)[0];\
-  (a)[1]+=(dt)*(b)[1];\
-  (a)[2]+=(dt)*(b)[2];\
-}
-
-#define vequ(a,b) {\
-  (a)[0]=(b)[0];\
-  (a)[1]=(b)[1];\
-  (a)[2]=(b)[2];\
-}
-
-#define vinter(a,dt,b,c) {\
-  (a)[0]=(dt)*(b)[0]+(1.0-dt)*(c)[0];\
-  (a)[1]=(dt)*(b)[1]+(1.0-dt)*(c)[1];\
-  (a)[2]=(dt)*(b)[2]+(1.0-dt)*(c)[2];\
-}
-
-#define clamp(a)        ((a) < 0.0 ? 0.0 : ((a) < 1.0 ? (a) : 1.0))
-
-#define vclamp(v) {\
-  (v)[0]=clamp((v)[0]);\
-  (v)[1]=clamp((v)[1]);\
-  (v)[2]=clamp((v)[2]);\
-}
-
-
-float rainParticle::min[3];
-float rainParticle::max[3];
-float rainParticle::partLength=0.2f;
-
-
-static float vrnd(void)
-{
-  return(((float)rand())/RAND_MAX);
-}
-
-
-particle::particle()
-{
-  age=0.0f;
-
-  vinit(acc,0.0f,0.0f,0.0f);
-  vinit(vel,0.0f,0.0f,0.0f);
-  vinit(pos,0.0f,0.0f,0.0f);
-}
-
-void particle::elapsedTime(float dt)
-{
-  age+=dt;
-
-  vadds(vel,dt,acc);
-
-  vadds(pos,dt,vel);
-}
-
-/////////////////////////////////////////
-// Particle System
-/////////////////////////////////////////
-
-particleSystem::particleSystem()
-{
-  t=0.0f;
-
-  part=NULL;
-
-  particleNum=0;
-}
-
-particleSystem::~particleSystem()
-{
-  if(part)
-    free(part);
-}
-
-void particleSystem::addParticle(particle *p)
-{
-  if(!part) {
-    part=(particle **)calloc(1,sizeof(particle *));
-    part[0]=p;
-    particleNum=1;
-  } else {
-    particleNum++;
-    part=(particle **)realloc(part,sizeof(particle *)*particleNum);
-    part[particleNum-1]=p;
-  }
-}
-
-void particleSystem::reset(void)
-{
-  if(part)
-    free(part);
-
-  t=0.0f;
-
-  part=NULL;
-
-  particleNum=0;
-}
-
-void particleSystem::draw(void)
-{
-  if(!part)
-    return;
-
-  part[0]->beginDraw();
-  for(unsigned int i=0;i<particleNum;i++)
-    part[i]->draw();
-  part[0]->endDraw();
-}
-
-void particleSystem::addTime(float dt)
-{
-  if(!part)
-    return;
-
-  for(unsigned int i=0;i<particleNum;i++) {
-    part[i]->elapsedTime(dt);
-    part[i]->checkAge();
-  }
-}
-
-/////////////////////////////////////////
-// Rain
-/////////////////////////////////////////
-
-void rainParticle::init(void)
-{
-  age=0.0f;
-
-  acc[0]=0.0f;
-  acc[1]=-0.98f;
-  acc[2]=0.0f;
-
-  vel[0]=0.0f;
-  vel[1]=0.0f;
-  vel[2]=0.0f;
-
-  oldpos[0]=pos[0]=min[0]+(max[0]-min[0])*vrnd();
-  oldpos[1]=pos[1]=max[1]+0.2f*max[1]*vrnd();
-  oldpos[2]=pos[2]=min[2]+(max[2]-min[2])*vrnd();
-
-  vadds(oldpos,-partLength,vel);
-}
-
-rainParticle::rainParticle()
-{ 
-  init();
-}
-
-void rainParticle::setRainingArea(float minx, float miny, float minz,
-				  float maxx, float maxy, float maxz)
-{
-  vinit(min,minx,miny,minz);
-  vinit(max,maxx,maxy,maxz);
-}
-
-void rainParticle::setLength(float l)
-{
-  partLength=l;
-}
-
-void rainParticle::draw(void)
-{
-  glColor4f(0.7f,0.95f,1.0f,0.0f);
-  glVertex3fv(oldpos);
-
-  glColor4f(0.3f,0.7f,1.0f,1.0f);
-  glVertex3fv(pos);
-}
-
-void rainParticle::checkAge(void)
-{
-  if(pos[1]<min[1])
-    init();
-}
-
-void rainParticle::elapsedTime(float dt)
-{
-  particle::elapsedTime(dt);
-
-  if(pos[0]<min[0])
-    pos[0]=max[0]-(min[0]-pos[0]);
-  if(pos[2]<min[2])
-    pos[2]=max[2]-(min[2]-pos[2]);
-
-  if(pos[0]>max[0])
-    pos[0]=min[0]+(pos[0]-max[0]);
-  if(pos[2]>max[2])
-    pos[2]=min[2]+(pos[2]-max[2]);
-
-  vequ(oldpos,pos);
-  vadds(oldpos,-partLength,vel);
-}
-
-void rainParticle::randomHeight(void)
-{
-  pos[1]=(max[1]-min[1])*vrnd()+min[1];
-
-  oldpos[1]=pos[1]-partLength*vel[1];
-}

progs/demos/particles.h

@@ -1,81 +0,0 @@
-/*
- * This program is under the GNU GPL.
- * Use at your own risk.
- *
- * written by David Bucciarelli (humanware@plus.it)
- *            Humanware s.r.l.
- */
-
-#ifndef PARTICLES_H
-#define PARTICLES_H
-
-#include <GL/gl.h>
-
-class particle {
- protected:
-  float age;         // in seconds
-  float acc[3];
-  float vel[3];
-  float pos[3];
-
- public:
-  particle();
-  virtual ~particle() {};
-
-  virtual void beginDraw(void) {};
-  virtual void draw(void)=0;
-  virtual void endDraw(void) {};
-
-  virtual void elapsedTime(float);
-  virtual void checkAge(void) {};
-};
-
-class particleSystem {
- protected:
-  particle **part;
-
-  float t;
-
-  unsigned long particleNum;
- public:
-  particleSystem();
-  ~particleSystem();
-
-  void addParticle(particle *);
-
-  void reset(void);
-
-  void draw(void);
-
-  void addTime(float);
-};
-
-class rainParticle : public particle {
- protected:
-  static float min[3];
-  static float max[3];
-  static float partLength;
-
-  float oldpos[3];
-
-  void init(void);
- public:
-  rainParticle();
-
-  static void setRainingArea(float, float, float,
-			     float, float, float);
-  static void setLength(float);
-  static float getLength(void) { return partLength; };
-
-  void beginDraw(void) { glBegin(GL_LINES); };
-  void draw(void);
-  void endDraw(void) { glEnd(); };
-
-  void elapsedTime(float);
-
-  void checkAge(void);
-
-  void randomHeight(void);
-};
-
-#endif

progs/demos/pixeltex.c

@@ -1,210 +0,0 @@
-/*
- * GL_SGIS_pixel_texture demo
- *
- * Brian Paul
- * 6 Apr 2000
- *
- * Copyright (C) 2000  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.
- */
-
-
-/*
- * How this works:
- * 1. We load the image into a 2D texture.
- * 2. We generate a sequence of RGB images in which the R component
- *    is really the S texture coordinate and the G component is really
- *    the T texture coordinate.
- *    By warping the mapping from R to S and G to T we can get non-linear
- *    distortions.
- * 3. Draw the warped image (a 2-D warping function) with pixel texgen
- *    enabled.
- * 4. Loop over the warped images to animate.
- *
- * The pixel texgen extension can also be used to do color-space
- * conversions.  For example, we could convert YCR to RGB with a
- * 3D texture map which takes YCR as the S,T,R texture coordinate and
- * returns RGB texel values.
- *
- * You can use this extension in (at least) two ways:
- * 1. glDrawPixels w/ color space conversion/warping
- * 2. glDrawPixels to spatially warp another image in texture memory
- *
- * We're basically using glDrawPixels to draw a texture coordinate image.
- */
-
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <GL/glut.h>
-#include <GL/glext.h>
-#include "readtex.c"   /* I know, this is a hack. */
-
-#define TEXTURE_FILE "../images/girl.rgb"
-
-static int ImgWidth = 300, ImgHeight = 300;
-#define FRAMES 20
-static GLubyte *ImgData[FRAMES];
-static GLint Frame = 0;
-
-static GLboolean TextureFlag = GL_TRUE;
-
-
-static void Display( void )
-{
-   glClear( GL_COLOR_BUFFER_BIT );
-
-   if (TextureFlag) {
-      glEnable(GL_PIXEL_TEXTURE_SGIS);
-      glEnable(GL_TEXTURE_2D);
-   }
-   else {
-      glDisable(GL_PIXEL_TEXTURE_SGIS);
-      glDisable(GL_TEXTURE_2D);
-   }
-
-   glColor3f(1, 1, 1);
-   glRasterPos2f(10, 10);
-   glDrawPixels(ImgWidth, ImgHeight, GL_RGB, GL_UNSIGNED_BYTE, ImgData[Frame]);
-
-   glutSwapBuffers();
-}
-
-
-static void Reshape( int width, int height )
-{
-   glViewport( 0, 0, width, height );
-   glMatrixMode( GL_PROJECTION );
-   glLoadIdentity();
-   glOrtho(0, width, 0, height, -1, 1);
-   glMatrixMode( GL_MODELVIEW );
-   glLoadIdentity();
-}
-
-
-static void Key( unsigned char key, int x, int y )
-{
-   (void) x;
-   (void) y;
-   switch (key) {
-      case ' ':
-         TextureFlag = !TextureFlag;
-         break;
-      case 27:
-         exit(0);
-         break;
-   }
-   glutPostRedisplay();
-}
-
-
-static void Idle(void)
-{
-   Frame++;
-   if (Frame >= FRAMES)
-      Frame = 0;
-   glutPostRedisplay();
-}
-
-
-static GLubyte warp(GLfloat s, int frame)
-{
-   static const GLfloat PI = 3.14159265;
-   static int halfFrame = FRAMES / 2;
-   GLfloat y, weight, v;
-   if (frame >= halfFrame)
-      frame = halfFrame - (frame - halfFrame);
-   y = sin(s * PI);
-   weight = (float) frame / (FRAMES-1);
-   v = y * (0.8 * weight + 0.2);
-   return (GLint) (v * 255.0F);
-}
-
-
-static void InitImage(void)
-{
-   int i, j, frame;
-   for (frame = 0; frame < FRAMES; frame++) {
-      ImgData[frame] = (GLubyte *) malloc(ImgWidth * ImgHeight * 3);
-      for (i = 0; i < ImgHeight; i++) {
-         for (j = 0; j < ImgWidth; j++) {
-            GLubyte *pixel = ImgData[frame] + (i * ImgWidth + j) * 3;
-            pixel[0] = warp((float) j / (ImgWidth - 0), frame);
-            pixel[1] = warp((float) i / (ImgHeight - 0), frame);
-            pixel[2] = 0.0;
-         }
-      }
-   }
-}
-
-
-static void Init( int argc, char *argv[] )
-{
-   const char *exten = (const char *) glGetString(GL_EXTENSIONS);
-   if (!strstr(exten, "GL_SGIS_pixel_texture")) {
-      printf("Sorry, GL_SGIS_pixel_texture not supported by this renderer.\n");
-      exit(1);
-   }
-
-   /* linear filtering looks nicer, but it's slower, since it's in software */
-#if 1
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-#else
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-#endif
-
-   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-
-   if (!LoadRGBMipmaps(TEXTURE_FILE, GL_RGB)) {
-      printf("Error: couldn't load texture image\n");
-      exit(1);
-   }
-
-   glClearColor(0.3, 0.3, 0.4, 1.0);
-
-   InitImage();
-
-   printf("Hit SPACE to toggle pixel texgen\n");
-}
-
-
-int main( int argc, char *argv[] )
-{
-   glutInit( &argc, argv );
-   glutInitWindowSize( 330, 330 );
-   glutInitWindowPosition( 0, 0 );
-   glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
-   glutCreateWindow(argv[0] );
-
-   Init( argc, argv );
-
-   glutKeyboardFunc( Key );
-   glutReshapeFunc( Reshape );
-   glutDisplayFunc( Display );
-   glutIdleFunc( Idle );
-
-   glutMainLoop();
-   return 0;
-}

progs/demos/pointblast.c

@@ -13,11 +13,8 @@
 
 /*
  * $Log: pointblast.c,v $
- * Revision 1.2  2000/06/27 17:04:43  brianp
- * fixed compiler warnings
- *
- * Revision 1.1.1.1  1999/08/19 00:55:40  jtg
- * Imported sources
+ * Revision 1.1  1999/08/19 00:55:40  jtg
+ * Initial revision
  *
  * Revision 3.3  1998/07/26 01:24:27  brianp
  * removed include of gl.h
@@ -38,7 +35,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>       /* for cos(), sin(), and sqrt() */
-#define GL_GLEXT_LEGACY
 #include <GL/glut.h>
 
 /* Some <math.h> files do not define M_PI... */
@@ -104,7 +100,7 @@ static float float_rand(void) { return rand() / (float) RAND_MAX; }
 /* Modeling units of ground extent in each X and Z direction. */
 #define EDGE 12
 
-static void
+void
 makePointList(void)
 {
   float angle, velocity, direction;
@@ -128,7 +124,7 @@ makePointList(void)
   theTime = 0.0;
 }
 
-static void
+void
 updatePointList(void)
 {
   float distance;
@@ -171,7 +167,7 @@ updatePointList(void)
   }
 }
 
-static void
+void
 idle(void)
 {
   updatePointList();
@@ -182,7 +178,7 @@ idle(void)
   glutPostRedisplay();
 }
 
-static void
+void
 visible(int vis)
 {
   if (vis == GLUT_VISIBLE) {
@@ -194,7 +190,7 @@ visible(int vis)
   }
 }
 
-static void
+void
 recalcModelView(void)
 {
   glPopMatrix();
@@ -203,7 +199,7 @@ recalcModelView(void)
   newModel = 0;
 }
 
-static void
+void
 redraw(void)
 {
   int i;
@@ -251,7 +247,7 @@ redraw(void)
 }
 
 /* ARGSUSED2 */
-static void
+void
 mouse(int button, int state, int x, int y)
 {
   /* Scene can be spun around Y axis using left
@@ -266,7 +262,7 @@ mouse(int button, int state, int x, int y)
 }
 
 /* ARGSUSED1 */
-static void
+void
 mouseMotion(int x, int y)
 {
   if (moving) {
@@ -277,7 +273,7 @@ mouseMotion(int x, int y)
   }
 }
 
-static void
+void
 menu(int option)
 {
   switch (option) {
@@ -351,7 +347,7 @@ menu(int option)
 }
 
 /* ARGSUSED1 */
-static void
+void
 key(unsigned char c, int x, int y)
 {
   switch (c) {

progs/demos/rain.cxx

@@ -1,388 +0,0 @@
-/*
- * This program is under the GNU GPL.
- * Use at your own risk.
- *
- * written by David Bucciarelli (humanware@plus.it)
- *            Humanware s.r.l.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <time.h>
-#include <GL/glut.h>
-
-#include "particles.h"
-extern "C" {
-#include "image.h"
-}
-
-#ifdef WIN32
-#include <windows.h>
-#include <mmsystem.h>
-#endif
-
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen=1;
-#endif
-
-static int WIDTH=640;
-static int HEIGHT=480;
-static int NUMPART=7500;
-
-#define FRAME 50
-
-static float fogcolor[4]={1.0,1.0,1.0,1.0};
-
-#define DIMP 40.0
-#define DIMTP 32.0
-
-static float q[4][3]={
-  {-DIMP,0.0,-DIMP},
-  {DIMP,0.0,-DIMP},
-  {DIMP,0.0,DIMP},
-  {-DIMP,0.0,DIMP}
-};
-
-static float qt[4][2]={
-  {-DIMTP,-DIMTP},
-  {DIMTP,-DIMTP},
-  {DIMTP,DIMTP},
-  {-DIMTP,DIMTP}
-};
-
-static int win=0;
-
-static int fog=1;
-static int help=1;
-
-static GLuint groundid;
-
-static float obs[3]={2.0,1.0,0.0};
-static float dir[3];
-static float v=0.0;
-static float alpha=-90.0;
-static float beta=90.0;
-
-static particleSystem *ps;
-
-static float gettime()
-{
-  static clock_t told=0;
-  clock_t tnew,ris;
-
-  tnew=clock();
-
-  ris=tnew-told;
-
-  told=tnew;
-
-  return(ris/(float)CLOCKS_PER_SEC);
-}
-
-static float gettimerain()
-{
-  static clock_t told=0;
-  clock_t tnew,ris;
-
-  tnew=clock();
-
-  ris=tnew-told;
-
-  told=tnew;
-
-  return(ris/(float)CLOCKS_PER_SEC);
-}
-
-static void calcposobs(void)
-{
-  dir[0]=sin(alpha*M_PI/180.0);
-  dir[2]=cos(alpha*M_PI/180.0)*sin(beta*M_PI/180.0);
-  dir[1]=cos(beta*M_PI/180.0);
-
-  obs[0]+=v*dir[0];
-  obs[1]+=v*dir[1];
-  obs[2]+=v*dir[2];
-
-  rainParticle::setRainingArea(obs[0]-7.0f,-0.2f,obs[2]-7.0f,obs[0]+7.0f,8.0f,obs[2]+7.0f);
-}
-
-static void printstring(void *font, char *string)
-{
-  int len,i;
-
-  len=(int)strlen(string);
-  for(i=0;i<len;i++)
-    glutBitmapCharacter(font,string[i]);
-}
-
-static void reshape(int width, int height)
-{
-  WIDTH=width;
-  HEIGHT=height;
-  glViewport(0,0,(GLint)width,(GLint)height);
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  gluPerspective(70.0,width/(float)height,0.1,30.0);
-
-  glMatrixMode(GL_MODELVIEW);
-}
-
-static void printhelp(void)
-{
-  glEnable(GL_BLEND);
-  glColor4f(0.0,0.0,0.0,0.5);
-  glRecti(40,40,600,440);
-  glDisable(GL_BLEND);
-
-  glColor3f(1.0,0.0,0.0);
-  glRasterPos2i(300,420);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"Help");
-
-  glRasterPos2i(60,390);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"h - Togle Help");
-
-  glRasterPos2i(60,360);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"f - Togle Fog");
-  glRasterPos2i(60,330);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"Arrow Keys - Rotate");
-  glRasterPos2i(60,300);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"a - Increase velocity");
-  glRasterPos2i(60,270);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"z - Decrease velocity");
-  glRasterPos2i(60,240);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"l - Increase rain length");
-  glRasterPos2i(60,210);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"k - Increase rain length");
-}
-
-static void drawrain(void)
-{
-  static int count=0;
-  static char frbuf[80];
-  float fr;
-
-  glEnable(GL_DEPTH_TEST);
-
-  if(fog)
-    glEnable(GL_FOG);
-  else
-    glDisable(GL_FOG);
-
-  glDepthMask(GL_TRUE);
-  glClearColor(1.0,1.0,1.0,1.0);
-  glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-
-  glPushMatrix();
-  calcposobs();
-  gluLookAt(obs[0],obs[1],obs[2],
-	    obs[0]+dir[0],obs[1]+dir[1],obs[2]+dir[2],
-	    0.0,1.0,0.0);
-
-  glColor4f(1.0,1.0,1.0,1.0);
-
-  glEnable(GL_TEXTURE_2D);
-
-  glBindTexture(GL_TEXTURE_2D,groundid);
-  glBegin(GL_QUADS);
-  glTexCoord2fv(qt[0]);
-  glVertex3fv(q[0]);
-  glTexCoord2fv(qt[1]);
-  glVertex3fv(q[1]);
-  glTexCoord2fv(qt[2]);
-  glVertex3fv(q[2]);
-  glTexCoord2fv(qt[3]);
-  glVertex3fv(q[3]);
-  glEnd();
-
-  // Particle System
-
-  glDisable(GL_TEXTURE_2D);
-  glShadeModel(GL_SMOOTH);
-  glEnable(GL_BLEND);
-
-  ps->draw();
-  ps->addTime(gettimerain());
-  
-  glShadeModel(GL_FLAT);
- 
-
-  if((count % FRAME)==0) {
-    fr=gettime();
-    sprintf(frbuf,"Frame rate: %f",FRAME/fr);
-  }
-
-  glDisable(GL_TEXTURE_2D);
-  glDisable(GL_DEPTH_TEST);
-  glDisable(GL_FOG);
-
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  glOrtho(-0.5,639.5,-0.5,479.5,-1.0,1.0);
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-
-  glColor3f(1.0,0.0,0.0);
-  glRasterPos2i(10,10);
-  printstring(GLUT_BITMAP_HELVETICA_18,frbuf);
-  glRasterPos2i(350,470);
-  printstring(GLUT_BITMAP_HELVETICA_10,"Rain V1.0 Written by David Bucciarelli (humanware@plus.it)");
-
-  if(help)
-    printhelp();
-
-  reshape(WIDTH,HEIGHT);
-  glPopMatrix();
-
-  glutSwapBuffers();
-
-  count++;
-}
-
-
-static void special(int key, int x, int y)
-{
-  switch (key) {
-  case GLUT_KEY_LEFT:
-    alpha+=2.0;
-    break;
-  case GLUT_KEY_RIGHT:
-    alpha-=2.0;
-    break;
-  case GLUT_KEY_DOWN:
-    beta-=2.0;
-    break;
-  case GLUT_KEY_UP:
-    beta+=2.0;
-    break;
-  }
-}
-
-static void key(unsigned char key, int x, int y)
-{
-  switch (key) {
-  case 27:
-    exit(0);
-    break;
-
-  case 'a':
-    v+=0.01;
-    break;
-  case 'z':
-    v-=0.01;
-    break;
-
-  case 'l':
-    rainParticle::setLength(rainParticle::getLength()+0.025f);
-    break;
-  case 'k':
-    rainParticle::setLength(rainParticle::getLength()-0.025f);
-    break;
-
-  case 'h':
-    help=(!help);
-    break;
-  case 'f':
-    fog=(!fog);
-    break;
-#ifdef XMESA
-  case ' ':
-    XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
-    fullscreen=(!fullscreen);
-    break;
-#endif
-  }
-}
-
-static void inittextures(void)
-{
-  IMAGE *img;
-  GLenum gluerr;
-
-  glGenTextures(1,&groundid);
-  glBindTexture(GL_TEXTURE_2D,groundid);
-
-  if(!(img=ImageLoad("s128.rgb"))) {
-    fprintf(stderr,"Error reading a texture.\n");
-    exit(-1);
-  }
-
-  glPixelStorei(GL_UNPACK_ALIGNMENT,4);
-  if((gluerr=(GLenum)gluBuild2DMipmaps(GL_TEXTURE_2D, 3, img->sizeX, img->sizeY, GL_RGB,
-			       GL_UNSIGNED_BYTE, (GLvoid *)(img->data)))) {
-    fprintf(stderr,"GLULib%s\n",gluErrorString(gluerr));
-    exit(-1);
-  }
-
-  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
-  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
-
-  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR);
-  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
-
-  glTexEnvf(GL_TEXTURE_ENV,GL_TEXTURE_ENV_MODE,GL_DECAL);
-}
-
-static void initparticle(void)
-{
-  ps=new particleSystem;
-
-  rainParticle::setRainingArea(-7.0f,-0.2f,-7.0f,7.0f,8.0f,7.0f);
-
-  for(int i=0;i<NUMPART;i++) {
-    rainParticle *p=new rainParticle;
-    p->randomHeight();
-
-    ps->addParticle((particle *)p);
-  }
-}
-
-int main(int ac,char **av)
-{
-  fprintf(stderr,"Rain V1.0\nWritten by David Bucciarelli (humanware@plus.it)\n");
-
-  /* Default settings */
-
-  WIDTH=640;
-  HEIGHT=480;
-
-  glutInitWindowPosition(0,0);
-  glutInitWindowSize(WIDTH,HEIGHT);
-  glutInit(&ac,av);
-
-  glutInitDisplayMode(GLUT_RGB|GLUT_DEPTH|GLUT_DOUBLE);
-
-  if(!(win=glutCreateWindow("Rain"))) {
-    fprintf(stderr,"Error opening a window.\n");
-    exit(-1);
-  }
-  
-  reshape(WIDTH,HEIGHT);
-
-  inittextures();
-
-  glShadeModel(GL_FLAT);
-  glEnable(GL_DEPTH_TEST);
-
-  glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-
-  glEnable(GL_FOG);
-  glFogi(GL_FOG_MODE,GL_EXP);
-  glFogfv(GL_FOG_COLOR,fogcolor);
-  glFogf(GL_FOG_DENSITY,0.1);
-#ifdef FX
-  glHint(GL_FOG_HINT,GL_NICEST);
-#endif
-
-  initparticle();
-
-  glutKeyboardFunc(key);
-  glutSpecialFunc(special);
-  glutDisplayFunc(drawrain);
-  glutIdleFunc(drawrain);
-  glutReshapeFunc(reshape);
-  glutMainLoop();
-
-  return(0);
-}

progs/demos/ray.c

@@ -1,901 +0,0 @@
-/*
- * This program is under the GNU GPL.
- * Use at your own risk.
- *
- * written by David Bucciarelli (tech.hmw@plus.it)
- *            Humanware s.r.l.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-#ifdef WIN32
-#include <windows.h>
-#endif
-
-#include <GL/glut.h>
-
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen = 1;
-#endif
-
-static int WIDTH = 640;
-static int HEIGHT = 480;
-
-static GLint T0 = 0;
-static GLint Frames = 0;
-
-#define BASESIZE 7.5f
-#define SPHERE_RADIUS 0.75f
-
-#define TEX_CHECK_WIDTH 256
-#define TEX_CHECK_HEIGHT 256
-#define TEX_CHECK_SLOT_SIZE (TEX_CHECK_HEIGHT/16)
-#define TEX_CHECK_NUMSLOT (TEX_CHECK_HEIGHT/TEX_CHECK_SLOT_SIZE)
-
-#define TEX_REFLECT_WIDTH 256
-#define TEX_REFLECT_HEIGHT 256
-#define TEX_REFLECT_SLOT_SIZE (TEX_REFLECT_HEIGHT/16)
-#define TEX_REFLECT_NUMSLOT (TEX_REFLECT_HEIGHT/TEX_REFLECT_SLOT_SIZE)
-
-#ifndef M_PI
-#define M_PI 3.1415926535
-#endif
-
-#define EPSILON 0.0001
-
-#define clamp255(a)  ( (a)<(0.0f) ? (0.0f) : ((a)>(255.0f) ? (255.0f) : (a)) )
-
-#define fabs(x) ((x)<0.0f?-(x):(x))
-
-#define vequ(a,b) { (a)[0]=(b)[0]; (a)[1]=(b)[1]; (a)[2]=(b)[2]; }
-#define vsub(a,b,c) { (a)[0]=(b)[0]-(c)[0]; (a)[1]=(b)[1]-(c)[1]; (a)[2]=(b)[2]-(c)[2]; }
-#define	dprod(a,b) ((a)[0]*(b)[0]+(a)[1]*(b)[1]+(a)[2]*(b)[2])
-#define vnormalize(a,b) { \
-  register float m_norm; \
-  m_norm=sqrt((double)dprod((a),(a))); \
-  (a)[0] /=m_norm; \
-  (a)[1] /=m_norm; \
-  (a)[2] /=m_norm; }
-
-static GLubyte checkmap[TEX_CHECK_HEIGHT][TEX_CHECK_WIDTH][3];
-static GLuint checkid;
-static int checkmap_currentslot = 0;
-
-static GLubyte reflectmap[TEX_REFLECT_HEIGHT][TEX_REFLECT_WIDTH][3];
-static GLuint reflectid;
-static int reflectmap_currentslot = 0;
-
-static GLuint lightdlist;
-static GLuint objdlist;
-
-static float lightpos[3] = { 2.1, 2.1, 2.8 };
-static float objpos[3] = { 0.0, 0.0, 1.0 };
-
-static float sphere_pos[TEX_CHECK_HEIGHT][TEX_REFLECT_WIDTH][3];
-
-static int win = 0;
-
-static float fogcolor[4] = { 0.05, 0.05, 0.05, 1.0 };
-
-static float obs[3] = { 7.0, 0.0, 2.0 };
-static float dir[3];
-static float v = 0.0;
-static float alpha = -90.0;
-static float beta = 90.0;
-
-static int fog = 1;
-static int bfcull = 1;
-static int poutline = 0;
-static int help = 1;
-static int showcheckmap = 1;
-static int showreflectmap = 1;
-static int joyavailable = 0;
-static int joyactive = 0;
-
-static void
-calcposobs(void)
-{
-   dir[0] = sin(alpha * M_PI / 180.0);
-   dir[1] = cos(alpha * M_PI / 180.0) * sin(beta * M_PI / 180.0);
-   dir[2] = cos(beta * M_PI / 180.0);
-
-   if (dir[0] < 1.0e-5 && dir[0] > -1.0e-5)
-      dir[0] = 0;
-   if (dir[1] < 1.0e-5 && dir[1] > -1.0e-5)
-      dir[1] = 0;
-   if (dir[2] < 1.0e-5 && dir[2] > -1.0e-5)
-      dir[2] = 0;
-
-   obs[0] += v * dir[0];
-   obs[1] += v * dir[1];
-   obs[2] += v * dir[2];
-}
-
-static void
-special(int k, int x, int y)
-{
-   switch (k) {
-   case GLUT_KEY_LEFT:
-      alpha -= 2.0;
-      break;
-   case GLUT_KEY_RIGHT:
-      alpha += 2.0;
-      break;
-   case GLUT_KEY_DOWN:
-      beta -= 2.0;
-      break;
-   case GLUT_KEY_UP:
-      beta += 2.0;
-      break;
-   }
-}
-
-static void
-key(unsigned char k, int x, int y)
-{
-   switch (k) {
-   case 27:
-      exit(0);
-      break;
-
-   case 's':
-      lightpos[1] -= 0.1;
-      break;
-   case 'd':
-      lightpos[1] += 0.1;
-      break;
-   case 'e':
-      lightpos[0] -= 0.1;
-      break;
-   case 'x':
-      lightpos[0] += 0.1;
-      break;
-   case 'w':
-      lightpos[2] -= 0.1;
-      break;
-   case 'r':
-      lightpos[2] += 0.1;
-      break;
-
-   case 'j':
-      objpos[1] -= 0.1;
-      break;
-   case 'k':
-      objpos[1] += 0.1;
-      break;
-   case 'i':
-      objpos[0] -= 0.1;
-      break;
-   case 'm':
-      objpos[0] += 0.1;
-      break;
-   case 'u':
-      objpos[2] -= 0.1;
-      break;
-   case 'o':
-      objpos[2] += 0.1;
-      break;
-
-   case 'a':
-      v += 0.005;
-      break;
-   case 'z':
-      v -= 0.005;
-      break;
-
-   case 'g':
-      joyactive = (!joyactive);
-      break;
-   case 'h':
-      help = (!help);
-      break;
-   case 'f':
-      fog = (!fog);
-      break;
-
-   case '1':
-      showcheckmap = (!showcheckmap);
-      break;
-   case '2':
-      showreflectmap = (!showreflectmap);
-      break;
-
-   case 'b':
-      if (bfcull) {
-	 glDisable(GL_CULL_FACE);
-	 bfcull = 0;
-      }
-      else {
-	 glEnable(GL_CULL_FACE);
-	 bfcull = 1;
-      }
-      break;
-   case 'p':
-      if (poutline) {
-	 glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-	 poutline = 0;
-      }
-      else {
-	 glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-	 poutline = 1;
-      }
-      break;
-#ifdef XMESA
-   case ' ':
-      XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
-      fullscreen = (!fullscreen);
-      break;
-#endif
-   }
-}
-
-static void
-reshape(int w, int h)
-{
-   WIDTH = w;
-   HEIGHT = h;
-   glViewport(0, 0, w, h);
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   gluPerspective(45.0, w / (float) h, 0.8, 40.0);
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-}
-
-static void
-printstring(void *font, char *string)
-{
-   int len, i;
-
-   len = (int) strlen(string);
-   for (i = 0; i < len; i++)
-      glutBitmapCharacter(font, string[i]);
-}
-
-static void
-printhelp(void)
-{
-   glEnable(GL_BLEND);
-   glColor4f(0.5, 0.5, 0.5, 0.5);
-   glRecti(40, 40, 600, 440);
-   glDisable(GL_BLEND);
-
-   glColor3f(0.0, 0.0, 1.0);
-   glRasterPos2i(300, 420);
-   printstring(GLUT_BITMAP_HELVETICA_18, "Help");
-
-   glRasterPos2i(60, 390);
-   printstring(GLUT_BITMAP_HELVETICA_12, "h - Togle Help");
-   glRasterPos2i(60, 370);
-   printstring(GLUT_BITMAP_HELVETICA_12, "f - Togle Fog");
-   glRasterPos2i(60, 350);
-   printstring(GLUT_BITMAP_HELVETICA_12, "b - Togle Back face culling");
-   glRasterPos2i(60, 330);
-   printstring(GLUT_BITMAP_HELVETICA_12, "p - Togle Wire frame");
-   glRasterPos2i(60, 310);
-   printstring(GLUT_BITMAP_HELVETICA_12, "Arrow Keys - Rotate");
-   glRasterPos2i(60, 290);
-   printstring(GLUT_BITMAP_HELVETICA_12, "a - Increase velocity");
-   glRasterPos2i(60, 270);
-   printstring(GLUT_BITMAP_HELVETICA_12, "z - Decrease velocity");
-
-   glRasterPos2i(60, 250);
-   if (joyavailable)
-      printstring(GLUT_BITMAP_HELVETICA_12,
-		  "j - Togle jostick control (Joystick control available)");
-   else
-      printstring(GLUT_BITMAP_HELVETICA_12,
-		  "(No Joystick control available)");
-
-   glRasterPos2i(60, 230);
-   printstring(GLUT_BITMAP_HELVETICA_12,
-	       "To move the light source: s - left,  d - right,  e - far,  x - near,  w - down r - up");
-   glRasterPos2i(60, 210);
-   printstring(GLUT_BITMAP_HELVETICA_12,
-	       "To move the mirror sphere: j - left,  k - right,  i - far,  m - near,  u - down o - up");
-
-   glRasterPos2i(60, 190);
-   printstring(GLUT_BITMAP_HELVETICA_12,
-	       "1 - Togle the plane texture map window");
-
-   glRasterPos2i(60, 170);
-   printstring(GLUT_BITMAP_HELVETICA_12,
-	       "2 - Togle the sphere texture map window");
-}
-
-static GLboolean
-seelight(float p[3], float dir[3])
-{
-   float c[3], b, a, d, t, dist[3];
-
-   vsub(c, p, objpos);
-   b = -dprod(c, dir);
-   a = dprod(c, c) - SPHERE_RADIUS * SPHERE_RADIUS;
-
-   if ((d = b * b - a) < 0.0 || (b < 0.0 && a > 0.0))
-      return GL_FALSE;
-
-   d = sqrt(d);
-
-   t = b - d;
-
-   if (t < EPSILON) {
-      t = b + d;
-      if (t < EPSILON)
-	 return GL_FALSE;
-   }
-
-   vsub(dist, lightpos, p);
-   if (dprod(dist, dist) < t * t)
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
-static int
-colorcheckmap(float ppos[3], float c[3])
-{
-   static float norm[3] = { 0.0f, 0.0f, 1.0f };
-   float ldir[3], vdir[3], h[3], dfact, kfact, r, g, b;
-   int x, y;
-
-   x = (int) ((ppos[0] + BASESIZE / 2) * (10.0f / BASESIZE));
-   if ((x < 0) || (x > 10))
-      return GL_FALSE;
-
-   y = (int) ((ppos[1] + BASESIZE / 2) * (10.0f / BASESIZE));
-   if ((y < 0) || (y > 10))
-      return GL_FALSE;
-
-   r = 255.0f;
-   if (y & 1) {
-      if (x & 1)
-	 g = 255.0f;
-      else
-	 g = 0.0f;
-   }
-   else {
-      if (x & 1)
-	 g = 0.0f;
-      else
-	 g = 255.0f;
-   }
-   b = 0.0f;
-
-   vsub(ldir, lightpos, ppos);
-   vnormalize(ldir, ldir);
-
-   if (seelight(ppos, ldir)) {
-      c[0] = r * 0.05f;
-      c[1] = g * 0.05f;
-      c[2] = b * 0.05f;
-
-      return GL_TRUE;
-   }
-
-   dfact = dprod(ldir, norm);
-   if (dfact < 0.0f)
-      dfact = 0.0f;
-
-   vsub(vdir, obs, ppos);
-   vnormalize(vdir, vdir);
-   h[0] = 0.5f * (vdir[0] + ldir[0]);
-   h[1] = 0.5f * (vdir[1] + ldir[1]);
-   h[2] = 0.5f * (vdir[2] + ldir[2]);
-   kfact = dprod(h, norm);
-   kfact = pow(kfact, 6.0) * 7.0 * 255.0;
-
-   r = r * dfact + kfact;
-   g = g * dfact + kfact;
-   b = b * dfact + kfact;
-
-   c[0] = clamp255(r);
-   c[1] = clamp255(g);
-   c[2] = clamp255(b);
-
-   return GL_TRUE;
-}
-
-static void
-updatecheckmap(int slot)
-{
-   float c[3], ppos[3];
-   int x, y;
-
-   glBindTexture(GL_TEXTURE_2D, checkid);
-
-   ppos[2] = 0.0f;
-   for (y = slot * TEX_CHECK_SLOT_SIZE; y < (slot + 1) * TEX_CHECK_SLOT_SIZE;
-	y++) {
-      ppos[1] = (y / (float) TEX_CHECK_HEIGHT) * BASESIZE - BASESIZE / 2;
-
-      for (x = 0; x < TEX_CHECK_WIDTH; x++) {
-	 ppos[0] = (x / (float) TEX_CHECK_WIDTH) * BASESIZE - BASESIZE / 2;
-
-	 colorcheckmap(ppos, c);
-	 checkmap[y][x][0] = (GLubyte) c[0];
-	 checkmap[y][x][1] = (GLubyte) c[1];
-	 checkmap[y][x][2] = (GLubyte) c[2];
-      }
-   }
-
-   glTexSubImage2D(GL_TEXTURE_2D, 0, 0, slot * TEX_CHECK_SLOT_SIZE,
-		   TEX_CHECK_WIDTH, TEX_CHECK_SLOT_SIZE, GL_RGB,
-		   GL_UNSIGNED_BYTE,
-		   &checkmap[slot * TEX_CHECK_SLOT_SIZE][0][0]);
-
-}
-
-static void
-updatereflectmap(int slot)
-{
-   float rf, r, g, b, t, dfact, kfact, rdir[3];
-   float rcol[3], ppos[3], norm[3], ldir[3], h[3], vdir[3], planepos[3];
-   int x, y;
-
-   glBindTexture(GL_TEXTURE_2D, reflectid);
-
-   for (y = slot * TEX_REFLECT_SLOT_SIZE;
-	y < (slot + 1) * TEX_REFLECT_SLOT_SIZE; y++)
-      for (x = 0; x < TEX_REFLECT_WIDTH; x++) {
-	 ppos[0] = sphere_pos[y][x][0] + objpos[0];
-	 ppos[1] = sphere_pos[y][x][1] + objpos[1];
-	 ppos[2] = sphere_pos[y][x][2] + objpos[2];
-
-	 vsub(norm, ppos, objpos);
-	 vnormalize(norm, norm);
-
-	 vsub(ldir, lightpos, ppos);
-	 vnormalize(ldir, ldir);
-	 vsub(vdir, obs, ppos);
-	 vnormalize(vdir, vdir);
-
-	 rf = 2.0f * dprod(norm, vdir);
-	 if (rf > EPSILON) {
-	    rdir[0] = rf * norm[0] - vdir[0];
-	    rdir[1] = rf * norm[1] - vdir[1];
-	    rdir[2] = rf * norm[2] - vdir[2];
-
-	    t = -objpos[2] / rdir[2];
-
-	    if (t > EPSILON) {
-	       planepos[0] = objpos[0] + t * rdir[0];
-	       planepos[1] = objpos[1] + t * rdir[1];
-	       planepos[2] = 0.0f;
-
-	       if (!colorcheckmap(planepos, rcol))
-		  rcol[0] = rcol[1] = rcol[2] = 0.0f;
-	    }
-	    else
-	       rcol[0] = rcol[1] = rcol[2] = 0.0f;
-	 }
-	 else
-	    rcol[0] = rcol[1] = rcol[2] = 0.0f;
-
-	 dfact = 0.1f * dprod(ldir, norm);
-
-	 if (dfact < 0.0f) {
-	    dfact = 0.0f;
-	    kfact = 0.0f;
-	 }
-	 else {
-	    h[0] = 0.5f * (vdir[0] + ldir[0]);
-	    h[1] = 0.5f * (vdir[1] + ldir[1]);
-	    h[2] = 0.5f * (vdir[2] + ldir[2]);
-	    kfact = dprod(h, norm);
-            kfact = pow(kfact, 4.0);
-            if (kfact < 1.0e-10)
-               kfact = 0.0;
-         }
-
-	 r = dfact + kfact;
-	 g = dfact + kfact;
-	 b = dfact + kfact;
-
-	 r *= 255.0f;
-	 g *= 255.0f;
-	 b *= 255.0f;
-
-	 r += rcol[0];
-	 g += rcol[1];
-	 b += rcol[2];
-
-	 r = clamp255(r);
-	 g = clamp255(g);
-	 b = clamp255(b);
-
-	 reflectmap[y][x][0] = (GLubyte) r;
-	 reflectmap[y][x][1] = (GLubyte) g;
-	 reflectmap[y][x][2] = (GLubyte) b;
-      }
-
-   glTexSubImage2D(GL_TEXTURE_2D, 0, 0, slot * TEX_REFLECT_SLOT_SIZE,
-		   TEX_REFLECT_WIDTH, TEX_REFLECT_SLOT_SIZE, GL_RGB,
-		   GL_UNSIGNED_BYTE,
-		   &reflectmap[slot * TEX_REFLECT_SLOT_SIZE][0][0]);
-}
-
-static void
-drawbase(void)
-{
-   glColor3f(0.0, 0.0, 0.0);
-   glBindTexture(GL_TEXTURE_2D, checkid);
-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-
-   glBegin(GL_QUADS);
-   glTexCoord2f(0.0f, 0.0f);
-   glVertex3f(-BASESIZE / 2.0f, -BASESIZE / 2.0f, 0.0f);
-
-   glTexCoord2f(1.0f, 0.0f);
-   glVertex3f(BASESIZE / 2.0f, -BASESIZE / 2.0f, 0.0f);
-
-   glTexCoord2f(1.0f, 1.0f);
-   glVertex3f(BASESIZE / 2.0f, BASESIZE / 2.0f, 0.0f);
-
-   glTexCoord2f(0.0f, 1.0f);
-   glVertex3f(-BASESIZE / 2.0f, BASESIZE / 2.0f, 0.0f);
-
-   glEnd();
-}
-
-static void
-drawobj(void)
-{
-   glColor3f(0.0, 0.0, 0.0);
-   glBindTexture(GL_TEXTURE_2D, reflectid);
-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-
-   glPushMatrix();
-   glTranslatef(objpos[0], objpos[1], objpos[2]);
-   glCallList(objdlist);
-   glPopMatrix();
-}
-
-static void
-dojoy(void)
-{
-#ifdef WIN32
-   static UINT max[2] = { 0, 0 };
-   static UINT min[2] = { 0xffffffff, 0xffffffff }, center[2];
-   MMRESULT res;
-   JOYINFO joy;
-
-   res = joyGetPos(JOYSTICKID1, &joy);
-
-   if (res == JOYERR_NOERROR) {
-      joyavailable = 1;
-
-      if (max[0] < joy.wXpos)
-	 max[0] = joy.wXpos;
-      if (min[0] > joy.wXpos)
-	 min[0] = joy.wXpos;
-      center[0] = (max[0] + min[0]) / 2;
-
-      if (max[1] < joy.wYpos)
-	 max[1] = joy.wYpos;
-      if (min[1] > joy.wYpos)
-	 min[1] = joy.wYpos;
-      center[1] = (max[1] + min[1]) / 2;
-
-      if (joyactive) {
-	 if (fabs(center[0] - (float) joy.wXpos) > 0.1 * (max[0] - min[0]))
-	    alpha -=
-	       2.5 * (center[0] - (float) joy.wXpos) / (max[0] - min[0]);
-	 if (fabs(center[1] - (float) joy.wYpos) > 0.1 * (max[1] - min[1]))
-	    beta += 2.5 * (center[1] - (float) joy.wYpos) / (max[1] - min[1]);
-
-	 if (joy.wButtons & JOY_BUTTON1)
-	    v += 0.005;
-	 if (joy.wButtons & JOY_BUTTON2)
-	    v -= 0.005;
-      }
-   }
-   else
-      joyavailable = 0;
-#endif
-}
-
-static void
-updatemaps(void)
-{
-   updatecheckmap(checkmap_currentslot);
-   checkmap_currentslot = (checkmap_currentslot + 1) % TEX_CHECK_NUMSLOT;
-
-   updatereflectmap(reflectmap_currentslot);
-   reflectmap_currentslot =
-      (reflectmap_currentslot + 1) % TEX_REFLECT_NUMSLOT;
-}
-
-static void
-draw(void)
-{
-   static char frbuf[80] = "";
-
-   dojoy();
-
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-   glEnable(GL_TEXTURE_2D);
-   glEnable(GL_DEPTH_TEST);
-   if (fog)
-      glEnable(GL_FOG);
-   else
-      glDisable(GL_FOG);
-
-   glPushMatrix();
-   calcposobs();
-
-   gluLookAt(obs[0], obs[1], obs[2],
-	     obs[0] + dir[0], obs[1] + dir[1], obs[2] + dir[2],
-	     0.0, 0.0, 1.0);
-
-   drawbase();
-   drawobj();
-
-   glColor3f(1.0, 1.0, 1.0);
-   glDisable(GL_TEXTURE_2D);
-
-   glPushMatrix();
-   glTranslatef(lightpos[0], lightpos[1], lightpos[2]);
-   glCallList(lightdlist);
-   glPopMatrix();
-
-   glPopMatrix();
-
-   glDisable(GL_DEPTH_TEST);
-   glDisable(GL_FOG);
-
-   glMatrixMode(GL_PROJECTION);
-   glPushMatrix();
-   glLoadIdentity();
-   glOrtho(-0.5, 639.5, -0.5, 479.5, -1.0, 1.0);
-   glMatrixMode(GL_MODELVIEW);
-
-   glColor3f(0.0f, 0.3f, 1.0f);
-
-   if (showcheckmap) {
-      glEnable(GL_TEXTURE_2D);
-      glBindTexture(GL_TEXTURE_2D, checkid);
-      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-
-      glBegin(GL_QUADS);
-      glTexCoord2f(1.0f, 0.0f);
-      glVertex2i(10, 30);
-      glTexCoord2f(1.0f, 1.0f);
-      glVertex2i(10 + 90, 30);
-      glTexCoord2f(0.0f, 1.0f);
-      glVertex2i(10 + 90, 30 + 90);
-      glTexCoord2f(0.0f, 0.0f);
-      glVertex2i(10, 30 + 90);
-      glEnd();
-
-      glDisable(GL_TEXTURE_2D);
-      glBegin(GL_LINE_LOOP);
-      glVertex2i(10, 30);
-      glVertex2i(10 + 90, 30);
-      glVertex2i(10 + 90, 30 + 90);
-      glVertex2i(10, 30 + 90);
-      glEnd();
-      glRasterPos2i(105, 65);
-      printstring(GLUT_BITMAP_HELVETICA_18, "Plane Texture Map");
-   }
-
-   if (showreflectmap) {
-      glEnable(GL_TEXTURE_2D);
-      glBindTexture(GL_TEXTURE_2D, reflectid);
-      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-
-      glBegin(GL_QUADS);
-      glTexCoord2f(1.0f, 0.0f);
-      glVertex2i(540, 30);
-      glTexCoord2f(1.0f, 1.0f);
-      glVertex2i(540 + 90, 30);
-      glTexCoord2f(0.0f, 1.0f);
-      glVertex2i(540 + 90, 30 + 90);
-      glTexCoord2f(0.0f, 0.0f);
-      glVertex2i(540, 30 + 90);
-      glEnd();
-
-      glDisable(GL_TEXTURE_2D);
-      glBegin(GL_LINE_LOOP);
-      glVertex2i(540, 30);
-      glVertex2i(540 + 90, 30);
-      glVertex2i(540 + 90, 30 + 90);
-      glVertex2i(540, 30 + 90);
-      glEnd();
-      glRasterPos2i(360, 65);
-      printstring(GLUT_BITMAP_HELVETICA_18, "Sphere Texture Map");
-   }
-
-   glDisable(GL_TEXTURE_2D);
-
-   glRasterPos2i(10, 10);
-   printstring(GLUT_BITMAP_HELVETICA_18, frbuf);
-   glRasterPos2i(360, 470);
-   printstring(GLUT_BITMAP_HELVETICA_10,
-	       "Ray V1.0 Written by David Bucciarelli (tech.hmw@plus.it)");
-
-   if (help)
-      printhelp();
-
-   glMatrixMode(GL_PROJECTION);
-   glPopMatrix();
-   glMatrixMode(GL_MODELVIEW);
-
-   updatemaps();
-
-   glutSwapBuffers();
-
-   Frames++;
-   {
-      GLint t = glutGet(GLUT_ELAPSED_TIME);
-      if (t - T0 >= 2000) {
-         GLfloat seconds = (t - T0) / 1000.0;
-         GLfloat fps = Frames / seconds;
-         sprintf(frbuf, "Frame rate: %f", fps);
-         T0 = t;
-         Frames = 0;
-      }
-   }
-}
-
-static void
-inittextures(void)
-{
-   int y;
-
-   glGenTextures(1, &checkid);
-   glBindTexture(GL_TEXTURE_2D, checkid);
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   glTexImage2D(GL_TEXTURE_2D, 0, 3, TEX_CHECK_WIDTH, TEX_CHECK_HEIGHT,
-		0, GL_RGB, GL_UNSIGNED_BYTE, checkmap);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-   for (y = 0; y < TEX_CHECK_NUMSLOT; y++)
-      updatecheckmap(y);
-
-
-
-   glGenTextures(1, &reflectid);
-   glBindTexture(GL_TEXTURE_2D, reflectid);
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   glTexImage2D(GL_TEXTURE_2D, 0, 3, TEX_REFLECT_WIDTH, TEX_REFLECT_HEIGHT,
-		0, GL_RGB, GL_UNSIGNED_BYTE, reflectmap);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-   for (y = 0; y < TEX_REFLECT_NUMSLOT; y++)
-      updatereflectmap(y);
-
-
-}
-
-static void
-initspherepos(void)
-{
-   float alpha, beta, sa, ca, sb, cb;
-   int x, y;
-
-   for (y = 0; y < TEX_REFLECT_HEIGHT; y++) {
-      beta = M_PI - y * (M_PI / TEX_REFLECT_HEIGHT);
-
-      for (x = 0; x < TEX_REFLECT_WIDTH; x++) {
-	 alpha = -x * (2.0f * M_PI / TEX_REFLECT_WIDTH);
-
-	 sa = sin(alpha);
-	 ca = cos(alpha);
-
-	 sb = sin(beta);
-	 cb = cos(beta);
-
-	 sphere_pos[y][x][0] = SPHERE_RADIUS * sa * sb;
-	 sphere_pos[y][x][1] = SPHERE_RADIUS * ca * sb;
-	 sphere_pos[y][x][2] = SPHERE_RADIUS * cb;
-      }
-   }
-}
-
-static void
-initdlists(void)
-{
-   GLUquadricObj *obj;
-
-   obj = gluNewQuadric();
-
-   lightdlist = glGenLists(1);
-   glNewList(lightdlist, GL_COMPILE);
-   gluQuadricDrawStyle(obj, GLU_FILL);
-   gluQuadricNormals(obj, GLU_NONE);
-   gluQuadricTexture(obj, GL_TRUE);
-   gluSphere(obj, 0.25f, 6, 6);
-   glEndList();
-
-   objdlist = glGenLists(1);
-   glNewList(objdlist, GL_COMPILE);
-   gluQuadricDrawStyle(obj, GLU_FILL);
-   gluQuadricNormals(obj, GLU_NONE);
-   gluQuadricTexture(obj, GL_TRUE);
-   gluSphere(obj, SPHERE_RADIUS, 16, 16);
-   glEndList();
-}
-
-int
-main(int ac, char **av)
-{
-   fprintf(stderr,
-	   "Ray V1.0\nWritten by David Bucciarelli (tech.hmw@plus.it)\n");
-
-   /*
-      if(!SetPriorityClass(GetCurrentProcess(),REALTIME_PRIORITY_CLASS)) {
-      fprintf(stderr,"Error setting the process class.\n");
-      return 0;
-      }
-
-      if(!SetThreadPriority(GetCurrentThread(),THREAD_PRIORITY_TIME_CRITICAL)) {
-      fprintf(stderr,"Error setting the process priority.\n");
-      return 0;
-      }
-    */
-
-   glutInitWindowPosition(0, 0);
-   glutInitWindowSize(WIDTH, HEIGHT);
-   glutInit(&ac, av);
-
-   glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
-
-   if (!(win = glutCreateWindow("Ray"))) {
-      fprintf(stderr, "Error, couldn't open window\n");
-      return -1;
-   }
-
-   reshape(WIDTH, HEIGHT);
-
-   glShadeModel(GL_FLAT);
-   glEnable(GL_DEPTH_TEST);
-   glDepthFunc(GL_LEQUAL);
-   glEnable(GL_CULL_FACE);
-   glEnable(GL_TEXTURE_2D);
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-   glEnable(GL_FOG);
-   glFogi(GL_FOG_MODE, GL_EXP2);
-   glFogfv(GL_FOG_COLOR, fogcolor);
-
-   glFogf(GL_FOG_DENSITY, 0.01);
-#ifdef FX
-   glHint(GL_FOG_HINT, GL_NICEST);
-#endif
-
-   calcposobs();
-
-   initspherepos();
-
-   inittextures();
-   initdlists();
-
-   glClearColor(fogcolor[0], fogcolor[1], fogcolor[2], fogcolor[3]);
-
-   glutReshapeFunc(reshape);
-   glutDisplayFunc(draw);
-   glutKeyboardFunc(key);
-   glutSpecialFunc(special);
-   glutIdleFunc(draw);
-
-   glutMainLoop();
-
-   return 0;
-}

progs/demos/readpix.c

@@ -1,288 +0,0 @@
-/* $Id: readpix.c,v 1.4 2000/10/16 21:24:39 brianp Exp $ */
-
-/*
- * glReadPixels and glCopyPixels test
- * 
- * Brian Paul   March 1, 2000  This file is in the public domain.
- */
-
-/*
- * $Log: readpix.c,v $
- * Revision 1.4  2000/10/16 21:24:39  brianp
- * use gray background, memset TempImage to white to help with debugging
- *
- * Revision 1.3  2000/03/31 01:01:31  brianp
- * tweaks to allow different read formats/types
- *
- * Revision 1.2  2000/03/23 19:47:25  brianp
- * added benchmarking
- *
- * Revision 1.1  2000/03/01 16:23:14  brianp
- * test glDraw/Read/CopyPixels()
- *
- */
-
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <GL/glut.h>
-
-#include "../util/readtex.c"  /* a hack, I know */
-
-#define IMAGE_FILE "../images/girl.rgb"
-
-static int ImgWidth, ImgHeight;
-static GLenum ImgFormat;
-static GLubyte *Image = NULL;
-
-static int APosX, APosY;  /* simple drawpixels */
-static int BPosX, BPosY;  /* read/draw pixels */
-static int CPosX, CPosY;  /* copypixels */
-
-static GLboolean DrawFront = GL_FALSE;
-static GLboolean ScaleAndBias = GL_FALSE;
-static GLboolean Benchmark = GL_FALSE;
-static GLubyte *TempImage = NULL;
-
-#if 0
-#define ReadFormat ImgFormat
-#define ReadType GL_UNSIGNED_BYTE
-#endif
-#if 1
-static GLenum ReadFormat = GL_RGBA;
-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
-static GLenum ReadFormat = GL_RGBA;
-static GLenum ReadType = GL_UNSIGNED_SHORT_1_5_5_5_REV;
-#endif
-#if 0
-static GLenum ReadFormat = GL_BGRA;
-static GLenum ReadType = GL_UNSIGNED_SHORT_5_5_5_1;
-#endif
-#if 0
-static GLenum ReadFormat = GL_BGRA;
-static GLenum ReadType = GL_UNSIGNED_SHORT_4_4_4_4_REV;
-#endif
-
-
-static void
-Reset( void )
-{
-   APosX = 5;     APosY = 20;
-   BPosX = APosX + ImgWidth + 5;   BPosY = 20;
-   CPosX = BPosX + ImgWidth + 5;   CPosY = 20;
-}
-
-
-static void
-PrintString(const char *s)
-{
-   while (*s) {
-      glutBitmapCharacter(GLUT_BITMAP_8_BY_13, (int) *s);
-      s++;
-   }
-}
-
-
-static void
-SetupPixelTransfer(GLboolean invert)
-{
-   if (invert) {
-      glPixelTransferf(GL_RED_SCALE, -1.0);
-      glPixelTransferf(GL_RED_BIAS, 1.0);
-      glPixelTransferf(GL_GREEN_SCALE, -1.0);
-      glPixelTransferf(GL_GREEN_BIAS, 1.0);
-      glPixelTransferf(GL_BLUE_SCALE, -1.0);
-      glPixelTransferf(GL_BLUE_BIAS, 1.0);
-   }
-   else {
-      glPixelTransferf(GL_RED_SCALE, 1.0);
-      glPixelTransferf(GL_RED_BIAS, 0.0);
-      glPixelTransferf(GL_GREEN_SCALE, 1.0);
-      glPixelTransferf(GL_GREEN_BIAS, 0.0);
-      glPixelTransferf(GL_BLUE_SCALE, 1.0);
-      glPixelTransferf(GL_BLUE_BIAS, 0.0);
-   }
-}
-
-
-static void
-Display( void )
-{
-   glClearColor(.3, .3, .3, 1);
-   glClear( GL_COLOR_BUFFER_BIT );
-
-   glRasterPos2i(5, ImgHeight+25);
-   PrintString("f = toggle front/back  s = toggle scale/bias  b = benchmark");
-
-   /* draw original image */
-   glRasterPos2i(APosX, 5);
-   PrintString("Original");
-   glRasterPos2i(APosX, APosY);
-   glEnable(GL_DITHER);
-   SetupPixelTransfer(GL_FALSE);
-   glDrawPixels(ImgWidth, ImgHeight, ImgFormat, GL_UNSIGNED_BYTE, Image);
-
-   /* do readpixels, drawpixels */
-   glRasterPos2i(BPosX, 5);
-   PrintString("Read/DrawPixels");
-   SetupPixelTransfer(ScaleAndBias);
-   if (Benchmark) {
-      GLint reads = 0;
-      GLint endTime;
-      GLint startTime = glutGet(GLUT_ELAPSED_TIME);
-      GLdouble seconds, pixelsPerSecond;
-      printf("Benchmarking...\n");
-      do {
-         glReadPixels(APosX, APosY, ImgWidth, ImgHeight,
-                      ReadFormat, ReadType, TempImage);
-         reads++;
-         endTime = glutGet(GLUT_ELAPSED_TIME);
-      } while (endTime - startTime < 4000);   /* 4 seconds */
-      seconds = (double) (endTime - startTime) / 1000.0;
-      pixelsPerSecond = reads * ImgWidth * ImgHeight / seconds;
-      printf("Result:  %d reads in %f seconds = %f pixels/sec\n",
-             reads, seconds, pixelsPerSecond);
-      Benchmark = GL_FALSE;
-   }
-   else {
-      /* clear the temporary image to white (helpful for debugging */
-      memset(TempImage, 255, ImgWidth * ImgHeight * 4);
-      glReadPixels(APosX, APosY, ImgWidth, ImgHeight,
-                   ReadFormat, ReadType, TempImage);
-   }
-   glRasterPos2i(BPosX, BPosY);
-   glDisable(GL_DITHER);
-   SetupPixelTransfer(GL_FALSE);
-   glDrawPixels(ImgWidth, ImgHeight, ReadFormat, ReadType, TempImage);
-
-   /* do copypixels */
-   glRasterPos2i(CPosX, 5);
-   PrintString("CopyPixels");
-   glRasterPos2i(CPosX, CPosY);
-   glDisable(GL_DITHER);
-   SetupPixelTransfer(ScaleAndBias);
-   glCopyPixels(APosX, APosY, ImgWidth, ImgHeight, GL_COLOR);
-
-   if (!DrawFront)
-      glutSwapBuffers();
-}
-
-
-static void
-Reshape( int width, int height )
-{
-   glViewport( 0, 0, width, height );
-   glMatrixMode( GL_PROJECTION );
-   glLoadIdentity();
-   glOrtho( 0.0, width, 0.0, height, -1.0, 1.0 );
-   glMatrixMode( GL_MODELVIEW );
-   glLoadIdentity();
-}
-
-
-static void
-Key( unsigned char key, int x, int y )
-{
-   (void) x;
-   (void) y;
-   switch (key) {
-      case 'b':
-         Benchmark = GL_TRUE;
-         break;
-      case 's':
-         ScaleAndBias = !ScaleAndBias;
-         break;
-      case 'f':
-         DrawFront = !DrawFront;
-         if (DrawFront) {
-            glDrawBuffer(GL_FRONT);
-            glReadBuffer(GL_FRONT);
-         }
-         else {
-            glDrawBuffer(GL_BACK);
-            glReadBuffer(GL_BACK);
-         }
-         printf("glDrawBuffer(%s)\n", DrawFront ? "GL_FRONT" : "GL_BACK");
-         break;
-      case 27:
-         exit(0);
-         break;
-   }
-   glutPostRedisplay();
-}
-
-
-static void
-Init( GLboolean ciMode )
-{
-   printf("GL_VERSION = %s\n", (char *) glGetString(GL_VERSION));
-   printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
-
-   Image = LoadRGBImage( IMAGE_FILE, &ImgWidth, &ImgHeight, &ImgFormat );
-   if (!Image) {
-      printf("Couldn't read %s\n", IMAGE_FILE);
-      exit(0);
-   }
-
-   if (ciMode) {
-      /* Convert RGB image to grayscale */
-      GLubyte *indexImage = malloc( ImgWidth * ImgHeight );
-      GLint i;
-      for (i=0; i<ImgWidth*ImgHeight; i++) {
-         int gray = Image[i*3] + Image[i*3+1] + Image[i*3+2];
-         indexImage[i] = gray / 3;
-      }
-      free(Image);
-      Image = indexImage;
-      ImgFormat = GL_COLOR_INDEX;
-
-      for (i=0;i<255;i++) {
-         float g = i / 255.0;
-         glutSetColor(i, g, g, g);
-      }
-   }
-
-   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));
-   assert(TempImage);
-}
-
-
-int
-main( int argc, char *argv[] )
-{
-   GLboolean ciMode = GL_FALSE;
-   if (argc > 1 && strcmp(argv[1], "-ci")==0) {
-      ciMode = GL_TRUE;
-   }
-   glutInit( &argc, argv );
-   glutInitWindowPosition( 0, 0 );
-   glutInitWindowSize( 750, 250 );
-   if (ciMode)
-      glutInitDisplayMode( GLUT_INDEX | GLUT_DOUBLE );
-   else
-      glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
-   glutCreateWindow(argv[0]);
-   Init(ciMode);
-   glutReshapeFunc( Reshape );
-   glutKeyboardFunc( Key );
-   glutDisplayFunc( Display );
-   glutMainLoop();
-   return 0;
-}

progs/demos/reflect.c

@@ -1,4 +1,4 @@
-/* $Id: reflect.c,v 1.7 2001/04/25 15:51:32 brianp Exp $ */
+/* $Id: reflect.c,v 1.1 1999/08/19 00:55:40 jtg Exp $ */
 
 /*
  * Demo of a reflective, texture-mapped surface with OpenGL.
@@ -20,44 +20,70 @@
  */
  
 /*
- * Authors:
- *   Brian Paul
- *   Dirk Reiners (reiners@igd.fhg.de) made some modifications to this code.
- *   Mark Kilgard (April 1997)
- *   Brian Paul (April 2000 - added keyboard d/s options)
+ * Dirk Reiners (reiners@igd.fhg.de) made some modifications to this code.
+ *
+ * August 1996 - A few optimizations by Brian
  */
 
+/*
+ * April, 1997 - Added Mark Kilgard's changes.
+ */
+
+/*
+ * $Log: reflect.c,v $
+ * Revision 1.1  1999/08/19 00:55:40  jtg
+ * Initial revision
+ *
+ * Revision 3.4  1999/03/28 18:22:05  brianp
+ * minor clean-up
+ *
+ * Revision 3.3  1998/11/22 02:54:29  brianp
+ * only draw one stack for gluCylinders
+ *
+ * Revision 3.2  1998/11/19 02:53:48  brianp
+ * changed texture image and background color
+ *
+ * Revision 3.1  1998/11/05 04:34:04  brianp
+ * moved image files to ../images/ directory
+ *
+ * Revision 3.0  1998/02/14 18:42:29  brianp
+ * initial rev
+ *
+ */
+
+
+#define USE_ZBUFFER
+
+
+/* OK, without hardware support this is overkill. */
+#define USE_TEXTURE
 
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "GL/glut.h"
-#include "../util/showbuffer.c"
-#include "../util/readtex.c"
+
+#include "../util/readtex.c"  /* a hack, I know */
 
 
 #define DEG2RAD (3.14159/180.0)
 
+
 #define TABLE_TEXTURE "../images/tile.rgb"
 
-static GLint ImgWidth, ImgHeight;
+static int ImgWidth, ImgHeight;
 static GLenum ImgFormat;
 static GLubyte *Image = NULL;
 
 #define MAX_OBJECTS 2
+
 static GLint table_list;
 static GLint objects_list[MAX_OBJECTS];
 
+
 static GLfloat xrot, yrot;
 static GLfloat spin;
 
-static GLint Width = 400, Height = 300;
-static GLenum ShowBuffer = GL_NONE;
-static GLboolean Anim = GL_TRUE;
-
-/* performance info */
-static GLint T0 = 0;
-static GLint Frames = 0;
 
 
 static void make_table( void )
@@ -120,11 +146,16 @@ static void make_objects( void )
 }
 
 
+static GLfloat light_pos[] = { 0.0, 20.0, 0.0, 1.0 };
+
 static void init( void )
 {
    make_table();
    make_objects();
 
+   /* Setup texture */
+#ifdef USE_TEXTURE
+
    Image = LoadRGBImage( TABLE_TEXTURE, &ImgWidth, &ImgHeight, &ImgFormat );
    if (!Image) {
       printf("Couldn't read %s\n", TABLE_TEXTURE);
@@ -138,17 +169,23 @@ static void init( void )
    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
+#endif
+
 
    xrot = 30.0;
    yrot = 50.0;
    spin = 0.0;
 
+#ifndef USE_ZBUFFER
+   glEnable( GL_CULL_FACE );
+#endif
+
    glShadeModel( GL_FLAT );
    
    glEnable( GL_LIGHT0 );
    glEnable( GL_LIGHTING );
 
-   glClearColor( 0.5, 0.5, 0.9, 0.0 );
+   glClearColor( 0.5, 0.5, 0.9, 1.0 );
 
    glEnable( GL_NORMALIZE );
 }
@@ -157,14 +194,12 @@ static void init( void )
 
 static void reshape(int w, int h)
 {
-   GLfloat yAspect = 2.5;
-   GLfloat xAspect = yAspect * (float) w / (float) h;
-   Width = w;
-   Height = h;
+   GLfloat aspect = (float) w / (float) h;
+
    glViewport(0, 0, w, h);
    glMatrixMode(GL_PROJECTION);
    glLoadIdentity();
-   glFrustum( -xAspect, xAspect, -yAspect, yAspect, 10.0, 30.0 );
+   glFrustum( -aspect, aspect, -1.0, 1.0, 4.0, 300.0 );
    glMatrixMode(GL_MODELVIEW);
    glLoadIdentity();
 }
@@ -177,7 +212,8 @@ static void draw_objects( GLfloat eyex, GLfloat eyey, GLfloat eyez )
    (void) eyey;
    (void) eyez;
 #ifndef USE_ZBUFFER
-   if (eyex<0.5) {
+	if (eyex<0.5)
+	{
 #endif
 	   glPushMatrix();
 	   glTranslatef( 1.0, 1.5, 0.0 );
@@ -194,8 +230,9 @@ static void draw_objects( GLfloat eyex, GLfloat eyey, GLfloat eyez )
 	   glCallList( objects_list[1] );
 	   glPopMatrix();
 #ifndef USE_ZBUFFER
-   }
-   else {	
+	}
+	else
+	{	
 	   glPushMatrix();
 	   glTranslatef( -1.0, 0.85+3.0*fabs( cos(0.01*spin) ), 0.0 );
 	   glRotatef( 0.5*spin, 0.0, 0.5, 1.0 );
@@ -210,7 +247,7 @@ static void draw_objects( GLfloat eyex, GLfloat eyey, GLfloat eyez )
 	   glRotatef( 0.5*spin, 0.0, 0.5, 1.0 );
 	   glCallList( objects_list[0] );
 	   glPopMatrix();
-   }
+	}
 #endif
 }
 
@@ -225,7 +262,6 @@ static void draw_table( void )
 
 static void draw_scene( void )
 {
-   static GLfloat light_pos[] = { 0.0, 20.0, 0.0, 1.0 };
    GLfloat dist = 20.0;
    GLfloat eyex, eyey, eyez;
 
@@ -243,15 +279,20 @@ static void draw_scene( void )
    glLightfv( GL_LIGHT0, GL_POSITION, light_pos );
  
    /* draw table into stencil planes */
-   glDisable( GL_DEPTH_TEST );
    glEnable( GL_STENCIL_TEST );
+#ifdef USE_ZBUFFER
+   glDisable( GL_DEPTH_TEST );
+#endif
    glStencilFunc( GL_ALWAYS, 1, 0xffffffff );
    glStencilOp( GL_REPLACE, GL_REPLACE, GL_REPLACE );
    glColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
    draw_table();
    glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
 
+#ifdef USE_ZBUFFER
    glEnable( GL_DEPTH_TEST );
+#endif
+
 
    /* render view from below (reflected viewport) */
    /* only draw where stencil==1 */
@@ -277,7 +318,9 @@ static void draw_scene( void )
    glEnable( GL_BLEND );
    glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
 
+#ifdef USE_TEXTURE
    glEnable( GL_TEXTURE_2D );
+#endif
    draw_table();
    glDisable( GL_TEXTURE_2D );
    glDisable( GL_BLEND );
@@ -291,67 +334,43 @@ static void draw_scene( void )
 
    glPopMatrix();
 
-   if (ShowBuffer == GL_DEPTH) {
-      ShowDepthBuffer(Width, Height, 1.0, 0.0);
-   }
-   else if (ShowBuffer == GL_STENCIL) {
-      ShowStencilBuffer(Width, Height, 255.0, 0.0);
-   }
-   else if (ShowBuffer == GL_ALPHA) {
-      ShowAlphaBuffer(Width, Height);
-   }
+   glutSwapBuffers();
+}
+
+
+
+#if 0
+void draw_scene(void)
+{
+   GLfloat dist = 20.0;
+   GLfloat eyex, eyey, eyez;
+
+   glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+
+
+   eyex = dist * cos(yrot*DEG2RAD) * cos(xrot*DEG2RAD);
+   eyez = dist * sin(yrot*DEG2RAD) * cos(xrot*DEG2RAD);
+   eyey = dist * sin(xrot*DEG2RAD);
+
+   /* view from top */
+   glPushMatrix();
+   gluLookAt( eyex, eyey, eyez, 0.0, 0.0, 0.0,  0.0, 1.0, 0.0 );
+
+   draw_table();
+
+   glPopMatrix();
 
    glutSwapBuffers();
-
-   {
-      GLint t = glutGet(GLUT_ELAPSED_TIME);
-      Frames++;
-      if (t - T0 >= 5000) {
-         GLfloat seconds = (t - T0) / 1000.0;
-         GLfloat fps = Frames / seconds;
-         printf("%d frames in %g seconds = %g FPS\n", Frames, seconds, fps);
-         T0 = t;
-         Frames = 0;
-      }
-   }
-}
-
-
-static void idle( void )
-{
-   spin += 2.0;
-   yrot += 3.0;
-   glutPostRedisplay();
 }
+#endif
 
 
 static void Key( unsigned char key, int x, int y )
 {
    (void) x;
    (void) y;
-   if (key == 'd') {
-      ShowBuffer = GL_DEPTH;
-   }
-   else if (key == 's') {
-      ShowBuffer = GL_STENCIL;
-   }
-   else if (key == 'a') {
-      ShowBuffer = GL_ALPHA;
-   }
-   else if (key == ' ') {
-      Anim = !Anim;
-      if (Anim)
-         glutIdleFunc(idle);
-      else
-         glutIdleFunc(NULL);
-   }
-   else if (key==27) {
+   if (key==27)
       exit(0);
-   }
-   else {
-      ShowBuffer = GL_NONE;
-   }
-   glutPostRedisplay();
 }
 
 
@@ -362,13 +381,15 @@ static void SpecialKey( int key, int x, int y )
    switch (key) {
       case GLUT_KEY_UP:
          xrot += 3.0;
-         if ( xrot > 85 )
-            xrot = 85;
+#ifndef USE_ZBUFFER
+		 if ( xrot > 180 )	xrot = 180;
+#endif
          break;
       case GLUT_KEY_DOWN:
          xrot -= 3.0;
-         if ( xrot < 5 )
-            xrot = 5;
+#ifndef USE_ZBUFFER
+		 if ( xrot < 0 )	xrot = 0;
+#endif
          break;
       case GLUT_KEY_LEFT:
          yrot += 3.0;
@@ -381,19 +402,34 @@ static void SpecialKey( int key, int x, int y )
 }
 
 
+
+static void idle( void )
+{
+   spin += 2.0;
+   yrot += 3.0;
+   glutPostRedisplay();
+}
+
+
+
 int main( int argc, char *argv[] )
 {
-   glutInit(&argc, argv);
-   glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL);
+   glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB 
+#ifdef USE_ZBUFFER
+		| GLUT_DEPTH 
+#endif
+		| GLUT_STENCIL);
    glutInitWindowPosition( 0, 0 );
-   glutInitWindowSize( Width, Height );
+   glutInitWindowSize(400, 300 );
    glutCreateWindow(argv[0]);
    glutReshapeFunc(reshape);
    glutDisplayFunc(draw_scene);
    glutKeyboardFunc(Key);
    glutSpecialFunc(SpecialKey);
    glutIdleFunc(idle);
+
    init();
+
    glutMainLoop();
    return 0;
 }

progs/demos/shadowtex.c

@@ -1,528 +0,0 @@
-/* $Id: shadowtex.c,v 1.4 2001/02/28 18:41:50 brianp Exp $ */
-
-/*
- * Shadow demo using the GL_SGIX_depth_texture, GL_SGIX_shadow and
- * GL_SGIX_shadow_ambient extensions.
- *
- * Brian Paul
- * 19 Feb 2001
- *
- * 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.
- */
-
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <GL/glut.h>
-#include "../util/showbuffer.c"
-
-
-#define DEG_TO_RAD (3.14159 / 180.0)
-
-static GLint WindowWidth = 450, WindowHeight = 300;
-static GLfloat Xrot = 15, Yrot = 0, Zrot = 0;
-
-static GLfloat Red[4] = {1, 0, 0, 1};
-static GLfloat Green[4] = {0, 1, 0, 1};
-static GLfloat Blue[4] = {0, 0, 1, 1};
-static GLfloat Yellow[4] = {1, 1, 0, 1};
-
-static GLfloat LightDist = 10;
-static GLfloat LightLatitude = 45.0;
-static GLfloat LightLongitude = 45.0;
-static GLfloat LightPos[4];
-static GLfloat SpotDir[3];
-static GLfloat SpotAngle = 40.0 * DEG_TO_RAD;
-static GLfloat ShadowNear = 4.0, ShadowFar = 24.0;
-static GLint ShadowTexWidth = 256, ShadowTexHeight = 256;
-
-static GLboolean LinearFilter = GL_FALSE;
-
-static GLfloat Bias = -0.06;
-
-static GLboolean Anim = GL_TRUE;
-
-static GLuint DisplayMode;
-#define SHOW_NORMAL         0
-#define SHOW_DEPTH_IMAGE    1
-#define SHOW_DEPTH_MAPPING  2
-#define SHOW_DISTANCE       3
-
-
-
-static void
-DrawScene(void)
-{
-   GLfloat k = 6;
-   /* sphere */
-   glPushMatrix();
-   glTranslatef(1.6, 2.2, 2.7);
-   glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, Green);
-   glColor4fv(Green);
-   glutSolidSphere(1.5, 15, 15);
-   glPopMatrix();
-   /* dodecahedron */
-   glPushMatrix();
-   glTranslatef(-2.0, 1.2, 2.1);
-   glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, Red);
-   glColor4fv(Red);
-   glutSolidDodecahedron();
-   glPopMatrix();
-   /* icosahedron */
-   glPushMatrix();
-   glTranslatef(-0.6, 1.3, -0.5);
-   glScalef(1.5, 1.5, 1.5);
-   glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, Yellow);
-   glColor4fv(Red);
-   glutSolidIcosahedron();
-   glPopMatrix();
-   /* a plane */
-   glPushMatrix();
-   glTranslatef(0, -1.1, 0);
-   glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, Blue);
-   glColor4fv(Blue);
-   glNormal3f(0, 1, 0);
-   glBegin(GL_POLYGON);
-   glVertex3f(-k, 0, -k);
-   glVertex3f( k, 0, -k);
-   glVertex3f( k, 0,  k);
-   glVertex3f(-k, 0,  k);
-   glEnd();
-   glPopMatrix();
-}
-
-
-/*
- * Load the GL_TEXTURE matrix with the projection from the light
- * source's point of view.
- */
-static void
-MakeShadowMatrix(const GLfloat lightPos[4], const GLfloat spotDir[3],
-                 GLfloat spotAngle, GLfloat shadowNear, GLfloat shadowFar)
-{
-   GLfloat d;
-   
-   glMatrixMode(GL_TEXTURE);
-   glLoadIdentity();
-   glTranslatef(0.5, 0.5, 0.5 + Bias);
-   glScalef(0.5, 0.5, 0.5);
-   d = shadowNear * tan(spotAngle);
-   glFrustum(-d, d, -d, d, shadowNear, shadowFar);
-   gluLookAt(lightPos[0], lightPos[1], lightPos[2],
-             lightPos[0] + spotDir[0],
-             lightPos[1] + spotDir[1],
-             lightPos[2] + spotDir[2],
-             0, 1, 0);
-   glMatrixMode(GL_MODELVIEW);
-}
-
-
-static void
-EnableIdentityTexgen(void)
-{
-   /* texgen so that texcoord = vertex coord */
-   static GLfloat sPlane[4] = { 1, 0, 0, 0 };
-   static GLfloat tPlane[4] = { 0, 1, 0, 0 };
-   static GLfloat rPlane[4] = { 0, 0, 1, 0 };
-   static GLfloat qPlane[4] = { 0, 0, 0, 1 };
-
-   glTexGenfv(GL_S, GL_EYE_PLANE, sPlane);
-   glTexGenfv(GL_T, GL_EYE_PLANE, tPlane);
-   glTexGenfv(GL_R, GL_EYE_PLANE, rPlane);
-   glTexGenfv(GL_Q, GL_EYE_PLANE, qPlane);
-   glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
-   glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
-   glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
-   glTexGeni(GL_Q, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
-
-   glEnable(GL_TEXTURE_GEN_S);
-   glEnable(GL_TEXTURE_GEN_T);
-   glEnable(GL_TEXTURE_GEN_R);
-   glEnable(GL_TEXTURE_GEN_Q);
-}
-
-
-/*
- * Setup 1-D texgen so that the distance from the light source, between
- * the near and far planes maps to s=0 and s=1.  When we draw the scene,
- * the grayness will indicate the fragment's distance from the light
- * source.
- */
-static void
-EnableDistanceTexgen(const GLfloat lightPos[4], const GLfloat lightDir[3],
-                     GLfloat lightNear, GLfloat lightFar)
-{
-   GLfloat m, d;
-   GLfloat sPlane[4];
-   GLfloat nearPoint[3];
-
-   m = sqrt(lightDir[0] * lightDir[0] +
-            lightDir[1] * lightDir[1] +
-            lightDir[2] * lightDir[2]);
-
-   d = lightFar - lightNear;
-
-   /* nearPoint = point on light direction vector which intersects the
-    * near plane of the light frustum.
-    */
-   nearPoint[0] = LightPos[0] + lightDir[0] / m * lightNear;
-   nearPoint[1] = LightPos[1] + lightDir[1] / m * lightNear;
-   nearPoint[2] = LightPos[2] + lightDir[2] / m * lightNear;
-
-   sPlane[0] = lightDir[0] / d / m;
-   sPlane[1] = lightDir[1] / d / m;
-   sPlane[2] = lightDir[2] / d / m;
-   sPlane[3] = -(sPlane[0] * nearPoint[0]
-               + sPlane[1] * nearPoint[1]
-               + sPlane[2] * nearPoint[2]);
-
-   glTexGenfv(GL_S, GL_EYE_PLANE, sPlane);
-   glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
-   glEnable(GL_TEXTURE_GEN_S);
-}
-
-
-static void
-DisableTexgen(void)
-{
-   glDisable(GL_TEXTURE_GEN_S);
-   glDisable(GL_TEXTURE_GEN_T);
-   glDisable(GL_TEXTURE_GEN_R);
-   glDisable(GL_TEXTURE_GEN_Q);
-}
-
-
-static void
-ComputeLightPos(GLfloat dist, GLfloat latitude, GLfloat longitude,
-                GLfloat pos[4], GLfloat dir[3])
-{
-
-   pos[0] = dist * sin(longitude * DEG_TO_RAD);
-   pos[1] = dist * sin(latitude * DEG_TO_RAD);
-   pos[2] = dist * cos(latitude * DEG_TO_RAD) * cos(longitude * DEG_TO_RAD);
-   pos[3] = 1;
-   dir[0] = -pos[0];
-   dir[1] = -pos[1];
-   dir[2] = -pos[2];
-}
-
-
-static void
-Display(void)
-{
-   GLfloat ar = (GLfloat) WindowWidth / (GLfloat) WindowHeight;
-   GLfloat d;
-
-   ComputeLightPos(LightDist, LightLatitude, LightLongitude,
-                   LightPos, SpotDir);
-   /*
-    * Step 1: render scene from point of view of the light source
-    */
-   /* compute frustum to enclose spot light cone */
-   d = ShadowNear * tan(SpotAngle);
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   glFrustum(-d, d, -d, d, ShadowNear, ShadowFar);
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-   gluLookAt(LightPos[0], LightPos[1], LightPos[2], /* from */
-             0, 0, 0, /* target */
-             0, 1, 0); /* up */
-
-   glViewport(0, 0, ShadowTexWidth, ShadowTexHeight);
-   glClear(GL_DEPTH_BUFFER_BIT);
-   DrawScene();
-
-   /*
-    * Step 2: copy depth buffer into texture map
-    */
-   if (DisplayMode == SHOW_DEPTH_MAPPING) {
-      /* load depth image as gray-scale luminance texture */
-      GLfloat *depth = malloc(ShadowTexWidth * ShadowTexHeight
-                              * sizeof(GLfloat));
-      if (depth) {
-         glReadPixels(0, 0, ShadowTexWidth, ShadowTexHeight,
-                      GL_DEPTH_COMPONENT, GL_FLOAT, depth);
-         glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE,
-                      ShadowTexWidth, ShadowTexHeight, 0,
-                      GL_LUMINANCE, GL_FLOAT, depth);
-         free(depth);
-      }
-   }
-   else {
-      /* The normal shadow case */
-      glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT,
-                       0, 0, ShadowTexWidth, ShadowTexHeight, 0);
-   }
-
-   /*
-    * Step 3: render scene from point of view of the camera
-    */
-   glViewport(0, 0, WindowWidth, WindowHeight);
-   if (DisplayMode == SHOW_DEPTH_IMAGE) {
-      ShowDepthBuffer(WindowWidth, WindowHeight, 0, 1);
-   }
-   else {
-      glMatrixMode(GL_PROJECTION);
-      glLoadIdentity();
-      glFrustum(-ar, ar, -1.0, 1.0, 4.0, 50.0);
-      glMatrixMode(GL_MODELVIEW);
-      glLoadIdentity();
-      glTranslatef(0.0, 0.0, -22.0);
-      glRotatef(Xrot, 1, 0, 0);
-      glRotatef(Yrot, 0, 1, 0);
-      glRotatef(Zrot, 0, 0, 1);
-      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-      glLightfv(GL_LIGHT0, GL_POSITION, LightPos);
-      if (LinearFilter) {
-         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-      }
-      else {
-         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-      }
-      if (DisplayMode == SHOW_DEPTH_MAPPING) {
-         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_SGIX, GL_FALSE);
-         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-         glEnable(GL_TEXTURE_2D);
-         MakeShadowMatrix(LightPos, SpotDir, SpotAngle, ShadowNear, ShadowFar);
-         EnableIdentityTexgen();
-      }
-      else if (DisplayMode == SHOW_DISTANCE) {
-         glMatrixMode(GL_TEXTURE);
-         glLoadIdentity();
-         glMatrixMode(GL_MODELVIEW);
-         EnableDistanceTexgen(LightPos, SpotDir, ShadowNear+Bias, ShadowFar);
-         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-         glEnable(GL_TEXTURE_1D);
-      }
-      else {
-         assert(DisplayMode == SHOW_NORMAL);
-         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_SGIX, GL_TRUE);
-         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-         glEnable(GL_TEXTURE_2D);
-         MakeShadowMatrix(LightPos, SpotDir, SpotAngle, ShadowNear, ShadowFar);
-         EnableIdentityTexgen();
-      }
-      DrawScene();
-      DisableTexgen();
-      glDisable(GL_TEXTURE_1D);
-      glDisable(GL_TEXTURE_2D);
-   }
-
-   glutSwapBuffers();
-}
-
-
-static void
-Reshape(int width, int height)
-{
-   WindowWidth = width;
-   WindowHeight = height;
-   if (width >= 512 && height >= 512) {
-      ShadowTexWidth = ShadowTexHeight = 512;
-   }
-   else if (width >= 256 && height >= 256) {
-      ShadowTexWidth = ShadowTexHeight = 256;
-   }
-   else {
-      ShadowTexWidth = ShadowTexHeight = 128;
-   }
-   printf("Using %d x %d depth texture\n", ShadowTexWidth, ShadowTexHeight);
-}
-
-
-static void
-Idle(void)
-{
-   Yrot += 5.0;
-   /*LightLongitude -= 5.0;*/
-   glutPostRedisplay();
-}
-
-
-static void
-Key(unsigned char key, int x, int y)
-{
-   const GLfloat step = 3.0;
-   (void) x;
-   (void) y;
-   switch (key) {
-      case 'a':
-         Anim = !Anim;
-         if (Anim)
-            glutIdleFunc(Idle);
-         else
-            glutIdleFunc(NULL);
-         break;
-      case 'b':
-         Bias -= 0.01;
-         printf("Bias %g\n", Bias);
-         break;
-      case 'B':
-         Bias += 0.01;
-         printf("Bias %g\n", Bias);
-         break;
-      case 'd':
-         DisplayMode = SHOW_DISTANCE;
-         break;
-      case 'f':
-         LinearFilter = !LinearFilter;
-         printf("%s filtering\n", LinearFilter ? "Bilinear" : "Nearest");
-         break;
-      case 'i':
-         DisplayMode = SHOW_DEPTH_IMAGE;
-         break;
-      case 'm':
-         DisplayMode = SHOW_DEPTH_MAPPING;
-         break;
-      case 'n':
-      case ' ':
-         DisplayMode = SHOW_NORMAL;
-         break;
-      case 'z':
-         Zrot -= step;
-         break;
-      case 'Z':
-         Zrot += step;
-         break;
-      case 27:
-         exit(0);
-         break;
-   }
-   glutPostRedisplay();
-}
-
-
-static void
-SpecialKey(int key, int x, int y)
-{
-   const GLfloat step = 3.0;
-   const int mod = glutGetModifiers();
-   (void) x;
-   (void) y;
-   switch (key) {
-      case GLUT_KEY_UP:
-         if (mod)
-            LightLatitude += step;
-         else
-            Xrot += step;
-         break;
-      case GLUT_KEY_DOWN:
-         if (mod)
-            LightLatitude -= step;
-         else
-            Xrot -= step;
-         break;
-      case GLUT_KEY_LEFT:
-         if (mod)
-            LightLongitude += step;
-         else
-            Yrot += step;
-         break;
-      case GLUT_KEY_RIGHT:
-         if (mod)
-            LightLongitude -= step;
-         else
-            Yrot -= step;
-         break;
-   }
-   glutPostRedisplay();
-}
-
-
-static void
-Init(void)
-{
-   if (!glutExtensionSupported("GL_SGIX_depth_texture") ||
-       !glutExtensionSupported("GL_SGIX_shadow")) {
-      printf("Sorry, this demo requires the GL_SGIX_depth_texture and GL_SGIX_shadow extensions\n");
-      exit(1);
-   }
-
-   glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-   glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-   glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-   glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_T, GL_CLAMP);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
-#ifdef GL_SGIX_shadow
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_OPERATOR_SGIX,
-                   GL_TEXTURE_LEQUAL_R_SGIX);
-#endif
-#ifdef GL_SGIX_shadow_ambient
-   if (glutExtensionSupported("GL_SGIX_shadow_ambient"))
-      glTexParameterf(GL_TEXTURE_2D, GL_SHADOW_AMBIENT_SGIX, 0.3);
-#endif
-
-   /* setup 1-D grayscale texture image for SHOW_DISTANCE mode */
-   {
-      GLuint i;
-      GLubyte image[256];
-      for (i = 0; i < 256; i++)
-         image[i] = i;
-      glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE,
-                   256, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, image);
-   }
-
-   glEnable(GL_DEPTH_TEST);
-   glEnable(GL_LIGHTING);
-   glEnable(GL_LIGHT0);
-}
-
-
-static void
-PrintHelp(void)
-{
-   printf("Keys:\n");
-   printf("  a = toggle animation\n");
-   printf("  i = show depth texture image\n");
-   printf("  m = show depth texture mapping\n");
-   printf("  d = show fragment distance from light source\n");
-   printf("  n = show normal, shadowed image\n");
-   printf("  f = toggle nearest/bilinear texture filtering\n");
-   printf("  b/B = decrease/increase shadow map Z bias\n");
-   printf("  cursor keys = rotate scene\n");
-   printf("  <shift> + cursor keys = rotate light source\n");
-}
-
-
-int
-main(int argc, char *argv[])
-{
-   glutInit(&argc, argv);
-   glutInitWindowPosition(0, 0);
-   glutInitWindowSize(WindowWidth, WindowHeight);
-   glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
-   glutCreateWindow(argv[0]);
-   glutReshapeFunc(Reshape);
-   glutKeyboardFunc(Key);
-   glutSpecialFunc(SpecialKey);
-   glutDisplayFunc(Display);
-   if (Anim)
-      glutIdleFunc(Idle);
-   Init();
-   PrintHelp();
-   glutMainLoop();
-   return 0;
-}

progs/demos/stex3d.c

@@ -1,4 +1,4 @@
-/* $Id: stex3d.c,v 1.5 2000/06/27 17:04:43 brianp Exp $ */
+/* $Id: stex3d.c,v 1.2.2.1 1999/12/16 08:53:51 brianp Exp $ */
 
 /*----------------------------- 
  * stex3d.c GL example of the mesa 3d-texture extention to simulate procedural
@@ -17,13 +17,7 @@
 
 /*
  * $Log: stex3d.c,v $
- * Revision 1.5  2000/06/27 17:04:43  brianp
- * fixed compiler warnings
- *
- * Revision 1.4  2000/03/22 19:48:57  brianp
- * converted from GL_EXT_texture3D to GL 1.2
- *
- * Revision 1.3  1999/12/16 08:54:22  brianp
+ * Revision 1.2.2.1  1999/12/16 08:53:51  brianp
  * added a cast to malloc call
  *
  * Revision 1.2  1999/09/17 12:27:01  brianp
@@ -62,6 +56,7 @@ void init(void),
      initNoise(void);
 float turbulence(float point[3], float lofreq, float hifreq);
 
+int isExtSupported(char *ext);
 void KeyHandler( unsigned char key, int x, int y );
 GLenum parseCmdLine(int argc, char **argv);
 float noise3(float vec[3]);
@@ -129,20 +124,17 @@ void init()
  /* start the noise function variables */
  initNoise();
  
- /* see if we have OpenGL 1.2 or later, for 3D texturing */
- {
-    const char *version = (const char *) glGetString(GL_VERSION);
-    if (strncmp(version, "1.0", 3) == 0 ||
-        strncmp(version, "1.1", 3) == 0) {
-       printf("Sorry, OpenGL 1.2 or later is required\n");
-       exit(1);
-    }
+ /* see if the texture 3d extention is supported */
+ if (!isExtSupported("GL_EXT_texture3D")) {
+   printf("Sorry this GL implementation (%s) does not support 3d texture extentions\n",
+        (char *)(glGetString(GL_RENDERER)));
+/*   tkQuit();*/
  }
  
  /* if texture is supported then generate the texture */
  create3Dtexture(); 
 
- glEnable(GL_TEXTURE_3D); 
+ glEnable(GL_TEXTURE_3D_EXT); 
  /*
  glBlendFunc(GL_SRC_COLOR, GL_SRC_ALPHA);
  glEnable(GL_BLEND); 
@@ -241,7 +233,7 @@ void create3Dtexture()
  int tmp;
 
  printf("creating 3d textures...\n");
- voxels = (unsigned char  *) malloc((size_t)(4*tex_width*tex_height*tex_depth));
+ voxels = (unsigned char  *) malloc((size_t) (4*tex_width*tex_height*tex_depth));
  vp=voxels;
  for (i=0;i<tex_width;i++){
     vec[0]=i;
@@ -260,20 +252,39 @@ void create3Dtexture()
 
  printf("setting up 3d texture...\n");
  glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S,     GL_REPEAT);
- glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T,     GL_REPEAT);
- glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R,     GL_REPEAT);
+ glTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_WRAP_S,     GL_REPEAT);
+ glTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_WRAP_T,     GL_REPEAT);
+ glTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_WRAP_R_EXT, GL_REPEAT);
  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
 
- glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA,
-              tex_width, tex_height, tex_depth,
-              0, GL_RGBA, GL_UNSIGNED_BYTE, voxels);
+ glTexImage3DEXT(GL_TEXTURE_3D_EXT, 0, GL_RGBA,
+                    tex_width, tex_height, tex_depth,
+                    0, GL_RGBA, GL_UNSIGNED_BYTE, voxels);
  
  printf("finished setting up 3d texture image...\n");
 }
 
+int isExtSupported(char *ext)
+{
+    /* routine to find whether a specified OpenGL extension is supported */
+
+    char *c;
+    int len;
+    char *allext = (char *)(glGetString(GL_EXTENSIONS));
+
+    len = strlen(ext);
+    if (len <= 0) return 0;
+
+    c = allext;
+    while (c) {
+        if (!strncmp(c,ext,len)) return 1;
+        c = strchr(c+1,'G');
+    }
+    return 0;
+}
+
 void printHelp()
 {
   printf("\nUsage: stex3d  <cmd line options>\n"); 
@@ -388,7 +399,7 @@ void resize(int w, int h)
  glTranslatef(0,0,-5);
 }
 
-static void cleanEverything(void)
+void cleanEverything(void)
 {
 /*  free(voxels); */
 }
@@ -424,10 +435,10 @@ void KeyHandler( unsigned char key, int x, int y )
          angz-=10; 
          break;
       case 't':
-         glEnable(GL_TEXTURE_3D); 
+         glEnable(GL_TEXTURE_3D_EXT); 
          break;
       case 'T':
-         glDisable(GL_TEXTURE_3D);
+         glDisable(GL_TEXTURE_3D_EXT);
          break;
       case 's':
          glShadeModel(GL_SMOOTH);

progs/demos/teapot.c

@@ -1,674 +0,0 @@
-/*
- * This program is under the GNU GPL.
- * Use at your own risk.
- *
- * written by David Bucciarelli (tech.hmw@plus.it)
- *            Humanware s.r.l.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <time.h>
-
-#ifdef WIN32
-#include <windows.h>
-#endif
-
-#include <GL/glut.h>
-#include "readtex.c"
-
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen=1;
-#endif
-
-static int WIDTH=640;
-static int HEIGHT=480;
-
-static GLint T0 = 0;
-static GLint Frames = 0;
-
-#define BASESIZE 10.0
-
-#define BASERES 12
-#define TEAPOTRES 3
-
-#ifndef M_PI
-#define M_PI 3.1415926535
-#endif
-
-extern void shadowmatrix(GLfloat [4][4], GLfloat [4], GLfloat [4]);
-extern void findplane(GLfloat [4], GLfloat [3], GLfloat [3], GLfloat [3]);
-
-
-static int win=0;
-
-static float obs[3]={5.0,0.0,1.0};
-static float dir[3];
-static float v=0.0;
-static float alpha=-90.0;
-static float beta=90.0;
-
-static GLfloat baseshadow[4][4];
-static GLfloat lightpos[4]={2.3,0.0,3.0,1.0};
-static GLfloat lightdir[3]={-2.3,0.0,-3.0};
-static GLfloat lightalpha=0.0;
-
-static int fog=1;
-static int bfcull=1;
-static int usetex=1;
-static int help=1;
-static int joyavailable=0;
-static int joyactive=0;
-
-static GLuint t1id,t2id;
-static GLuint teapotdlist,basedlist,lightdlist;
-
-
-
-/******************** begin shadow code ********************/
-
-/* Taken from the projshadow.c - by Tom McReynolds, SGI */
-
-/* Modified by David Bucciarelli */
-
-enum {
-  X, Y, Z, W
-};
-enum {
-  A, B, C, D
-};
-
-/* create a matrix that will project the desired shadow */
-void
-shadowmatrix(GLfloat shadowMat[4][4],
-  GLfloat groundplane[4],
-  GLfloat lightpos[4])
-{
-  GLfloat dot;
-
-  /* find dot product between light position vector and ground plane normal */
-  dot = groundplane[X] * lightpos[X] +
-    groundplane[Y] * lightpos[Y] +
-    groundplane[Z] * lightpos[Z] +
-    groundplane[W] * lightpos[W];
-
-  shadowMat[0][0] = dot - lightpos[X] * groundplane[X];
-  shadowMat[1][0] = 0.f - lightpos[X] * groundplane[Y];
-  shadowMat[2][0] = 0.f - lightpos[X] * groundplane[Z];
-  shadowMat[3][0] = 0.f - lightpos[X] * groundplane[W];
-
-  shadowMat[X][1] = 0.f - lightpos[Y] * groundplane[X];
-  shadowMat[1][1] = dot - lightpos[Y] * groundplane[Y];
-  shadowMat[2][1] = 0.f - lightpos[Y] * groundplane[Z];
-  shadowMat[3][1] = 0.f - lightpos[Y] * groundplane[W];
-
-  shadowMat[X][2] = 0.f - lightpos[Z] * groundplane[X];
-  shadowMat[1][2] = 0.f - lightpos[Z] * groundplane[Y];
-  shadowMat[2][2] = dot - lightpos[Z] * groundplane[Z];
-  shadowMat[3][2] = 0.f - lightpos[Z] * groundplane[W];
-
-  shadowMat[X][3] = 0.f - lightpos[W] * groundplane[X];
-  shadowMat[1][3] = 0.f - lightpos[W] * groundplane[Y];
-  shadowMat[2][3] = 0.f - lightpos[W] * groundplane[Z];
-  shadowMat[3][3] = dot - lightpos[W] * groundplane[W];
-
-}
-
-/* find the plane equation given 3 points */
-void
-findplane(GLfloat plane[4],
-  GLfloat v0[3], GLfloat v1[3], GLfloat v2[3])
-{
-  GLfloat vec0[3], vec1[3];
-
-  /* need 2 vectors to find cross product */
-  vec0[X] = v1[X] - v0[X];
-  vec0[Y] = v1[Y] - v0[Y];
-  vec0[Z] = v1[Z] - v0[Z];
-
-  vec1[X] = v2[X] - v0[X];
-  vec1[Y] = v2[Y] - v0[Y];
-  vec1[Z] = v2[Z] - v0[Z];
-
-  /* find cross product to get A, B, and C of plane equation */
-  plane[A] = vec0[Y] * vec1[Z] - vec0[Z] * vec1[Y];
-  plane[B] = -(vec0[X] * vec1[Z] - vec0[Z] * vec1[X]);
-  plane[C] = vec0[X] * vec1[Y] - vec0[Y] * vec1[X];
-
-  plane[D] = -(plane[A] * v0[X] + plane[B] * v0[Y] + plane[C] * v0[Z]);
-}
-
-/******************** end shadow code ********************/
-
-
-static void calcposobs(void)
-{
-  dir[0]=sin(alpha*M_PI/180.0);
-  dir[1]=cos(alpha*M_PI/180.0)*sin(beta*M_PI/180.0);
-  dir[2]=cos(beta*M_PI/180.0);
-
-  obs[0]+=v*dir[0];
-  obs[1]+=v*dir[1];
-  obs[2]+=v*dir[2];
-}
-
-static void special(int k, int x, int y)
-{
-  switch(k) {
-  case GLUT_KEY_LEFT:
-    alpha-=2.0;
-    break;
-  case GLUT_KEY_RIGHT:
-    alpha+=2.0;
-    break;
-  case GLUT_KEY_DOWN:
-    beta-=2.0;
-    break;
-  case GLUT_KEY_UP:
-    beta+=2.0;
-    break;
-  }
-}
-
-static void key(unsigned char k, int x, int y)
-{
-  switch(k) {
-  case 27:
-    exit(0);
-    break;
-    
-  case 'a':
-    v+=0.005;
-    break;
-  case 'z':
-    v-=0.005;
-    break;
-
-  case 'j':
-    joyactive=(!joyactive);
-    break;
-  case 'h':
-    help=(!help);
-    break;
-  case 'f':
-    fog=(!fog);
-    break;
-  case 't':
-    usetex=(!usetex);
-    break;
-  case 'b':
-    if(bfcull) {
-      glDisable(GL_CULL_FACE);
-      bfcull=0;
-    } else {
-      glEnable(GL_CULL_FACE);
-      bfcull=1;
-    }
-    break;
-#ifdef XMESA
-  case ' ':
-    XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
-    fullscreen=(!fullscreen);
-    break;
-#endif
-  }
-}
-
-static void reshape(int w, int h) 
-{
-  WIDTH=w;
-  HEIGHT=h;
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  gluPerspective(45.0,w/(float)h,0.2,40.0);
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-  glViewport(0,0,w,h);
-}
-
-static void printstring(void *font, char *string)
-{
-  int len,i;
-
-  len=(int)strlen(string);
-  for(i=0;i<len;i++)
-    glutBitmapCharacter(font,string[i]);
-}
-
-static void printhelp(void)
-{
-  glEnable(GL_BLEND);
-  glColor4f(0.5,0.5,0.5,0.5);
-  glRecti(40,40,600,440);
-  glDisable(GL_BLEND);
-
-  glColor3f(1.0,0.0,0.0);
-  glRasterPos2i(300,420);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"Help");
-
-  glRasterPos2i(60,390);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"h - Togle Help");
-  glRasterPos2i(60,360);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"t - Togle Textures");
-  glRasterPos2i(60,330);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"f - Togle Fog");
-  glRasterPos2i(60,300);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"b - Togle Back face culling");
-  glRasterPos2i(60,270);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"Arrow Keys - Rotate");
-  glRasterPos2i(60,240);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"a - Increase velocity");
-  glRasterPos2i(60,210);
-  printstring(GLUT_BITMAP_TIMES_ROMAN_24,"z - Decrease velocity");
-
-  glRasterPos2i(60,180);
-  if(joyavailable)
-    printstring(GLUT_BITMAP_TIMES_ROMAN_24,"j - Togle jostick control (Joystick control available)");
-  else
-    printstring(GLUT_BITMAP_TIMES_ROMAN_24,"(No Joystick control available)");
-}
-
-static void drawbase(void)
-{
-  static const GLfloat amb[4] = { 1, .5, 0.2, 1 };
-  static const GLfloat diff[4] = { 1, .4, 0.2, 1 };
-  int i,j;
-  float x,y,dx,dy;
-
-  glBindTexture(GL_TEXTURE_2D,t1id);
-
-  glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, amb);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diff);
-  dx=BASESIZE/BASERES;
-  dy=-BASESIZE/BASERES;
-  for(y=BASESIZE/2.0,j=0;j<BASERES;y+=dy,j++) {
-    glBegin(GL_QUAD_STRIP);
-    glColor3f(1.0,1.0,1.0);
-    glNormal3f(0.0,0.0,1.0);
-    for(x=-BASESIZE/2.0,i=0;i<BASERES;x+=dx,i++) {
-      glTexCoord2f(x,y);
-      glVertex3f(x,y,0.0);
-
-      glTexCoord2f(x,y+dy);
-      glVertex3f(x,y+dy,0.0);
-    }
-    glEnd();
-  }
-}
-
-static void drawteapot(void)
-{
-  static const GLfloat amb[4] = {  0.2, 0.2, 0.2, 1 };
-  static const GLfloat diff[4] = { 0.8, 0.3, 0.5, 1 };
-  static float xrot=0.0;
-  static float zrot=0.0;
-
-  glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, amb);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diff);
-
-  glPushMatrix();
-  glRotatef(lightalpha,0.0,0.0,1.0);
-  glMultMatrixf((GLfloat *)baseshadow);
-  glRotatef(-lightalpha,0.0,0.0,1.0);
-
-  glTranslatef(0.0,0.0,1.0);
-  glRotatef(xrot,1.0,0.0,0.0);
-  glRotatef(zrot,0.0,0.0,1.0);
-
-  glDisable(GL_TEXTURE_2D);
-  glDisable(GL_DEPTH_TEST);
-  glDisable(GL_LIGHTING);
-
-  glColor3f(0.0,0.0,0.0);
-  glCallList(teapotdlist);
-
-  glEnable(GL_DEPTH_TEST);
-  glEnable(GL_LIGHTING);
-  if(usetex)
-    glEnable(GL_TEXTURE_2D);
-
-  glPopMatrix();
-
-  glPushMatrix();
-  glTranslatef(0.0,0.0,1.0);
-  glRotatef(xrot,1.0,0.0,0.0);
-  glRotatef(zrot,0.0,0.0,1.0);
-
-  glCallList(teapotdlist);
-  glPopMatrix();
-
-  xrot+=2.0;
-  zrot+=1.0;
-}
-
-static void drawlight1(void)
-{
-  glPushMatrix();
-  glRotatef(lightalpha,0.0,0.0,1.0);
-  glLightfv(GL_LIGHT0,GL_POSITION,lightpos);
-  glLightfv(GL_LIGHT0,GL_SPOT_DIRECTION,lightdir);
-
-  glPopMatrix();
-}
-
-static void drawlight2(void)
-{
-  glPushMatrix();
-  glRotatef(lightalpha,0.0,0.0,1.0);
-  glTranslatef(lightpos[0],lightpos[1],lightpos[2]);
-
-  glDisable(GL_TEXTURE_2D);
-  glCallList(lightdlist);
-  if(usetex)
-    glEnable(GL_TEXTURE_2D);
-  
-  glPopMatrix();
-
-  lightalpha+=1.0;
-}
-
-static void dojoy(void)
-{
-#ifdef WIN32
-  static UINT max[2]={0,0};
-  static UINT min[2]={0xffffffff,0xffffffff},center[2];
-  MMRESULT res;
-  JOYINFO joy;
-
-  res=joyGetPos(JOYSTICKID1,&joy);
-
-  if(res==JOYERR_NOERROR) {
-    joyavailable=1;
-
-    if(max[0]<joy.wXpos)
-      max[0]=joy.wXpos;
-    if(min[0]>joy.wXpos)
-      min[0]=joy.wXpos;
-    center[0]=(max[0]+min[0])/2;
-
-    if(max[1]<joy.wYpos)
-      max[1]=joy.wYpos;
-    if(min[1]>joy.wYpos)
-      min[1]=joy.wYpos;
-    center[1]=(max[1]+min[1])/2;
-
-    if(joyactive) {
-      if(fabs(center[0]-(float)joy.wXpos)>0.1*(max[0]-min[0]))
-	alpha-=2.5*(center[0]-(float)joy.wXpos)/(max[0]-min[0]);
-      if(fabs(center[1]-(float)joy.wYpos)>0.1*(max[1]-min[1]))
-	beta+=2.5*(center[1]-(float)joy.wYpos)/(max[1]-min[1]);
-
-      if(joy.wButtons & JOY_BUTTON1)
-	v+=0.005;
-      if(joy.wButtons & JOY_BUTTON2)
-	v-=0.005;
-    }
-  } else
-    joyavailable=0;
-#endif
-}
-
-static void draw(void)
-{
-  static char frbuf[80] = "";
-
-  dojoy();
-
-  glEnable(GL_DEPTH_TEST);
-  glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-
-  if(usetex)
-    glEnable(GL_TEXTURE_2D);
-  else
-    glDisable(GL_TEXTURE_2D);
-
-  if(fog)
-    glEnable(GL_FOG);
-  else
-    glDisable(GL_FOG);
-
-  glEnable(GL_LIGHTING);
-
-  glShadeModel(GL_SMOOTH);
-
-  glPushMatrix();
-  calcposobs();
-
-  gluLookAt(obs[0],obs[1],obs[2],
-	    obs[0]+dir[0],obs[1]+dir[1],obs[2]+dir[2],
-	    0.0,0.0,1.0);
-
-  drawlight1();
-  glCallList(basedlist);
-  drawteapot();
-  drawlight2();
-  glPopMatrix();
-  
-  glDisable(GL_LIGHTING);
-  glDisable(GL_TEXTURE_2D);
-  glDisable(GL_DEPTH_TEST);
-  glDisable(GL_FOG);
-  glShadeModel(GL_FLAT);
-
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  glOrtho(-0.5,639.5,-0.5,479.5,-1.0,1.0);
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-
-  glColor3f(1.0,0.0,0.0);
-  glRasterPos2i(10,10);
-  printstring(GLUT_BITMAP_HELVETICA_18,frbuf);
-  glRasterPos2i(350,470);
-  printstring(GLUT_BITMAP_HELVETICA_10,"Teapot V1.2 Written by David Bucciarelli (tech.hmw@plus.it)");
-
-  if(help)
-    printhelp();
-
-  reshape(WIDTH,HEIGHT);
-
-  glutSwapBuffers();
-
-   Frames++;
-
-   {
-      GLint t = glutGet(GLUT_ELAPSED_TIME);
-      if (t - T0 >= 2000) {
-         GLfloat seconds = (t - T0) / 1000.0;
-         GLfloat fps = Frames / seconds;
-         sprintf(frbuf, "Frame rate: %f", fps);
-         T0 = t;
-         Frames = 0;
-      }
-   }
-}
-
-static void inittextures(void)
-{
-  glGenTextures(1,&t1id);
-  glBindTexture(GL_TEXTURE_2D,t1id);
-
-  glPixelStorei(GL_UNPACK_ALIGNMENT,4);
-  if (!LoadRGBMipmaps("../images/tile.rgb", GL_RGB)) {
-    fprintf(stderr,"Error reading a texture.\n");
-    exit(-1);
-  }
-
-  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
-  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
-  
-  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR);
-  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
-
-  glTexEnvf(GL_TEXTURE_ENV,GL_TEXTURE_ENV_MODE,GL_MODULATE);
-
-  glGenTextures(1,&t2id);
-  glBindTexture(GL_TEXTURE_2D,t2id);
-
-  glPixelTransferf(GL_RED_SCALE, 0.75);
-  glPixelTransferf(GL_RED_BIAS, 0.25);
-  glPixelTransferf(GL_GREEN_SCALE, 0.75);
-  glPixelTransferf(GL_GREEN_BIAS, 0.25);
-  glPixelTransferf(GL_BLUE_SCALE, 0.75);
-  glPixelTransferf(GL_BLUE_BIAS, 0.25);
-
-  if (!LoadRGBMipmaps("../images/bw.rgb", GL_RGB)) {
-    fprintf(stderr,"Error reading a texture.\n");
-    exit(-1);
-  }
-
-  glPixelTransferf(GL_RED_SCALE, 1.0);
-  glPixelTransferf(GL_RED_BIAS, 0.0);
-  glPixelTransferf(GL_GREEN_SCALE, 1.0);
-  glPixelTransferf(GL_GREEN_BIAS, 0.0);
-  glPixelTransferf(GL_BLUE_SCALE, 1.0);
-  glPixelTransferf(GL_BLUE_BIAS, 0.0);
-
-
-  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
-  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
-  
-  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR);
-  glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
-
-  glTexEnvf(GL_TEXTURE_ENV,GL_TEXTURE_ENV_MODE,GL_MODULATE);
-}
-
-static void initlight(void)
-{
-  float matamb[4] ={0.5, 0.5, 0.5, 1.0};
-  float matdiff[4]={0.9, 0.2, 0.2, 1.0};
-  float matspec[4]={1.0,1.0,1.0,1.0};
-
-  float lamb[4] ={1.5, 1.5, 1.5, 1.0};
-  float ldiff[4]={1.0, 1.0, 1.0, 1.0};
-  float lspec[4]={1.0, 1.0, 1.0, 1.0};
-
-  glLightf(GL_LIGHT0,GL_SPOT_CUTOFF,70.0);
-  glLightf(GL_LIGHT0,GL_SPOT_EXPONENT,20.0);
-  glLightfv(GL_LIGHT0,GL_AMBIENT,lamb);
-  glLightfv(GL_LIGHT0,GL_DIFFUSE,ldiff);
-  glLightfv(GL_LIGHT0,GL_SPECULAR,lspec);
-
-  glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 15.0);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, matdiff);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, matspec);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, matamb);
-
-  glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lamb);
-  glEnable(GL_LIGHT0);
-}
-
-static void initdlists(void)
-{
-  GLUquadricObj *lcone,*lbase;
-  GLfloat plane[4];
-  GLfloat v0[3]={0.0,0.0,0.0};
-  GLfloat v1[3]={1.0,0.0,0.0};
-  GLfloat v2[3]={0.0,1.0,0.0};
-
-  findplane(plane,v0,v1,v2);
-  shadowmatrix(baseshadow,plane,lightpos);
-
-  teapotdlist=glGenLists(1);
-  glNewList(teapotdlist,GL_COMPILE);
-  glRotatef(90.0,1.0,0.0,0.0);
-  glCullFace(GL_FRONT);
-  glBindTexture(GL_TEXTURE_2D,t2id);
-  glutSolidTeapot(0.75);
-  glCullFace(GL_BACK);
-  glEndList();
-
-  basedlist=glGenLists(1);
-  glNewList(basedlist,GL_COMPILE);
-  drawbase();
-  glEndList();
-
-  lightdlist=glGenLists(1);
-  glNewList(lightdlist,GL_COMPILE);
-  glDisable(GL_LIGHTING);
- 
-  lcone=gluNewQuadric();
-  lbase=gluNewQuadric();
-  glRotatef(45.0,0.0,1.0,0.0);
-
-  glColor3f(1.0,1.0,1.0);
-  glCullFace(GL_FRONT);
-  gluDisk(lbase,0.0,0.2,12.0,1.0);
-  glCullFace(GL_BACK);
-
-  glColor3f(0.5,0.0,0.0);
-  gluCylinder(lcone,0.2,0.0,0.5,12,1);
-
-  gluDeleteQuadric(lcone);
-  gluDeleteQuadric(lbase);
-
-  glEnable(GL_LIGHTING);
-  glEndList();
-}
-
-int main(int ac, char **av)
-{
-  float fogcolor[4]={0.025,0.025,0.025,1.0};
-
-  fprintf(stderr,"Teapot V1.2\nWritten by David Bucciarelli (tech.hmw@plus.it)\n");
-
-  /*
-    if(!SetPriorityClass(GetCurrentProcess(),REALTIME_PRIORITY_CLASS)) {
-    fprintf(stderr,"Error setting the process class.\n");
-    return 0;
-    }
-
-    if(!SetThreadPriority(GetCurrentThread(),THREAD_PRIORITY_TIME_CRITICAL)) {
-    fprintf(stderr,"Error setting the process priority.\n");
-    return 0;
-    }
-    */
-
-  glutInitWindowPosition(0,0);
-  glutInitWindowSize(WIDTH,HEIGHT);
-  glutInit(&ac,av);
-
-  glutInitDisplayMode(GLUT_RGB|GLUT_DEPTH|GLUT_DOUBLE);
-
-  if(!(win=glutCreateWindow("Teapot"))) {
-    fprintf(stderr,"Error, couldn't open window\n");
-	return -1;
-  }
-
-  reshape(WIDTH,HEIGHT);
-
-  glShadeModel(GL_SMOOTH);
-  glEnable(GL_DEPTH_TEST);
-  glEnable(GL_CULL_FACE);
-  glEnable(GL_TEXTURE_2D);
-
-  glEnable(GL_FOG);
-  glFogi(GL_FOG_MODE,GL_EXP2);
-  glFogfv(GL_FOG_COLOR,fogcolor);
-
-  glFogf(GL_FOG_DENSITY,0.04);
-  glHint(GL_FOG_HINT,GL_NICEST);
-  glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-
-  calcposobs();
-
-  inittextures();
-  initlight();
-
-  initdlists();
-
-  glClearColor(fogcolor[0],fogcolor[1],fogcolor[2],fogcolor[3]);
-
-  glutReshapeFunc(reshape);
-  glutDisplayFunc(draw);
-  glutKeyboardFunc(key);
-  glutSpecialFunc(special);
-  glutIdleFunc(draw);
-
-  glutMainLoop();
-
-  return 0;
-}

progs/demos/terrain.c

@@ -1,649 +0,0 @@
-/*
- * This program is under the GNU GPL.
- * Use at your own risk.
- *
- * written by David Bucciarelli (tech.hmw@plus.it)
- *            Humanware s.r.l.
- *
- * based on a Mikael SkiZoWalker's (MoDEL) / France (Skizo@Hol.Fr) demo
- */
-
-#include <stdio.h>
-#include <math.h>
-#include <stdlib.h>
-#include <time.h>
-
-#ifdef WIN32
-#include <windows.h>
-#endif
-
-#include <GL/glut.h>
-
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen = 1;
-#endif
-
-#ifndef M_PI
-#define M_PI 3.14159265
-#endif
-
-#define heightMnt	450
-#define	lenghtXmnt	62
-#define lenghtYmnt	62
-
-#define stepXmnt     96.0
-#define stepYmnt     96.0
-
-#define WIDTH 640
-#define HEIGHT 480
-
-static GLint T0 = 0;
-static GLint Frames = 0;
-
-#define TSCALE 4
-
-#define FOV 85
-
-static GLfloat terrain[256 * 256];
-static GLfloat terraincolor[256 * 256][3];
-
-static int win = 0;
-
-static int fog = 1;
-static int bfcull = 1;
-static int usetex = 1;
-static int poutline = 0;
-static int help = 1;
-static int joyavailable = 0;
-static int joyactive = 0;
-static float ModZMnt;
-static long GlobalMnt = 0;
-
-static int scrwidth = WIDTH;
-static int scrheight = HEIGHT;
-
-#define OBSSTARTX 992.0
-#define OBSSTARTY 103.0
-
-static float obs[3] = { OBSSTARTX, heightMnt * 1.3, OBSSTARTY };
-static float dir[3], v1[2], v2[2];
-static float v = 15.0;
-static float alpha = 75.0;
-static float beta = 90.0;
-
-static void
-calcposobs(void)
-{
-   float alpha1, alpha2;
-
-   dir[0] = sin(alpha * M_PI / 180.0);
-   dir[2] = cos(alpha * M_PI / 180.0) * sin(beta * M_PI / 180.0);
-   dir[1] = cos(beta * M_PI / 180.0);
-
-   if (dir[0] < 1.0e-5 && dir[0] > -1.0e-5)
-      dir[0] = 0;
-   if (dir[1] < 1.0e-5 && dir[1] > -1.0e-5)
-      dir[1] = 0;
-   if (dir[2] < 1.0e-5 && dir[2] > -1.0e-5)
-      dir[2] = 0;
-
-   alpha1 = alpha + FOV / 2.0;
-   v1[0] = sin(alpha1 * M_PI / 180.0);
-   v1[1] = cos(alpha1 * M_PI / 180.0);
-
-   alpha2 = alpha - FOV / 2.0;
-   v2[0] = sin(alpha2 * M_PI / 180.0);
-   v2[1] = cos(alpha2 * M_PI / 180.0);
-
-   obs[0] += v * dir[0];
-   obs[1] += v * dir[1];
-   obs[2] += v * dir[2];
-
-   if (obs[1] < 0.0)
-      obs[1] = 0.0;
-}
-
-static void
-reshape(int width, int height)
-{
-   scrwidth = width;
-   scrheight = height;
-   glViewport(0, 0, (GLint) width, (GLint) height);
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   gluPerspective(50.0, ((GLfloat) width / (GLfloat) height),
-		  lenghtXmnt * stepYmnt * 0.01, lenghtXmnt * stepYmnt * 0.7);
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-}
-
-static int
-clipstrip(float y, float *start, float *end)
-{
-   float x1, x2, t1, t2, tmp;
-
-   if (v1[1] == 0.0) {
-      t1 = 0.0;
-      x1 = -HUGE_VAL;
-   }
-   else {
-      t1 = y / v1[1];
-      x1 = t1 * v1[0];
-   }
-
-   if (v2[1] == 0.0) {
-      t2 = 0.0;
-      x2 = HUGE_VAL;
-   }
-   else {
-      t2 = y / v2[1];
-      x2 = t2 * v2[0];
-   }
-
-   if (((x1 < -(lenghtXmnt * stepXmnt) / 2) && (t2 <= 0.0)) ||
-       ((t1 <= 0.0) && (x2 > (lenghtXmnt * stepXmnt) / 2)) ||
-       ((t1 < 0.0) && (t2 < 0.0)))
-      return 0;
-
-   if ((t1 == 0.0) && (t2 == 0.0)) {
-      if ((v1[0] < 0.0) && (v1[1] > 0.0) && (v2[0] < 0.0) && (v2[1] < 0.0)) {
-	 *start = -(lenghtXmnt * stepXmnt) / 2;
-	 *end = stepXmnt;
-	 return 1;
-      }
-      else {
-	 if ((v1[0] > 0.0) && (v1[1] < 0.0) && (v2[0] > 0.0) && (v2[1] > 0.0)) {
-	    *start = -stepXmnt;
-	    *end = (lenghtXmnt * stepXmnt) / 2;
-	    return 1;
-	 }
-	 else
-	    return 0;
-      }
-   }
-   else {
-      if (t2 < 0.0) {
-	 if (x1 < 0.0)
-	    x2 = -(lenghtXmnt * stepXmnt) / 2;
-	 else
-	    x2 = (lenghtXmnt * stepXmnt) / 2;
-      }
-
-      if (t1 < 0.0) {
-	 if (x2 < 0.0)
-	    x1 = -(lenghtXmnt * stepXmnt) / 2;
-	 else
-	    x1 = (lenghtXmnt * stepXmnt) / 2;
-      }
-   }
-
-   if (x1 > x2) {
-      tmp = x1;
-      x1 = x2;
-      x2 = tmp;
-   }
-
-   x1 -= stepXmnt;
-   if (x1 < -(lenghtXmnt * stepXmnt) / 2)
-      x1 = -(lenghtXmnt * stepXmnt) / 2;
-
-   x2 += stepXmnt;
-   if (x2 > (lenghtXmnt * stepXmnt) / 2)
-      x2 = (lenghtXmnt * stepXmnt) / 2;
-
-   *start = ((int) (x1 / stepXmnt)) * stepXmnt;
-   *end = ((int) (x2 / stepXmnt)) * stepXmnt;
-
-   return 1;
-}
-
-static void
-printstring(void *font, char *string)
-{
-   int len, i;
-
-   len = (int) strlen(string);
-   for (i = 0; i < len; i++)
-      glutBitmapCharacter(font, string[i]);
-}
-
-static void
-printhelp(void)
-{
-   glEnable(GL_BLEND);
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-   glColor4f(0.0, 0.0, 0.0, 0.5);
-   glRecti(40, 40, 600, 440);
-   glDisable(GL_BLEND);
-
-   glColor3f(1.0, 0.0, 0.0);
-   glRasterPos2i(300, 420);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Help");
-
-   glRasterPos2i(60, 390);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Togle Help");
-   glRasterPos2i(60, 360);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "t - Togle Textures");
-   glRasterPos2i(60, 330);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Togle 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");
-   glRasterPos2i(60, 240);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Arrow Keys - Rotate");
-   glRasterPos2i(60, 210);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "a - Increase velocity");
-   glRasterPos2i(60, 180);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "z - Decrease velocity");
-
-   glRasterPos2i(60, 150);
-   if (joyavailable)
-      printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "j - Togle jostick control (Joystick control available)");
-   else
-      printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "(No Joystick control available)");
-}
-
-static void
-drawterrain(void)
-{
-   int h, i, idx, ox, oy;
-   float j, k, start, end;
-
-   ox = (int) (obs[0] / stepXmnt);
-   oy = (int) (obs[2] / stepYmnt);
-   GlobalMnt = ((ox * TSCALE) & 255) + ((oy * TSCALE) & 255) * 256;
-
-   glPushMatrix();
-   glTranslatef((float) ox * stepXmnt, 0, (float) oy * stepYmnt);
-
-   for (h = 0, k = -(lenghtYmnt * stepYmnt) / 2; h < lenghtYmnt;
-	k += stepYmnt, h++) {
-      if (!clipstrip(k, &start, &end))
-	 continue;
-
-      glBegin(GL_TRIANGLE_STRIP);	/* I hope that the optimizer will be able to improve this code */
-      for (i = (int) (lenghtXmnt / 2 + start / stepXmnt), j = start; j <= end;
-	   j += stepXmnt, i++) {
-	 idx = (i * TSCALE + h * 256 * TSCALE + GlobalMnt) & 65535;
-	 glColor3fv(terraincolor[idx]);
-	 glTexCoord2f((ox + i) / 8.0, (oy + h) / 8.0);
-	 glVertex3f(j, terrain[idx], k);
-
-	 idx =
-	    (i * TSCALE + h * 256 * TSCALE + 256 * TSCALE +
-	     GlobalMnt) & 65535;
-	 glColor3fv(terraincolor[idx]);
-	 glTexCoord2f((ox + i) / 8.0, (oy + h + 1) / 8.0);
-	 glVertex3f(j, terrain[idx], k + stepYmnt);
-      }
-      glEnd();
-   }
-
-   glDisable(GL_CULL_FACE);
-   glDisable(GL_TEXTURE_2D);
-   glEnable(GL_BLEND);
-   glBegin(GL_QUADS);
-   glColor4f(0.1, 0.7, 1.0, 0.4);
-   glVertex3f(-(lenghtXmnt * stepXmnt) / 2.0, heightMnt * 0.6,
-	      -(lenghtYmnt * stepYmnt) / 2.0);
-   glVertex3f(-(lenghtXmnt * stepXmnt) / 2.0, heightMnt * 0.6,
-	      (lenghtYmnt * stepYmnt) / 2.0);
-   glVertex3f((lenghtXmnt * stepXmnt) / 2.0, heightMnt * 0.6,
-	      (lenghtYmnt * stepYmnt) / 2.0);
-   glVertex3f((lenghtXmnt * stepXmnt) / 2.0, heightMnt * 0.6,
-	      -(lenghtYmnt * stepYmnt) / 2.0);
-   glEnd();
-   glDisable(GL_BLEND);
-   if (bfcull)
-      glEnable(GL_CULL_FACE);
-   glEnable(GL_TEXTURE_2D);
-
-   glPopMatrix();
-
-}
-
-static void
-dojoy(void)
-{
-#ifdef WIN32
-   static UINT max[2] = { 0, 0 };
-   static UINT min[2] = { 0xffffffff, 0xffffffff }, center[2];
-   MMRESULT res;
-   JOYINFO joy;
-
-   res = joyGetPos(JOYSTICKID1, &joy);
-
-   if (res == JOYERR_NOERROR) {
-      joyavailable = 1;
-
-      if (max[0] < joy.wXpos)
-	 max[0] = joy.wXpos;
-      if (min[0] > joy.wXpos)
-	 min[0] = joy.wXpos;
-      center[0] = (max[0] + min[0]) / 2;
-
-      if (max[1] < joy.wYpos)
-	 max[1] = joy.wYpos;
-      if (min[1] > joy.wYpos)
-	 min[1] = joy.wYpos;
-      center[1] = (max[1] + min[1]) / 2;
-
-      if (joyactive) {
-	 if (fabs(center[0] - (float) joy.wXpos) > 0.1 * (max[0] - min[0]))
-	    alpha +=
-	       2.5 * (center[0] - (float) joy.wXpos) / (max[0] - min[0]);
-	 if (fabs(center[1] - (float) joy.wYpos) > 0.1 * (max[1] - min[1]))
-	    beta += 2.5 * (center[1] - (float) joy.wYpos) / (max[1] - min[1]);
-
-	 if (joy.wButtons & JOY_BUTTON1)
-	    v += 0.5;
-	 if (joy.wButtons & JOY_BUTTON2)
-	    v -= 0.5;
-      }
-   }
-   else
-      joyavailable = 0;
-#endif
-}
-
-static void
-drawscene(void)
-{
-   static char frbuf[80] = "";
-
-   dojoy();
-
-   glShadeModel(GL_SMOOTH);
-   glEnable(GL_DEPTH_TEST);
-
-   if (usetex)
-      glEnable(GL_TEXTURE_2D);
-   else
-      glDisable(GL_TEXTURE_2D);
-
-   if (fog)
-      glEnable(GL_FOG);
-   else
-      glDisable(GL_FOG);
-
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-   glPushMatrix();
-
-   calcposobs();
-   gluLookAt(obs[0], obs[1], obs[2],
-	     obs[0] + dir[0], obs[1] + dir[1], obs[2] + dir[2],
-	     0.0, 1.0, 0.0);
-
-   drawterrain();
-   glPopMatrix();
-
-   glDisable(GL_TEXTURE_2D);
-   glDisable(GL_DEPTH_TEST);
-   glDisable(GL_FOG);
-   glShadeModel(GL_FLAT);
-
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   glOrtho(-0.5, 639.5, -0.5, 479.5, -1.0, 1.0);
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-
-   glColor3f(1.0, 0.0, 0.0);
-   glRasterPos2i(10, 10);
-   printstring(GLUT_BITMAP_HELVETICA_18, frbuf);
-   glRasterPos2i(350, 470);
-   printstring(GLUT_BITMAP_HELVETICA_10,
-	       "Terrain V1.2 Written by David Bucciarelli (tech.hmw@plus.it)");
-   glRasterPos2i(434, 457);
-   printstring(GLUT_BITMAP_HELVETICA_10,
-	       "Based on a Mickael's demo (Skizo@Hol.Fr)");
-
-   if (help)
-      printhelp();
-
-   reshape(scrwidth, scrheight);
-
-   glutSwapBuffers();
-
-   Frames++;
-   {
-      GLint t = glutGet(GLUT_ELAPSED_TIME);
-      if (t - T0 >= 2000) {
-         GLfloat seconds = (t - T0) / 1000.0;
-         GLfloat fps = Frames / seconds;
-         sprintf(frbuf, "Frame rate: %f", fps);
-         T0 = t;
-         Frames = 0;
-      }
-   }
-}
-
-static void
-key(unsigned char k, int x, int y)
-{
-   switch (k) {
-   case 27:
-      exit(0);
-      break;
-   case 'a':
-      v += 0.5;
-      break;
-   case 'z':
-      v -= 0.5;
-      break;
-   case 'p':
-      if (poutline) {
-	 glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-	 poutline = 0;
-      }
-      else {
-	 glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-	 poutline = 1;
-      }
-      break;
-   case 'j':
-      joyactive = (!joyactive);
-      break;
-   case 'h':
-      help = (!help);
-      break;
-   case 'f':
-      fog = (!fog);
-      break;
-   case 't':
-      usetex = (!usetex);
-      break;
-   case 'b':
-      if (bfcull) {
-	 glDisable(GL_CULL_FACE);
-	 bfcull = 0;
-      }
-      else {
-	 glEnable(GL_CULL_FACE);
-	 bfcull = 1;
-      }
-      break;
-#ifdef XMESA
-   case ' ':
-      XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
-      fullscreen = (!fullscreen);
-      break;
-#endif
-   }
-}
-
-static void
-special(int k, int x, int y)
-{
-   switch (k) {
-   case GLUT_KEY_LEFT:
-      alpha += 2.0;
-      break;
-   case GLUT_KEY_RIGHT:
-      alpha -= 2.0;
-      break;
-   case GLUT_KEY_DOWN:
-      beta -= 2.0;
-      break;
-   case GLUT_KEY_UP:
-      beta += 2.0;
-      break;
-   }
-}
-
-static void
-calccolor(GLfloat height, GLfloat c[3])
-{
-   GLfloat color[4][3] = {
-      {1.0, 1.0, 1.0},
-      {0.0, 0.8, 0.0},
-      {1.0, 1.0, 0.3},
-      {0.0, 0.0, 0.8}
-   };
-   GLfloat fact;
-
-   height = height * (1.0 / 255.0);
-
-   if (height >= 0.9) {
-      c[0] = color[0][0];
-      c[1] = color[0][1];
-      c[2] = color[0][2];
-      return;
-   }
-
-   if ((height < 0.9) && (height >= 0.7)) {
-      fact = (height - 0.7) * 5.0;
-      c[0] = fact * color[0][0] + (1.0 - fact) * color[1][0];
-      c[1] = fact * color[0][1] + (1.0 - fact) * color[1][1];
-      c[2] = fact * color[0][2] + (1.0 - fact) * color[1][2];
-      return;
-   }
-
-   if ((height < 0.7) && (height >= 0.6)) {
-      fact = (height - 0.6) * 10.0;
-      c[0] = fact * color[1][0] + (1.0 - fact) * color[2][0];
-      c[1] = fact * color[1][1] + (1.0 - fact) * color[2][1];
-      c[2] = fact * color[1][2] + (1.0 - fact) * color[2][2];
-      return;
-   }
-
-   if ((height < 0.6) && (height >= 0.5)) {
-      fact = (height - 0.5) * 10.0;
-      c[0] = fact * color[2][0] + (1.0 - fact) * color[3][0];
-      c[1] = fact * color[2][1] + (1.0 - fact) * color[3][1];
-      c[2] = fact * color[2][2] + (1.0 - fact) * color[3][2];
-      return;
-   }
-
-   c[0] = color[3][0];
-   c[1] = color[3][1];
-   c[2] = color[3][2];
-}
-
-static void
-loadpic(void)
-{
-   GLubyte bufferter[256 * 256], terrainpic[256 * 256];
-   FILE *FilePic;
-   int i, tmp;
-   GLenum gluerr;
-
-   if ((FilePic = fopen("terrain.dat", "r")) == NULL) {
-      fprintf(stderr, "Error loading terrain.dat\n");
-      exit(-1);
-   }
-   fread(bufferter, 256 * 256, 1, FilePic);
-   fclose(FilePic);
-
-   for (i = 0; i < (256 * 256); i++) {
-      terrain[i] = (bufferter[i] * (heightMnt / 255.0f));
-      calccolor((GLfloat) bufferter[i], terraincolor[i]);
-      tmp = (((int) bufferter[i]) + 96);
-      terrainpic[i] = (tmp > 255) ? 255 : tmp;
-   }
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   if ((gluerr = gluBuild2DMipmaps(GL_TEXTURE_2D, 1, 256, 256, GL_LUMINANCE,
-				   GL_UNSIGNED_BYTE,
-				   (GLvoid *) (&terrainpic[0])))) {
-      fprintf(stderr, "GLULib%s\n", gluErrorString(gluerr));
-      exit(-1);
-   }
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-		   GL_LINEAR_MIPMAP_LINEAR);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-   glEnable(GL_TEXTURE_2D);
-}
-
-static void
-init(void)
-{
-   float fogcolor[4] = { 0.6, 0.7, 0.7, 1.0 };
-
-   glClearColor(fogcolor[0], fogcolor[1], fogcolor[2], fogcolor[3]);
-   glClearDepth(1.0);
-   glDepthFunc(GL_LEQUAL);
-   glShadeModel(GL_SMOOTH);
-   glEnable(GL_DEPTH_TEST);
-   glEnable(GL_CULL_FACE);
-
-   glDisable(GL_BLEND);
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-   glEnable(GL_FOG);
-   glFogi(GL_FOG_MODE, GL_EXP2);
-   glFogfv(GL_FOG_COLOR, fogcolor);
-   glFogf(GL_FOG_DENSITY, 0.0007);
-#ifdef FX
-   glHint(GL_FOG_HINT, GL_NICEST);
-#endif
-
-   reshape(scrwidth, scrheight);
-}
-
-
-int
-main(int ac, char **av)
-{
-   glutInitWindowPosition(0, 0);
-   glutInitWindowSize(WIDTH, HEIGHT);
-   glutInit(&ac, av);
-
-   glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
-
-   if (!(win = glutCreateWindow("Terrain"))) {
-      fprintf(stderr, "Error, couldn't open window\n");
-      return -1;
-   }
-
-   ModZMnt = 0.0f;
-   loadpic();
-
-   init();
-
-#ifndef FX
-   glDisable(GL_TEXTURE_2D);
-   usetex = 0;
-#endif
-
-   glutReshapeFunc(reshape);
-   glutDisplayFunc(drawscene);
-   glutKeyboardFunc(key);
-   glutSpecialFunc(special);
-   glutIdleFunc(drawscene);
-
-   glutMainLoop();
-
-   return 0;
-}

progs/demos/tessdemo.c

@@ -1,10 +1,54 @@
-/* $Id: tessdemo.c,v 1.11 2001/03/21 02:47:32 gareth Exp $ */
+/* $Id: tessdemo.c,v 1.3.2.1 1999/11/16 11:09:09 gareth Exp $ */
 
 /*
  * A demo of the GLU polygon tesselation functions written by Bogdan Sikorski.
- * Updated for GLU 1.3 tessellation by Gareth Hughes <gareth@valinux.com>
+ * This demo isn't built by the Makefile because it needs GLUT.  After you've
+ * installed GLUT you can try this demo.
+ * Here's the command for IRIX, for example:
+   cc -g -ansi -prototypes -fullwarn -float -I../include -DSHM tess_demo.c -L../lib -lglut -lMesaGLU -lMesaGL -lm -lX11 -lXext -lXmu -lfpe -lXext -o tess_demo
  */
 
+/*
+ * Updated for GLU 1.3 tessellation by Gareth Hughes <garethh@bell-labs.com>
+ */
+
+/*
+ * $Log: tessdemo.c,v $
+ * Revision 1.3.2.1  1999/11/16 11:09:09  gareth
+ * Added combine callback.  Converted vertices from ints to floats.
+ *
+ * Revision 1.3  1999/11/04 04:00:42  gareth
+ * Updated demo for new GLU 1.3 tessellation.  Added optimized rendering
+ * by saving the output of the tessellation into display lists.
+ *
+ * Revision 1.2  1999/09/19 20:09:00  tanner
+ *
+ * lots of autoconf updates
+ *
+ * Revision 1.1.1.1  1999/08/19 00:55:40  jtg
+ * Imported sources
+ *
+ * Revision 3.5  1999/03/28 18:24:37  brianp
+ * minor clean-up
+ *
+ * Revision 3.4  1999/02/14 03:37:07  brianp
+ * fixed callback problem
+ *
+ * Revision 3.3  1998/07/26 01:25:26  brianp
+ * removed include of gl.h and glu.h
+ *
+ * Revision 3.2  1998/06/29 02:37:30  brianp
+ * minor changes for Windows (Ted Jump)
+ *
+ * Revision 3.1  1998/06/09 01:53:49  brianp
+ * main() should return an int
+ *
+ * Revision 3.0  1998/02/14 18:42:29  brianp
+ * initial rev
+ *
+ */
+
+
 #include <GL/glut.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,8 +66,6 @@
 #endif
 #endif
 
-#ifdef GLU_VERSION_1_2
-
 typedef enum{ QUIT, TESSELATE, CLEAR } menu_entries;
 typedef enum{ DEFINE, TESSELATED } mode_type;
 
@@ -38,12 +80,14 @@ static GLuint		list_start;
 
 static GLfloat		edge_color[3];
 
-static struct {
+static struct
+{
    GLfloat	p[MAX_POINTS][2];
    GLuint	point_cnt;
 } contours[MAX_CONTOURS];
 
-static struct {
+static struct
+{
    GLsizei	no;
    GLfloat	p[3][2];
    GLclampf	color[3][3];
@@ -51,7 +95,7 @@ static struct {
 
 
 
-static void GLCALLBACK error_callback( GLenum err )
+void GLCALLBACK error_callback( GLenum err )
 {
    int		len, i;
    char const	*str;
@@ -67,28 +111,31 @@ static void GLCALLBACK error_callback( GLenum err )
    }
 }
 
-static void GLCALLBACK begin_callback( GLenum mode )
+void GLCALLBACK begin_callback( GLenum mode )
 {
    /* Allow multiple triangles to be output inside the begin/end pair. */
    triangle_cnt = 0;
    triangles[triangle_cnt].no = 0;
 }
 
-static void GLCALLBACK edge_callback( GLenum flag )
+void GLCALLBACK edge_callback( GLenum flag )
 {
    /* Persist the edge flag across triangles. */
-   if ( flag == GL_TRUE ) {
+   if ( flag == GL_TRUE )
+   {
       edge_color[0] = 1.0;
       edge_color[1] = 1.0;
       edge_color[2] = 0.5;
-   } else {
+   }
+   else
+   {
       edge_color[0] = 1.0;
       edge_color[1] = 0.0;
       edge_color[2] = 0.0;
    }
 }
 
-static void GLCALLBACK end_callback()
+void GLCALLBACK end_callback()
 {
    GLint	i;
 
@@ -96,7 +143,8 @@ static void GLCALLBACK end_callback()
 
    /* Output the three edges of each triangle as lines colored
       according to their edge flag. */
-   for ( i = 0 ; i < triangle_cnt ; i++ ) {
+   for ( i = 0 ; i < triangle_cnt ; i++ )
+   {
       glColor3f( triangles[i].color[0][0],
 		 triangles[i].color[0][1],
 		 triangles[i].color[0][2] );
@@ -122,7 +170,7 @@ static void GLCALLBACK end_callback()
    glEnd();
 }
 
-static void GLCALLBACK vertex_callback( void *data )
+void GLCALLBACK vertex_callback( void *data )
 {
    GLsizei	no;
    GLfloat	*p;
@@ -138,17 +186,19 @@ static void GLCALLBACK vertex_callback( void *data )
    triangles[triangle_cnt].color[no][2] = edge_color[2];
 
    /* After every three vertices, initialize the next triangle. */
-   if ( ++(triangles[triangle_cnt].no) == 3 ) {
+   if ( ++(triangles[triangle_cnt].no) == 3 )
+   {
       triangle_cnt++;
       triangles[triangle_cnt].no = 0;
    }
 }
 
-static void GLCALLBACK combine_callback( GLdouble coords[3],
-					 GLdouble *vertex_data[4],
-					 GLfloat weight[4], void **data )
+void GLCALLBACK combine_callback( GLdouble coords[3],
+				  GLdouble *vertex_data[4],
+				  GLfloat weight[4], void **data )
 {
    GLfloat	*vertex;
+   int		i;
 
    vertex = (GLfloat *) malloc( 2 * sizeof(GLfloat) );
 
@@ -159,13 +209,13 @@ static void GLCALLBACK combine_callback( GLdouble coords[3],
 }
 
 
-static void set_screen_wh( GLsizei w, GLsizei h )
+void set_screen_wh( GLsizei w, GLsizei h )
 {
    width = w;
    height = h;
 }
 
-static void tesse( void )
+void tesse( void )
 {
    GLUtesselator	*tobj;
    GLdouble		data[3];
@@ -175,8 +225,8 @@ static void tesse( void )
 
    tobj = gluNewTess();
 
-   if ( tobj != NULL ) {
-      gluTessNormal( tobj, 0.0, 0.0, 1.0 );
+   if ( tobj != NULL )
+   {
       gluTessCallback( tobj, GLU_TESS_BEGIN, glBegin );
       gluTessCallback( tobj, GLU_TESS_VERTEX, glVertex2fv );
       gluTessCallback( tobj, GLU_TESS_END, glEnd );
@@ -186,11 +236,13 @@ static void tesse( void )
       glNewList( list_start, GL_COMPILE );
       gluBeginPolygon( tobj );
 
-      for ( j = 0 ; j <= contour_cnt ; j++ ) {
+      for ( j = 0 ; j <= contour_cnt ; j++ )
+      {
 	 point_cnt = contours[j].point_cnt;
 	 gluNextContour( tobj, GLU_UNKNOWN );
 
-	 for ( i = 0 ; i < point_cnt ; i++ ) {
+	 for ( i = 0 ; i < point_cnt ; i++ )
+	 {
 	    data[0] = (GLdouble)( contours[j].p[i][0] );
 	    data[1] = (GLdouble)( contours[j].p[i][1] );
 	    data[2] = 0.0;
@@ -209,11 +261,13 @@ static void tesse( void )
       glNewList( list_start + 1, GL_COMPILE );
       gluBeginPolygon( tobj );
 
-      for ( j = 0 ; j <= contour_cnt ; j++ ) {
+      for ( j = 0 ; j <= contour_cnt ; j++ )
+      {
 	 point_cnt = contours[j].point_cnt;
 	 gluNextContour( tobj, GLU_UNKNOWN );
 
-	 for ( i = 0 ; i < point_cnt ; i++ ) {
+	 for ( i = 0 ; i < point_cnt ; i++ )
+	 {
 	    data[0] = (GLdouble)( contours[j].p[i][0] );
 	    data[1] = (GLdouble)( contours[j].p[i][1] );
 	    data[2] = 0.0;
@@ -231,7 +285,7 @@ static void tesse( void )
    }
 }
 
-static void left_down( int x1, int y1 )
+void left_down( int x1, int y1 )
 {
    GLfloat	P[2];
    GLuint	point_cnt;
@@ -248,10 +302,13 @@ static void left_down( int x1, int y1 )
 
    glBegin( GL_LINES );
 
-   if ( point_cnt ) {
+   if ( point_cnt )
+   {
       glVertex2fv( contours[contour_cnt].p[point_cnt-1] );
       glVertex2fv( P );
-   } else {
+   }
+   else
+   {
       glVertex2fv( P );
       glVertex2fv( P );
    }
@@ -262,7 +319,7 @@ static void left_down( int x1, int y1 )
    contours[contour_cnt].point_cnt++;
 }
 
-static void middle_down( int x1, int y1 )
+void middle_down( int x1, int y1 )
 {
    GLuint	point_cnt;
    (void) x1;
@@ -270,7 +327,8 @@ static void middle_down( int x1, int y1 )
 
    point_cnt = contours[contour_cnt].point_cnt;
 
-   if ( point_cnt > 2 ) {
+   if ( point_cnt > 2 )
+   {
       glBegin( GL_LINES );
 
       glVertex2fv( contours[contour_cnt].p[0] );
@@ -286,12 +344,13 @@ static void middle_down( int x1, int y1 )
    }
 }
 
-static void mouse_clicked( int button, int state, int x, int y )
+void mouse_clicked( int button, int state, int x, int y )
 {
    x -= x%10;
    y -= y%10;
 
-   switch ( button ) {
+   switch ( button )
+   {
    case GLUT_LEFT_BUTTON:
       if ( state == GLUT_DOWN ) {
 	 left_down( x, y );
@@ -305,22 +364,25 @@ static void mouse_clicked( int button, int state, int x, int y )
    }
 }
 
-static void display( void )
+void display( void )
 {
    GLuint i,j;
    GLuint point_cnt;
 
    glClear( GL_COLOR_BUFFER_BIT );
 
-   switch ( mode ) {
+   switch ( mode )
+   {
    case DEFINE:
       /* draw grid */
       glColor3f( 0.6, 0.5, 0.5 );
 
       glBegin( GL_LINES );
 
-      for ( i = 0 ; i < width ; i += 10 ) {
-	 for ( j = 0 ; j < height ; j += 10 ) {
+      for ( i = 0 ; i < width ; i += 10 )
+      {
+	 for ( j = 0 ; j < height ; j += 10 )
+	 {
 	    glVertex2i( 0, j );
 	    glVertex2i( width, j );
 	    glVertex2i( i, height );
@@ -328,16 +390,16 @@ static void display( void )
 	 }
       }
 
-      glEnd();
-
       glColor3f( 1.0, 1.0, 0.0 );
 
-      for ( i = 0 ; i <= contour_cnt ; i++ ) {
+      for ( i = 0 ; i <= contour_cnt ; i++ )
+      {
 	 point_cnt = contours[i].point_cnt;
 
 	 glBegin( GL_LINES );
 
-	 switch ( point_cnt ) {
+	 switch ( point_cnt )
+	 {
 	 case 0:
 	    break;
 	 case 1:
@@ -350,11 +412,13 @@ static void display( void )
 	    break;
 	 default:
 	    --point_cnt;
-	    for ( j = 0 ; j < point_cnt ; j++ ) {
+	    for ( j = 0 ; j < point_cnt ; j++ )
+	    {
 	       glVertex2fv( contours[i].p[j] );
 	       glVertex2fv( contours[i].p[j+1] );
 	    }
-	    if ( contours[i].p[j+1][0] == -1 ) {
+	    if ( contours[i].p[j+1][0] == -1 )
+	    {
 	       glVertex2fv( contours[i].p[0] );
 	       glVertex2fv( contours[i].p[j] );
 	    }
@@ -383,7 +447,7 @@ static void display( void )
    glColor3f( 1.0, 1.0, 0.0 );
 }
 
-static void clear( void )
+void clear( void )
 {
    contour_cnt = 0;
    contours[0].point_cnt = 0;
@@ -397,14 +461,15 @@ static void clear( void )
    list_start = 0;
 }
 
-static void quit( void )
+void quit( void )
 {
    exit( 0 );
 }
 
-static void menu_selected( int entry )
+void menu_selected( int entry )
 {
-   switch ( entry ) {
+   switch ( entry )
+   {
    case CLEAR:
       clear();
       break;
@@ -419,12 +484,13 @@ static void menu_selected( int entry )
    glutPostRedisplay();
 }
 
-static void key_pressed( unsigned char key, int x, int y )
+void key_pressed( unsigned char key, int x, int y )
 {
    (void) x;
    (void) y;
 
-   switch ( key ) {
+   switch ( key )
+   {
    case 'c':
    case 'C':
       clear();
@@ -433,7 +499,6 @@ static void key_pressed( unsigned char key, int x, int y )
    case 'T':
       tesse();
       break;
-   case 27:
    case 'q':
    case 'Q':
       quit();
@@ -443,7 +508,7 @@ static void key_pressed( unsigned char key, int x, int y )
    glutPostRedisplay();
 }
 
-static void myinit( void )
+void myinit( void )
 {
    /* clear background to gray */
    glClearColor( 0.4, 0.4, 0.4, 0.0 );
@@ -479,8 +544,6 @@ static void reshape( GLsizei w, GLsizei h )
    set_screen_wh( w, h );
 }
 
-#endif
-
 
 static void usage( void )
 {
@@ -490,32 +553,26 @@ static void usage( void )
 }
 
 
+/*
+ * Main Loop
+ * Open window with initial window size, title bar,
+ * RGBA display mode, and handle input events.
+ */
 int main( int argc, char **argv )
 {
-   const char *version = (const char *) gluGetString( GLU_VERSION );
-   printf( "GLU version string: %s\n", version );
-   if ( strstr( version, "1.0" ) || strstr( version, "1.1" ) ) {
-      fprintf( stderr, "Sorry, this demo reqiures GLU 1.2 or later.\n" );
-      exit( 1 );
-   }
+    usage();
 
-   usage();
+    glutInit( &argc, argv );
+    glutInitDisplayMode( GLUT_SINGLE | GLUT_RGB );
+    glutInitWindowSize( 400, 400 );
+    glutCreateWindow( argv[0] );
 
-   glutInit( &argc, argv );
-   glutInitDisplayMode( GLUT_SINGLE | GLUT_RGB );
-   glutInitWindowSize( 400, 400 );
-   glutCreateWindow( argv[0] );
+    myinit();
 
-   /* GH: Bit of a hack...
-    */
-#ifdef GLU_VERSION_1_2
-   myinit();
+    glutDisplayFunc( display );
+    glutReshapeFunc( reshape );
 
-   glutDisplayFunc( display );
-   glutReshapeFunc( reshape );
+    glutMainLoop();
 
-   glutMainLoop();
-#endif
-
-   return 0;
+    return 0;
 }

progs/demos/texcyl.c

@@ -1,4 +1,4 @@
-/* $Id: texcyl.c,v 1.5 2001/03/27 17:35:26 brianp Exp $ */
+/* $Id: texcyl.c,v 1.2 1999/10/21 16:39:06 brianp Exp $ */
 
 /*
  * Textured cylinder demo: lighting, texturing, reflection mapping.
@@ -12,38 +12,6 @@
 
 /*
  * $Log: texcyl.c,v $
- * Revision 1.5  2001/03/27 17:35:26  brianp
- * set initial window pos
- *
- * Revision 1.4  2000/12/24 22:53:54  pesco
- * * demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util.
- * * demos/Makefile.X11, demos/Makefile.BeOS-R4, demos/Makefile.cygnus:
- * Essentially the same.
- * Program files updated to include "readtex.c", not "../util/readtex.c".
- * * demos/reflect.c: Likewise for "showbuffer.c".
- *
- *
- * * Makefile.am (EXTRA_DIST): Added top-level regular files.
- *
- * * include/GL/Makefile.am (INC_X11): Added glxext.h.
- *
- *
- * * src/GGI/include/ggi/mesa/Makefile.am (EXTRA_HEADERS): Include
- * Mesa GGI headers in dist even if HAVE_GGI is not given.
- *
- * * configure.in: Look for GLUT and demo source dirs in $srcdir.
- *
- * * src/swrast/Makefile.am (libMesaSwrast_la_SOURCES): Set to *.[ch].
- * More source list updates in various Makefile.am's.
- *
- * * Makefile.am (dist-hook): Remove CVS directory from distribution.
- * (DIST_SUBDIRS): List all possible subdirs here.
- * (SUBDIRS): Only list subdirs selected for build again.
- * The above two applied to all subdir Makefile.am's also.
- *
- * Revision 1.3  2000/09/29 23:09:39  brianp
- * added fps output
- *
  * Revision 1.2  1999/10/21 16:39:06  brianp
  * added -info command line option
  *
@@ -70,7 +38,7 @@
 #include <math.h>
 #include <GL/glut.h>
 
-#include "readtex.c"   /* I know, this is a hack. */
+#include "../util/readtex.c"   /* I know, this is a hack. */
 
 #define TEXTURE_FILE "../images/reflect.rgb"
 
@@ -88,10 +56,6 @@ static GLboolean Animate = GL_TRUE;
 static GLfloat Xrot = 0.0, Yrot = 0.0, Zrot = 0.0;
 static GLfloat DXrot = 1.0, DYrot = 2.5;
 
-/* performance info */
-static GLint T0 = 0;
-static GLint Frames = 0;
-
 
 static void Idle( void )
 {
@@ -117,18 +81,6 @@ static void Display( void )
    glPopMatrix();
 
    glutSwapBuffers();
-
-   if (Animate) {
-      GLint t = glutGet(GLUT_ELAPSED_TIME);
-      Frames++;
-      if (t - T0 >= 5000) {
-         GLfloat seconds = (t - T0) / 1000.0;
-         GLfloat fps = Frames / seconds;
-         printf("%d frames in %g seconds = %g FPS\n", Frames, seconds, fps);
-         T0 = t;
-         Frames = 0;
-      }
-   }
 }
 
 
@@ -296,7 +248,6 @@ int main( int argc, char *argv[] )
 {
    glutInit( &argc, argv );
    glutInitWindowSize( 400, 400 );
-   glutInitWindowPosition( 0, 0 );
 
    glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
 

progs/demos/texdown.c

@@ -1,387 +0,0 @@
-/* $Id: texdown.c,v 1.4 2001/02/07 03:04:58 gareth Exp $ */
-
-/*
- * Copyright (C) 1999  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.
- */
-
-
-/*
- * texdown
- *
- * Measure texture download speed.
- * Use keyboard to change texture size, format, datatype, scale/bias,
- * subimageload, etc.
- *
- * Brian Paul  28 January 2000
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <GL/glut.h>
-
-
-static GLsizei MaxSize = 1024;
-static GLsizei TexWidth = 256, TexHeight = 256, TexBorder = 0;
-static GLboolean ScaleAndBias = GL_FALSE;
-static GLboolean SubImage = GL_FALSE;
-static GLdouble DownloadRate = 0.0;  /* texels/sec */
-
-static GLuint Mode = 0;
-
-
-#define NUM_FORMATS 4
-struct FormatRec {
-   GLenum Format;
-   GLenum Type;
-   GLenum IntFormat;
-   GLint TexelSize;
-};
-
-
-static const struct FormatRec FormatTable[NUM_FORMATS] = {
-  /* Format   Type                         IntFormat   TexelSize */
-   { 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    },
-};
-static GLint Format;
-
-
-static int
-BytesPerTexel(GLint format)
-{
-   return FormatTable[format].TexelSize;
-}
-
-
-static const char *
-FormatStr(GLenum format)
-{
-   switch (format) {
-      case GL_RGB:
-         return "GL_RGB";
-      case GL_RGBA:
-         return "GL_RGBA";
-      default:
-         return "";
-   }
-}
-
-
-static const char *
-TypeStr(GLenum type)
-{
-   switch (type) {
-      case GL_UNSIGNED_BYTE:
-         return "GL_UNSIGNED_BYTE";
-      case GL_UNSIGNED_SHORT:
-         return "GL_UNSIGNED_SHORT";
-      case GL_UNSIGNED_SHORT_5_6_5:
-         return "GL_UNSIGNED_SHORT_5_6_5";
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-         return "GL_UNSIGNED_SHORT_5_6_5_REV";
-      default:
-         return "";
-   }
-}
-
-
-static void
-MeasureDownloadRate(void)
-{
-   const int w = TexWidth + 2 * TexBorder;
-   const int h = TexHeight + 2 * TexBorder;
-   const int bytes = w * h * BytesPerTexel(Format);
-   GLubyte *texImage, *getImage;
-   GLdouble t0, t1, time;
-   int count;
-   int i;
-
-   texImage = (GLubyte *) malloc(bytes);
-   getImage = (GLubyte *) malloc(bytes);
-   if (!texImage || !getImage) {
-      DownloadRate = 0.0;
-      return;
-   }
-
-   for (i = 0; i < bytes; i++) {
-      texImage[i] = i & 0xff;
-   }
-
-   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-   glPixelStorei(GL_PACK_ALIGNMENT, 1);
-
-   if (ScaleAndBias) {
-      glPixelTransferf(GL_RED_SCALE, 0.5);
-      glPixelTransferf(GL_GREEN_SCALE, 0.5);
-      glPixelTransferf(GL_BLUE_SCALE, 0.5);
-      glPixelTransferf(GL_RED_BIAS, 0.5);
-      glPixelTransferf(GL_GREEN_BIAS, 0.5);
-      glPixelTransferf(GL_BLUE_BIAS, 0.5);
-   }
-   else {
-      glPixelTransferf(GL_RED_SCALE, 1.0);
-      glPixelTransferf(GL_GREEN_SCALE, 1.0);
-      glPixelTransferf(GL_BLUE_SCALE, 1.0);
-      glPixelTransferf(GL_RED_BIAS, 0.0);
-      glPixelTransferf(GL_GREEN_BIAS, 0.0);
-      glPixelTransferf(GL_BLUE_BIAS, 0.0);
-   }
-
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-   glEnable(GL_TEXTURE_2D);
-
-   count = 0;
-   t0 = glutGet(GLUT_ELAPSED_TIME) * 0.001;
-   do {
-      if (SubImage && count > 0) {
-         glTexSubImage2D(GL_TEXTURE_2D, 0, -TexBorder, -TexBorder, w, h,
-                         FormatTable[Format].Format,
-                         FormatTable[Format].Type, texImage);
-      }
-      else {
-         glTexImage2D(GL_TEXTURE_2D, 0,
-                      FormatTable[Format].IntFormat, w, h, TexBorder,
-                      FormatTable[Format].Format,
-                      FormatTable[Format].Type, texImage);
-      }
-
-      /* draw a tiny polygon to force texture into texram */
-      glBegin(GL_TRIANGLES);
-      glTexCoord2f(0, 0);     glVertex2f(1, 1);
-      glTexCoord2f(1, 0);     glVertex2f(3, 1);
-      glTexCoord2f(0.5, 1);   glVertex2f(2, 3);
-      glEnd();
-
-      t1 = glutGet(GLUT_ELAPSED_TIME) * 0.001;
-      time = t1 - t0;
-      count++;
-   } while (time < 3.0);
-
-   glDisable(GL_TEXTURE_2D);
-
-   printf("w*h=%d  count=%d  time=%f\n", w*h, count, time);
-   DownloadRate = w * h * count / time;
-
-#if 0
-   if (!ScaleAndBias) {
-      /* verify texture readback */
-      glGetTexImage(GL_TEXTURE_2D, 0,
-                    FormatTable[Format].Format,
-                    FormatTable[Format].Type, getImage);
-      for (i = 0; i < w * h; i++) {
-         if (texImage[i] != getImage[i]) {
-            printf("[%d] %d != %d\n", i, texImage[i], getImage[i]);
-         }
-      }
-   }
-#endif
-
-   free(texImage);
-   free(getImage);
-
-   {
-      GLint err = glGetError();
-      if (err)
-         printf("GL error %d\n", err);
-   }
-}
-
-
-static void
-PrintString(const char *s)
-{
-   while (*s) {
-      glutBitmapCharacter(GLUT_BITMAP_8_BY_13, (int) *s);
-      s++;
-   }
-}
-
-
-static void
-Display(void)
-{
-   const int w = TexWidth + 2 * TexBorder;
-   const int h = TexHeight + 2 * TexBorder;
-   char s[1000];
-
-   glClear(GL_COLOR_BUFFER_BIT);
-
-   glRasterPos2i(10, 80);
-   sprintf(s, "Texture size[cursor]: %d x %d  Border[b]: %d", w, h, TexBorder);
-   PrintString(s);
-
-   glRasterPos2i(10, 65);
-   sprintf(s, "Format[f]: %s  Type: %s  IntFormat: %s",
-           FormatStr(FormatTable[Format].Format),
-           TypeStr(  FormatTable[Format].Type),
-           FormatStr(FormatTable[Format].IntFormat));
-   PrintString(s);
-
-   glRasterPos2i(10, 50);
-   sprintf(s, "Pixel Scale&Bias[p]: %s   TexSubImage[s]: %s",
-           ScaleAndBias ? "Yes" : "No",
-           SubImage ? "Yes" : "No");
-   PrintString(s);
-
-   if (Mode == 0) {
-      glRasterPos2i(200, 10);
-      sprintf(s, "...Measuring...");
-      PrintString(s);
-      glutSwapBuffers();
-      glutPostRedisplay();
-      Mode++;
-   }
-   else if (Mode == 1) {
-      MeasureDownloadRate();
-      glutPostRedisplay();
-      Mode++;
-   }
-   else {
-      /* show results */
-      glRasterPos2i(10, 10);
-      sprintf(s, "Download rate: %g Mtexels/second  %g MB/second",
-              DownloadRate / 1000000.0,
-              DownloadRate * BytesPerTexel(Format) / 1000000.0);
-      PrintString(s);
-      {
-         GLint r, g, b, a, l, i;
-         glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_RED_SIZE, &r);
-         glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_GREEN_SIZE, &g);
-         glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_BLUE_SIZE, &b);
-         glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_ALPHA_SIZE, &a);
-         glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_LUMINANCE_SIZE, &l);
-         glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTENSITY_SIZE, &i);
-         sprintf(s, "TexelBits: R=%d G=%d B=%d A=%d L=%d I=%d", r, g, b, a, l, i);
-         glRasterPos2i(10, 25);
-         PrintString(s);
-      }
-
-      glutSwapBuffers();
-   }
-}
-
-
-static void
-Reshape(int width, int height)
-{
-   glViewport( 0, 0, width, height );
-   glMatrixMode( GL_PROJECTION );
-   glLoadIdentity();
-   glOrtho(0, width, 0, height, -1, 1);
-   glMatrixMode( GL_MODELVIEW );
-   glLoadIdentity();
-}
-
-
-
-static void
-Key(unsigned char key, int x, int y)
-{
-   (void) x;
-   (void) y;
-   switch (key) {
-      case ' ':
-         Mode = 0;
-         break;
-      case 'b':
-         /* toggle border */
-         TexBorder = 1 - TexBorder;
-         Mode = 0;
-         break;
-      case 'f':
-         /* change format */
-         Format = (Format + 1) % NUM_FORMATS;
-         Mode = 0;
-         break;
-      case 'p':
-         /* toggle border */
-         ScaleAndBias = !ScaleAndBias;
-         Mode = 0;
-         break;
-      case 's':
-         SubImage = !SubImage;
-         Mode = 0;
-         break;
-      case 27:
-         exit(0);
-         break;
-   }
-   glutPostRedisplay();
-}
-
-
-static void
-SpecialKey(int key, int x, int y)
-{
-   (void) x;
-   (void) y;
-   switch (key) {
-      case GLUT_KEY_UP:
-         if (TexHeight < MaxSize)
-            TexHeight *= 2;
-         break;
-      case GLUT_KEY_DOWN:
-         if (TexHeight > 1)
-            TexHeight /= 2;
-         break;
-      case GLUT_KEY_LEFT:
-         if (TexWidth > 1)
-            TexWidth /= 2;
-         break;
-      case GLUT_KEY_RIGHT:
-         if (TexWidth < MaxSize)
-            TexWidth *= 2;
-         break;
-   }
-   Mode = 0;
-   glutPostRedisplay();
-}
-
-
-static void
-Init(void)
-{
-   printf("GL_VENDOR = %s\n", (const char *) glGetString(GL_VENDOR));
-   printf("GL_VERSION = %s\n", (const char *) glGetString(GL_VERSION));
-   printf("GL_RENDERER = %s\n", (const char *) glGetString(GL_RENDERER));
-}
-
-
-int
-main(int argc, char *argv[])
-{
-   glutInit( &argc, argv );
-   glutInitWindowPosition( 0, 0 );
-   glutInitWindowSize( 600, 100 );
-   glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH );
-   glutCreateWindow(argv[0]);
-   glutReshapeFunc( Reshape );
-   glutKeyboardFunc( Key );
-   glutSpecialFunc( SpecialKey );
-   glutDisplayFunc( Display );
-   Init();
-   glutMainLoop();
-   return 0;
-}

progs/demos/texenv.c

@@ -1,815 +0,0 @@
-
-/* Copyright (c) Mark J. Kilgard, 1994. */
-
-/**
- * (c) Copyright 1993, Silicon Graphics, Inc.
- * ALL RIGHTS RESERVED
- * Permission to use, copy, modify, and distribute this software for
- * any purpose and without fee is hereby granted, provided that the above
- * copyright notice appear in all copies and that both the copyright notice
- * and this permission notice appear in supporting documentation, and that
- * the name of Silicon Graphics, Inc. not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission.
- *
- * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
- * AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL SILICON
- * GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
- * SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
- * KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
- * LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
- * THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC.  HAS BEEN
- * ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
- * POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * US Government Users Restricted Rights
- * Use, duplication, or disclosure by the Government is subject to
- * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
- * (c)(1)(ii) of the Rights in Technical Data and Computer Software
- * clause at DFARS 252.227-7013 and/or in similar or successor
- * clauses in the FAR or the DOD or NASA FAR Supplement.
- * Unpublished-- rights reserved under the copyright laws of the
- * United States.  Contractor/manufacturer is Silicon Graphics,
- * Inc., 2011 N.  Shoreline Blvd., Mountain View, CA 94039-7311.
- *
- * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
- */
-
-/*
- * Demonstrates texture environment modes and internal image formats.
- */
-
-/*
- * Hacked on, updated by Gareth Hughes <gareth@valinux.com>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <GL/glut.h>
-
-#undef max
-#undef min
-#define max( a, b )	((a) >= (b) ? (a) : (b))
-#define min( a, b )	((a) <= (b) ? (a) : (b))
-
-GLfloat lightCheck[4] = { 0.7, 0.7, 0.7, 1.0 };
-GLfloat darkCheck[4] = { 0.3, 0.3, 0.3, 1.0 };
-
-GLfloat labelColor0[4] = { 1.0, 1.0, 1.0, 1.0 };
-GLfloat labelColor1[4] = { 1.0, 1.0, 0.4, 1.0 };
-GLfloat *labelInfoColor = labelColor0;
-GLfloat labelLevelColor0[4] = { 0.8, 0.8, 0.1, 1.0 };
-GLfloat labelLevelColor1[4] = { 0.0, 0.0, 0.0, 1.0 };
-
-GLboolean doubleBuffered = GL_TRUE;
-GLboolean drawBackground = GL_FALSE;
-GLboolean drawBlended = GL_TRUE;
-GLboolean drawSmooth = GL_FALSE;
-GLboolean drawTextured = GL_TRUE;
-GLboolean displayLevelInfo = GL_FALSE;
-
-int textureWidth = 64;
-int textureHeight = 64;
-
-int winWidth = 580, winHeight = 720;
-
-struct formatInfo {
-   GLenum	baseFormat;
-   GLenum	internalFormat;
-   char		*name;
-};
-
-#define NUM_LUMINANCE_FORMATS	(sizeof(luminanceFormats) / sizeof(luminanceFormats[0]))
-struct formatInfo luminanceFormats[] =
-{
-   { GL_LUMINANCE, GL_LUMINANCE, "LUMINANCE" },
-   { GL_LUMINANCE, GL_LUMINANCE4, "LUMINANCE4" },
-   { GL_LUMINANCE, GL_LUMINANCE8, "LUMINANCE8" },
-   { GL_LUMINANCE, GL_LUMINANCE12, "LUMINANCE12" },
-   { GL_LUMINANCE, GL_LUMINANCE16, "LUMINANCE16" },
-};
-
-#define NUM_ALPHA_FORMATS	(sizeof(alphaFormats) / sizeof(alphaFormats[0]))
-struct formatInfo alphaFormats[] =
-{
-   { GL_ALPHA, GL_ALPHA, "ALPHA" },
-   { GL_ALPHA, GL_ALPHA4, "ALPHA4" },
-   { GL_ALPHA, GL_ALPHA8, "ALPHA8" },
-   { GL_ALPHA, GL_ALPHA12, "ALPHA12" },
-   { GL_ALPHA, GL_ALPHA16, "ALPHA16" },
-};
-
-#define NUM_INTENSITY_FORMATS	(sizeof(intensityFormats) / sizeof(intensityFormats[0]))
-struct formatInfo intensityFormats[] =
-{
-   { GL_INTENSITY, GL_INTENSITY, "INTENSITY" },
-   { GL_INTENSITY, GL_INTENSITY4, "INTENSITY4" },
-   { GL_INTENSITY, GL_INTENSITY8, "INTENSITY8" },
-   { GL_INTENSITY, GL_INTENSITY12, "INTENSITY12" },
-   { GL_INTENSITY, GL_INTENSITY16, "INTENSITY16" },
-};
-
-#define NUM_LUMINANCE_ALPHA_FORMATS	(sizeof(luminanceAlphaFormats) / sizeof(luminanceAlphaFormats[0]))
-struct formatInfo luminanceAlphaFormats[] =
-{
-   { GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, "LUMINANCE_ALPHA" },
-   { GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, "LUMINANCE4_ALPHA4" },
-   { GL_LUMINANCE_ALPHA, GL_LUMINANCE6_ALPHA2, "LUMINANCE6_ALPHA2" },
-   { GL_LUMINANCE_ALPHA, GL_LUMINANCE8_ALPHA8, "LUMINANCE8_ALPHA8" },
-   { GL_LUMINANCE_ALPHA, GL_LUMINANCE12_ALPHA4, "LUMINANCE12_ALPHA4" },
-   { GL_LUMINANCE_ALPHA, GL_LUMINANCE12_ALPHA12, "LUMINANCE12_ALPHA12" },
-   { GL_LUMINANCE_ALPHA, GL_LUMINANCE16_ALPHA16, "LUMINANCE16_ALPHA16" },
-};
-
-#define NUM_RGB_FORMATS		(sizeof(rgbFormats) / sizeof(rgbFormats[0]))
-struct formatInfo rgbFormats[] =
-{
-   { GL_RGB, GL_RGB, "RGB" },
-   { GL_RGB, GL_R3_G3_B2, "R3_G3_B2" },
-   { GL_RGB, GL_RGB4, "RGB4" },
-   { GL_RGB, GL_RGB5, "RGB5" },
-   { GL_RGB, GL_RGB8, "RGB8" },
-   { GL_RGB, GL_RGB10, "RGB10" },
-   { GL_RGB, GL_RGB12, "RGB12" },
-   { GL_RGB, GL_RGB16, "RGB16" },
-};
-
-#define NUM_RGBA_FORMATS	(sizeof(rgbaFormats) / sizeof(rgbaFormats[0]))
-struct formatInfo rgbaFormats[] =
-{
-   { GL_RGBA, GL_RGBA, "RGBA" },
-   { GL_RGBA, GL_RGBA2, "RGBA2" },
-   { GL_RGBA, GL_RGBA4, "RGBA4" },
-   { GL_RGBA, GL_RGB5_A1, "RGB5_A1" },
-   { GL_RGBA, GL_RGBA8, "RGBA8" },
-   { GL_RGBA, GL_RGB10_A2, "RGB10_A2" },
-   { GL_RGBA, GL_RGBA12, "RGBA12" },
-   { GL_RGBA, GL_RGBA16, "RGBA16" },
-};
-
-struct baseFormatInfo {
-   struct	formatInfo *format;
-   int		current, number;
-};
-
-#define NUM_BASE_FORMATS	(sizeof(baseFormats) / sizeof(baseFormats[0]))
-int baseFormat;
-struct baseFormatInfo baseFormats[] =
-{
-   { luminanceFormats, 0, NUM_LUMINANCE_FORMATS },
-   { alphaFormats, 0, NUM_ALPHA_FORMATS },
-   { intensityFormats, 0, NUM_INTENSITY_FORMATS },
-   { luminanceAlphaFormats, 0, NUM_LUMINANCE_ALPHA_FORMATS },
-   { rgbFormats, 0, NUM_RGB_FORMATS },
-   { rgbaFormats, 0, NUM_RGBA_FORMATS },
-};
-
-#define NUM_ENV_COLORS		(sizeof(envColors) / sizeof(envColors[0]))
-int envColor;
-GLfloat envColors[][4] =
-{
-   { 0.0, 0.0, 0.0, 1.0 },
-   { 1.0, 0.0, 0.0, 1.0 },
-   { 0.0, 1.0, 0.0, 1.0 },
-   { 0.0, 0.0, 1.0, 1.0 },
-   { 1.0, 1.0, 1.0, 1.0 },
-};
-
-struct envModeInfo {
-   GLenum	mode;
-   char		*name;
-};
-
-/* allow for run-time check for GL_EXT_texture_env_add */
-int NUM_ENV_MODES = 5;
-struct envModeInfo envModes[] =
-{
-   { GL_REPLACE, "REPLACE" },
-   { GL_MODULATE, "MODULATE" },
-   { GL_BLEND, "BLEND" },
-   { GL_DECAL, "DECAL" },
-#if GL_EXT_texture_env_add
-   { GL_ADD, "ADD" },
-#endif
-};
-
-static void checkErrors( void )
-{
-   GLenum error;
-
-   return;
-
-   while ( (error = glGetError()) != GL_NO_ERROR ) {
-      fprintf( stderr, "Error: %s\n", (char *) gluErrorString( error ) );
-   }
-}
-
-static void drawString( const char *string, GLfloat x, GLfloat y,
-                        const GLfloat color[4] )
-{
-   glColor4fv( color );
-   glRasterPos2f( x, y );
-
-   while ( *string ) {
-      glutBitmapCharacter( GLUT_BITMAP_TIMES_ROMAN_10, *string );
-      string++;
-   }
-}
-
-static void drawStringOutline( const char *string, GLfloat x, GLfloat y,
-			       const GLfloat color[4],
-                               const GLfloat outline[4] )
-{
-   drawString( string, x - 1, y, outline );
-   drawString( string, x + 1, y, outline );
-   drawString( string, x, y - 1, outline );
-   drawString( string, x, y + 1, outline );
-   drawString( string, x, y, color );
-}
-
-static void begin2D( int width, int height )
-{
-   glMatrixMode( GL_PROJECTION );
-
-   glPushMatrix();
-   glLoadIdentity();
-
-   glOrtho( 0, width, 0, height, -1, 1 );
-   glMatrixMode( GL_MODELVIEW );
-
-   glPushMatrix();
-   glLoadIdentity();
-}
-
-static void end2D( void )
-{
-   glMatrixMode( GL_PROJECTION );
-   glPopMatrix();
-   glMatrixMode( GL_MODELVIEW );
-   glPopMatrix();
-}
-
-static void initialize( void )
-{
-   glMatrixMode( GL_PROJECTION );
-   glLoadIdentity();
-
-   glOrtho( -1.5, 1.5, -1.5, 1.5, -1.5, 1.5 );
-
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-
-   glShadeModel( GL_FLAT );
-}
-
-/* ARGSUSED1 */
-static void keyboard( unsigned char c, int x, int y )
-{
-   switch ( c ) {
-   case 'c':
-      envColor = ++envColor % (int) NUM_ENV_COLORS;
-      break;
-   case 'g':
-      drawBackground = !drawBackground;
-      break;
-   case 'b':
-      drawBlended = !drawBlended;
-      break;
-   case 's':
-      drawSmooth = !drawSmooth;
-      break;
-   case 't':
-      drawTextured = !drawTextured;
-      break;
-   case 'i':
-      displayLevelInfo = !displayLevelInfo;
-      break;
-   case 27:             /* Escape key should force exit. */
-      exit(0);
-      break;
-   default:
-      break;
-   }
-   glutPostRedisplay();
-}
-
-/* ARGSUSED1 */
-static void special( int key, int x, int y )
-{
-   switch ( key ) {
-   case GLUT_KEY_DOWN:
-      if ( ++baseFormat > NUM_BASE_FORMATS - 1 ) {
-	 baseFormat = 0;
-      }
-      break;
-   case GLUT_KEY_UP:
-      if ( --baseFormat < 0 ) {
-	 baseFormat = NUM_BASE_FORMATS - 1;
-      }
-      break;
-   case GLUT_KEY_LEFT:
-      --baseFormats[baseFormat].current;
-      if ( baseFormats[baseFormat].current < 0 ) {
-	 baseFormats[baseFormat].current = baseFormats[baseFormat].number - 1;
-      }
-      break;
-   case GLUT_KEY_RIGHT:
-      ++baseFormats[baseFormat].current;
-      if ( baseFormats[baseFormat].current > baseFormats[baseFormat].number - 1 ) {
-	 baseFormats[baseFormat].current = 0;
-      }
-      break;
-   default:
-      break;
-   }
-   glutPostRedisplay();
-}
-
-static void
-reshape( int w, int h )
-{
-   winWidth = w;
-   winHeight = h;
-   /* No need to call glViewPort here since "draw" calls it! */
-}
-
-static void loadTexture( int width, int height,
-                         const struct formatInfo *format )
-{
-   int		luminanceSize = 0;
-   int		alphaSize = 0;
-   int		rgbSize = 0;
-   GLenum	textureFormat;
-   GLubyte	*texImage, *p;
-   int		elementsPerGroup, elementSize, groupSize, rowSize;
-   int		i, j;
-
-   switch ( format->baseFormat ) {
-   case GL_LUMINANCE:
-      luminanceSize = 1;
-      textureFormat = GL_LUMINANCE;
-      break;
-   case GL_INTENSITY:
-      luminanceSize = 1;
-      textureFormat = GL_INTENSITY;
-      break;
-   case GL_ALPHA:
-      alphaSize = 1;
-      textureFormat = GL_ALPHA;
-      break;
-   case GL_LUMINANCE_ALPHA:
-      luminanceSize = 1;
-      alphaSize = 1;
-      textureFormat = GL_LUMINANCE_ALPHA;
-      break;
-   case GL_RGB:
-      rgbSize = 3;
-      textureFormat = GL_RGB;
-      break;
-   case GL_RGBA:
-      rgbSize = 3;
-      alphaSize = 1;
-      textureFormat = GL_RGBA;
-      break;
-   default:
-      fprintf(stderr, "bad internal format info\n");
-      return;
-   }
-
-   elementsPerGroup = luminanceSize + alphaSize + rgbSize;
-   elementSize = sizeof(GLubyte);
-   groupSize = elementsPerGroup * elementSize;
-   rowSize = width * groupSize;
-
-   if ( (texImage = (GLubyte *) malloc( height * rowSize ) ) == NULL ) {
-      fprintf( stderr, "texture malloc failed\n" );
-      return;
-   }
-
-   for ( i = 0 ; i < height ; i++ )
-   {
-      p = texImage + i * rowSize;
-
-      for ( j = 0 ; j < width ; j++ )
-      {
-	 if ( luminanceSize > 0 )
-	 {
-	    /**
-	     ** +-----+-----+
-	     ** |     |     |
-	     ** |  W  | LG  |
-	     ** |     |     |
-	     ** +-----+-----+
-	     ** |     |     |
-	     ** | DG  |  B  |
-	     ** |     |     |
-	     ** +-----+-----+
-	     **/
-	    if ( i > height / 2 ) {
-	       if ( j < width / 2 ) {
-		  p[0] = 0xff;
-	       } else {
-		  p[0] = 0xaa;
-	       }
-	    } else {
-	       if ( j < width / 2 ) {
-		  p[0] = 0x55;
-	       } else {
-		  p[0] = 0x00;
-	       }
-	    }
-	    p += elementSize;
-	 }
-
-	 if ( rgbSize > 0 )
-	 {
-	    /**
-	     ** +-----+-----+
-	     ** |     |     |
-	     ** |  R  |  G  |
-	     ** |     |     |
-	     ** +-----+-----+
-	     ** |     |     |
-	     ** |  Y  |  B  |
-	     ** |     |     |
-	     ** +-----+-----+
-	     **/
-	    if ( i > height / 2 ) {
-	       if ( j < width / 2 ) {
-		  p[0] = 0xff;
-		  p[1] = 0x00;
-		  p[2] = 0x00;
-	       } else {
-		  p[0] = 0x00;
-		  p[1] = 0xff;
-		  p[2] = 0x00;
-	       }
-	    } else {
-	       if ( j < width / 2 ) {
-		  p[0] = 0xff;
-		  p[1] = 0xff;
-		  p[2] = 0x00;
-	       } else {
-		  p[0] = 0x00;
-		  p[1] = 0x00;
-		  p[2] = 0xff;
-	       }
-	    }
-	    p += 3 * elementSize;
-	 }
-
-	 if ( alphaSize > 0 )
-	 {
-	    /**
-	     ** +-----------+
-	     ** |     W     |
-	     ** |  +-----+  |
-	     ** |  |     |  |
-	     ** |  |  B  |  |
-	     ** |  |     |  |
-	     ** |  +-----+  |
-	     ** |           |
-	     ** +-----------+
-	     **/
-	    int i2 = i - height / 2;
-	    int j2 = j - width / 2;
-	    int h8 = height / 8;
-	    int w8 = width / 8;
-	    if ( -h8 <= i2 && i2 <= h8 && -w8 <= j2 && j2 <= w8 ) {
-	       p[0] = 0x00;
-	    } else if ( -2 * h8 <= i2 && i2 <= 2 * h8 && -2 * w8 <= j2 && j2 <= 2 * w8 ) {
-	       p[0] = 0x55;
-	    } else if ( -3 * h8 <= i2 && i2 <= 3 * h8 && -3 * w8 <= j2 && j2 <= 3 * w8 ) {
-	       p[0] = 0xaa;
-	    } else {
-	       p[0] = 0xff;
-	    }
-	    p += elementSize;
-	 }
-      }
-   }
-
-   glTexImage2D( GL_TEXTURE_2D, 0,
-		 format->internalFormat, width, height, 0,
-		 textureFormat, GL_UNSIGNED_BYTE, texImage );
-
-   free( texImage );
-}
-
-static void drawCheck( int w, int h, const GLfloat lightCheck[4],
-                       const GLfloat darkCheck[4] )
-{
-   float	dw = 2.0 / w;
-   float	dh = 2.0 / h;
-   int		i, j;
-
-   for ( i = 0 ; i < w ; i++ ) {
-      GLfloat x0 = -1.0 + i * dw;
-      GLfloat x1 = x0 + dw;
-
-      glBegin( GL_QUAD_STRIP );
-
-      for ( j = 0 ; j <= h ; j++ ) {
-	 GLfloat y = -1.0 + j * dh;
-
-	 if ( (i ^ j) & 1 ) {
-	    glColor4fv( lightCheck );
-	 } else {
-	    glColor4fv( darkCheck );
-	 }
-
-	 glVertex2f( x0, y );
-	 glVertex2f( x1, y );
-      }
-
-      glEnd();
-   }
-}
-
-static const char *lookupFormat( GLint format )
-{
-   switch ( format ) {
-   case GL_RGBA:
-      return "GL_RGBA";
-   case GL_RGB:
-      return "GL_RGB";
-   case GL_ALPHA:
-      return "GL_ALPHA";
-   case GL_LUMINANCE:
-      return "GL_LUMINANCE";
-   case GL_LUMINANCE_ALPHA:
-      return "GL_LUMINANCE_ALPHA";
-   case GL_INTENSITY:
-      return "GL_INTENSITY";
-   case GL_COLOR_INDEX:
-      return "GL_COLOR_INDEX";
-   case GL_BGRA:
-      return "GL_BGRA";
-   case GL_BGR:
-      return "GL_BGR";
-   default:
-      return "unknown format";
-   }
-}
-
-static void drawSample( int x, int y, int w, int h,
-			const struct formatInfo *format,
-                        const struct envModeInfo *envMode )
-{
-   glViewport( x, y, w, h );
-   glScissor( x, y, w, h );
-
-   glClearColor( 0.1, 0.1, 0.1, 1.0 );
-   glClear( GL_COLOR_BUFFER_BIT );
-
-   begin2D( w, h );
-   drawString( format->name, 10, h - 15, labelInfoColor );
-   drawString( envMode->name, 10, 5, labelInfoColor );
-   end2D();
-
-   glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, envMode->mode );
-   glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, envColors[envColor] );
-
-   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
-   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
-
-   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
-   glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP );
-
-   loadTexture( textureWidth, textureHeight, format );
-
-   if ( drawBackground ) {
-      drawCheck( 15, 15, lightCheck, darkCheck );
-   }
-   if ( drawBlended ) {
-      glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
-      glEnable( GL_BLEND );
-   }
-   if ( drawSmooth ) {
-      glShadeModel( GL_SMOOTH );
-   }
-   else {
-      glShadeModel( GL_FLAT );
-      glColor4f(1, 1, 1, 1);
-   }
-   if ( drawTextured ) {
-      glEnable( GL_TEXTURE_2D );
-   }
-
-   /*
-    * if (drawSmooth) then draw quad which goes from purple at the
-    * bottom (100% alpha) to green at the top (50% alpha).
-    */
-   glBegin( GL_QUADS );
-      if ( drawSmooth )  glColor4f( 1.0, 0.0, 1.0, 1.0 );
-      glTexCoord2f( 0.0, 0.0 );
-      glVertex2f( -0.8, -0.8 );
-
-      if ( drawSmooth )  glColor4f( 1.0, 0.0, 1.0, 1.0 );
-      glTexCoord2f( 1.0, 0.0 );
-      glVertex2f( 0.8, -0.8 );
-
-      if ( drawSmooth )  glColor4f( 0.0, 1.0, 0.0, 0.5 );
-      glTexCoord2f( 1.0, 1.0 );
-      glVertex2f( 0.8, 0.8 );
-
-      if ( drawSmooth )  glColor4f( 0.0, 1.0, 0.0, 0.5 );
-      glTexCoord2f( 0.0, 1.0 );
-      glVertex2f( -0.8, 0.8 );
-   glEnd();
-
-   glDisable( GL_BLEND );
-   glShadeModel( GL_FLAT );
-   glDisable( GL_TEXTURE_2D );
-
-   if ( envMode->mode == GL_DECAL &&
-        (format->baseFormat == GL_ALPHA ||
-         format->baseFormat == GL_LUMINANCE ||
-         format->baseFormat == GL_LUMINANCE_ALPHA ||
-         format->baseFormat == GL_INTENSITY)) {
-      /* undefined format/mode combination */
-      begin2D( w, h );
-      drawStringOutline( "UNDEFINED MODE", 15, h / 2,
-                         labelLevelColor0, labelLevelColor1 );
-      end2D();
-   }
-   else if ( displayLevelInfo ) {
-      GLint width, height, border, format;
-      GLint redSize, greenSize, blueSize, alphaSize;
-      GLint luminanceSize, intensitySize;
-      char buf[255];
-
-      glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width );
-      glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height );
-      glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_BORDER, &border );
-      glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &format );
-      glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_RED_SIZE, &redSize );
-      glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_GREEN_SIZE, &greenSize );
-      glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_BLUE_SIZE, &blueSize );
-      glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_ALPHA_SIZE, &alphaSize );
-      glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_LUMINANCE_SIZE, &luminanceSize );
-      glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_INTENSITY_SIZE, &intensitySize );
-
-      begin2D( w, h );
-      sprintf( buf, "dimensions: %d x %d", width, height );
-      drawStringOutline( buf, 15, h / 2 + 20, labelLevelColor0, labelLevelColor1 );
-
-      sprintf( buf, "border: %d", border );
-      drawStringOutline( buf, 15, h / 2 + 10, labelLevelColor0, labelLevelColor1 );
-
-      sprintf( buf, "internal format:" );
-      drawStringOutline( buf, 15, h / 2, labelLevelColor0, labelLevelColor1 );
-
-      sprintf( buf, "  %s",  lookupFormat( format ) );
-      drawStringOutline( buf, 15, h / 2 - 10, labelLevelColor0, labelLevelColor1 );
-
-      sprintf( buf, "sizes:" );
-      drawStringOutline( buf, 15, h / 2 - 20, labelLevelColor0, labelLevelColor1 );
-
-      sprintf( buf, "  %d / %d / %d / %d / %d / %d",
-	       redSize, greenSize, blueSize, alphaSize,
-	       luminanceSize, intensitySize );
-      drawStringOutline( buf, 15, h / 2 - 30, labelLevelColor0, labelLevelColor1 );
-
-      end2D();
-   }
-}
-
-static void display( void )
-{
-   int		numX = NUM_ENV_MODES, numY = NUM_BASE_FORMATS;
-   float	xBase = (float) winWidth * 0.01;
-   float	xOffset = (winWidth - xBase) / numX;
-   float	xSize = max( xOffset - xBase, 1 );
-   float	yBase = (float) winHeight * 0.01;
-   float	yOffset = (winHeight - yBase) / numY;
-   float	ySize = max( yOffset - yBase, 1 );
-   float	x, y;
-   int		i, j;
-
-   glViewport( 0, 0, winWidth, winHeight );
-   glDisable( GL_SCISSOR_TEST );
-   glClearColor( 0.0, 0.0, 0.0, 0.0 );
-   glClear( GL_COLOR_BUFFER_BIT );
-   glEnable( GL_SCISSOR_TEST );
-
-   x = xBase;
-   y = (winHeight - 1) - yOffset;
-
-   for ( i = 0 ; i < NUM_BASE_FORMATS ; i++ )
-   {
-      struct formatInfo *format;
-
-      if ( i == baseFormat ) {
-	 labelInfoColor = labelColor1;
-      } else {
-	 labelInfoColor = labelColor0;
-      }
-
-      format = &baseFormats[i].format[baseFormats[i].current];
-
-      for ( j = 0 ; j < NUM_ENV_MODES ; j++ ) {
-	 struct envModeInfo *envMode;
-
-	 envMode = &envModes[j];
-	 drawSample( x, y, xSize, ySize, format, envMode );
-	 x += xOffset;
-      }
-
-      x = xBase;
-      y -= yOffset;
-   }
-
-   if ( doubleBuffered ) {
-      glutSwapBuffers();
-   } else {
-      glFlush();
-   }
-
-   checkErrors();
-}
-
-static void usage( char *name )
-{
-   fprintf( stderr, "usage: %s [ options ]\n", name );
-   fprintf( stderr, "\n" );
-   fprintf( stderr, "options:\n" );
-   fprintf( stderr, "    -sb    single buffered\n" );
-   fprintf( stderr, "    -db    double buffered\n" );
-   fprintf( stderr, "    -info  print OpenGL driver info\n" );
-}
-
-static void instructions( void )
-{
-   fprintf( stderr, "texenv - texture environment and internal format test\n" );
-   fprintf( stderr, "\n" );
-   fprintf( stderr, "  [c] - cycle through background colors\n" );
-   fprintf( stderr, "  [g] - toggle background\n" );
-   fprintf( stderr, "  [b] - toggle blend\n" );
-   fprintf( stderr, "  [s] - toggle smooth shading\n" );
-   fprintf( stderr, "  [t] - toggle texturing\n" );
-   fprintf( stderr, "  [i] - toggle information display\n" );
-   fprintf( stderr, "  up/down - select row\n" );
-   fprintf( stderr, "  left/right - change row's internal format\n" );
-}
-
-int main( int argc, char *argv[] )
-{
-   GLboolean info = GL_FALSE;
-   int i;
-
-   glutInit( &argc, argv );
-
-   for ( i = 1 ; i < argc ; i++ ) {
-      if ( !strcmp( "-sb", argv[i] ) ) {
-	 doubleBuffered = GL_FALSE;
-      } else if ( !strcmp( "-db", argv[i] ) ) {
-	 doubleBuffered = GL_TRUE;
-      } else if ( !strcmp( "-info", argv[i] ) ) {
-	 info = GL_TRUE;
-      } else {
-	 usage( argv[0] );
-	 exit( 1 );
-      }
-   }
-
-   if ( doubleBuffered ) {
-      glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
-   } else {
-      glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE );
-   }
-
-   glutInitWindowSize( winWidth, winHeight );
-   glutInitWindowPosition( 0, 0 );
-   glutCreateWindow( "Texture Environment Test" );
-
-   initialize();
-   instructions();
-
-   if ( info ) {
-      printf( "\n" );
-      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 ) );
-   }
-
-#if GL_EXT_texture_env_add
-   if ( !glutExtensionSupported( "GL_EXT_texture_env_add" ) ) {
-      fprintf( stderr, "missing extension: GL_EXT_texture_env_add\n" );
-      NUM_ENV_MODES--;
-   }
-#endif
-
-   glutDisplayFunc( display );
-   glutReshapeFunc( reshape );
-   glutKeyboardFunc( keyboard );
-   glutSpecialFunc( special );
-   glutMainLoop();
-
-   return 0;
-}

progs/demos/texobj.c

@@ -1,4 +1,4 @@
-/* $Id: texobj.c,v 1.5 2000/07/19 23:57:24 brianp Exp $ */
+/* $Id: texobj.c,v 1.1.1.1.2.2 2000/03/01 03:36:35 brianp Exp $ */
 
 /*
  * Example of using the 1.1 texture object functions.
@@ -7,6 +7,27 @@
  * Brian Paul   June 1996   This file is in the public domain.
  */
 
+
+/*
+ * $Log: texobj.c,v $
+ * Revision 1.1.1.1.2.2  2000/03/01 03:36:35  brianp
+ * test for GL 1.2
+ *
+ * Revision 1.1.1.1.2.1  2000/02/25 23:24:28  brianp
+ * fixed bug when using display lists
+ *
+ * Revision 1.1.1.1  1999/08/19 00:55:40  jtg
+ * Imported sources
+ *
+ * Revision 3.1  1999/03/28 18:24:37  brianp
+ * minor clean-up
+ *
+ * Revision 3.0  1998/02/14 18:42:29  brianp
+ * initial rev
+ *
+ */
+
+
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
@@ -16,7 +37,7 @@ static GLuint Window = 0;
 
 static GLuint TexObj[2];
 static GLfloat Angle = 0.0f;
-static GLboolean UseObj = GL_FALSE;
+static GLboolean HaveTexObj = GL_FALSE;
 
 
 #if defined(GL_VERSION_1_1) || defined(GL_VERSION_1_2)
@@ -43,7 +64,7 @@ static void draw( void )
    glPushMatrix();
    glTranslatef( -1.0, 0.0, 0.0 );
    glRotatef( Angle, 0.0, 0.0, 1.0 );
-   if (UseObj) {
+   if (HaveTexObj) {
 #ifdef TEXTURE_OBJECT
       glBindTexture( GL_TEXTURE_2D, TexObj[0] );
 #endif
@@ -63,7 +84,7 @@ static void draw( void )
    glPushMatrix();
    glTranslatef( 1.0, 0.0, 0.0 );
    glRotatef( Angle-90.0, 0.0, 1.0, 0.0 );
-   if (UseObj) {
+   if (HaveTexObj) {
 #ifdef TEXTURE_OBJECT
       glBindTexture( GL_TEXTURE_2D, TexObj[1] );
 #endif
@@ -159,7 +180,7 @@ static void init( void )
 
 
    /* generate texture object IDs */
-   if (UseObj) {
+   if (HaveTexObj) {
 #ifdef TEXTURE_OBJECT
       glGenTextures( 2, TexObj );
 #endif
@@ -170,7 +191,7 @@ static void init( void )
    }
 
    /* setup first texture object */
-   if (UseObj) {
+   if (HaveTexObj) {
 #ifdef TEXTURE_OBJECT
       glBindTexture( GL_TEXTURE_2D, TexObj[0] );
 #endif
@@ -197,13 +218,13 @@ static void init( void )
    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
-   if (!UseObj) {
+   if (!HaveTexObj) {
       glEndList();
    }
    /* end of texture object */
 
    /* setup second texture object */
-   if (UseObj) {
+   if (HaveTexObj) {
 #ifdef TEXTURE_OBJECT
       glBindTexture( GL_TEXTURE_2D, TexObj[1] );
 #endif
@@ -229,7 +250,7 @@ static void init( void )
    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
-   if (!UseObj) {
+   if (!HaveTexObj) {
       glEndList();
    }
    /* end texture object */
@@ -240,7 +261,6 @@ static void init( void )
 
 int main( int argc, char *argv[] )
 {
-   glutInit(&argc, argv);
    glutInitWindowPosition(0, 0);
    glutInitWindowSize(300, 300);
    glutInitDisplayMode( GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE );
@@ -260,7 +280,7 @@ int main( int argc, char *argv[] )
       if (   strstr( exten, "GL_EXT_texture_object" )
           || strncmp( version, "1.1", 3 )==0
           || strncmp( version, "1.2", 3 )==0 ) {
-         UseObj = GL_TRUE;
+         HaveTexObj = GL_TRUE;
       }
    }
 #endif

progs/demos/trispd.c

@@ -1,4 +1,4 @@
-/* $Id: trispd.c,v 1.2 2000/10/26 15:26:14 brianp Exp $ */
+/* $Id: trispd.c,v 1.1 1999/08/19 00:55:40 jtg Exp $ */
 
 /*
  * Simple GLUT program to measure triangle strip rendering speed.
@@ -7,11 +7,8 @@
 
 /*
  * $Log: trispd.c,v $
- * Revision 1.2  2000/10/26 15:26:14  brianp
- * added a glFinish() call
- *
- * Revision 1.1.1.1  1999/08/19 00:55:40  jtg
- * Imported sources
+ * Revision 1.1  1999/08/19 00:55:40  jtg
+ * Initial revision
  *
  * Revision 3.4  1999/03/28 18:24:37  brianp
  * minor clean-up
@@ -110,7 +107,6 @@ static void Display( void )
 	 }
       }
    }
-   glFinish();
    t1 = glutGet(GLUT_ELAPSED_TIME) * 0.001;
    
    if (t1-t0 < MinPeriod) {

progs/demos/tunnel.c

@@ -1,528 +0,0 @@
-/*
- * This program is under the GNU GPL.
- * Use at your own risk.
- *
- * written by David Bucciarelli (tech.hmw@plus.it)
- *            Humanware s.r.l.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <time.h>
-
-#ifdef WIN32
-#include <windows.h>
-#endif
-
-#include <GL/glut.h>
-#include "readtex.c"
-#include "tunneldat.h"
-
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen = 1;
-#endif
-
-static int WIDTH = 640;
-static int HEIGHT = 480;
-
-static GLint T0 = 0;
-static GLint Frames = 0;
-static GLint NiceFog = 1;
-
-#define NUMBLOC 5
-
-#ifndef M_PI
-#define M_PI 3.1415926535
-#endif
-
-/*
-extern int striplength_skin_13[];
-extern float stripdata_skin_13[];
-
-extern int striplength_skin_12[];
-extern float stripdata_skin_12[];
-
-extern int striplength_skin_11[];
-extern float stripdata_skin_11[];
-
-extern int striplength_skin_9[];
-extern float stripdata_skin_9[];
-*/
-
-static int win = 0;
-
-static float obs[3] = { 1000.0, 0.0, 2.0 };
-static float dir[3];
-static float v = 0.5;
-static float alpha = 90.0;
-static float beta = 90.0;
-
-static int fog = 1;
-static int bfcull = 1;
-static int usetex = 1;
-static int cstrip = 0;
-static int help = 1;
-static int joyavailable = 0;
-static int joyactive = 0;
-
-static GLuint t1id, t2id;
-
-static void
-inittextures(void)
-{
-   glGenTextures(1, &t1id);
-   glBindTexture(GL_TEXTURE_2D, t1id);
-
-   if (!LoadRGBMipmaps("../images/tile.rgb", GL_RGB)) {
-      fprintf(stderr, "Error reading a texture.\n");
-      exit(-1);
-   }
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-		   GL_LINEAR_MIPMAP_LINEAR);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-   glGenTextures(1, &t2id);
-   glBindTexture(GL_TEXTURE_2D, t2id);
-
-   if (!LoadRGBMipmaps("../images/bw.rgb", GL_RGB)) {
-      fprintf(stderr, "Error reading a texture.\n");
-      exit(-1);
-   }
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-		   GL_LINEAR_MIPMAP_LINEAR);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-}
-
-static void
-drawobjs(const int *l, const float *f)
-{
-   int mend, j;
-
-   if (cstrip) {
-      float r = 0.33, g = 0.33, b = 0.33;
-
-      for (; (*l) != 0;) {
-	 mend = *l++;
-
-	 r += 0.33;
-	 if (r > 1.0) {
-	    r = 0.33;
-	    g += 0.33;
-	    if (g > 1.0) {
-	       g = 0.33;
-	       b += 0.33;
-	       if (b > 1.0)
-		  b = 0.33;
-	    }
-	 }
-
-	 glColor3f(r, g, b);
-	 glBegin(GL_TRIANGLE_STRIP);
-	 for (j = 0; j < mend; j++) {
-	    f += 4;
-	    glTexCoord2fv(f);
-	    f += 2;
-	    glVertex3fv(f);
-	    f += 3;
-	 }
-	 glEnd();
-      }
-   }
-   else
-      for (; (*l) != 0;) {
-	 mend = *l++;
-
-	 glBegin(GL_TRIANGLE_STRIP);
-	 for (j = 0; j < mend; j++) {
-	    glColor4fv(f);
-	    f += 4;
-	    glTexCoord2fv(f);
-	    f += 2;
-	    glVertex3fv(f);
-	    f += 3;
-	 }
-	 glEnd();
-      }
-}
-
-static void
-calcposobs(void)
-{
-   dir[0] = sin(alpha * M_PI / 180.0);
-   dir[1] = cos(alpha * M_PI / 180.0) * sin(beta * M_PI / 180.0);
-   dir[2] = cos(beta * M_PI / 180.0);
-
-   if (dir[0] < 1.0e-5 && dir[0] > -1.0e-5)
-      dir[0] = 0;
-   if (dir[1] < 1.0e-5 && dir[1] > -1.0e-5)
-      dir[1] = 0;
-   if (dir[2] < 1.0e-5 && dir[2] > -1.0e-5)
-      dir[2] = 0;
-
-   obs[0] += v * dir[0];
-   obs[1] += v * dir[1];
-   obs[2] += v * dir[2];
-}
-
-static void
-special(int k, int x, int y)
-{
-   switch (k) {
-   case GLUT_KEY_LEFT:
-      alpha -= 2.0;
-      break;
-   case GLUT_KEY_RIGHT:
-      alpha += 2.0;
-      break;
-   case GLUT_KEY_DOWN:
-      beta -= 2.0;
-      break;
-   case GLUT_KEY_UP:
-      beta += 2.0;
-      break;
-   }
-}
-
-static void
-key(unsigned char k, int x, int y)
-{
-   switch (k) {
-   case 27:
-      exit(0);
-      break;
-
-   case 'a':
-      v += 0.01;
-      break;
-   case 'z':
-      v -= 0.01;
-      break;
-
-#ifdef XMESA
-   case ' ':
-      fullscreen = (!fullscreen);
-      XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
-      break;
-#endif
-   case 'j':
-      joyactive = (!joyactive);
-      break;
-   case 'h':
-      help = (!help);
-      break;
-   case 'f':
-      fog = (!fog);
-      break;
-   case 't':
-      usetex = (!usetex);
-      break;
-   case 'b':
-      if (bfcull) {
-	 glDisable(GL_CULL_FACE);
-	 bfcull = 0;
-      }
-      else {
-	 glEnable(GL_CULL_FACE);
-	 bfcull = 1;
-      }
-      break;
-   case 'm':
-      cstrip = (!cstrip);
-      break;
-
-   case 'd':
-      fprintf(stderr, "Deleting textures...\n");
-      glDeleteTextures(1, &t1id);
-      glDeleteTextures(1, &t2id);
-      fprintf(stderr, "Loading textures...\n");
-      inittextures();
-      fprintf(stderr, "Done.\n");
-      break;
-   case 'n':
-      NiceFog = !NiceFog;
-      printf("NiceFog %d\n", NiceFog);
-      break;
-   }
-   glutPostRedisplay();
-}
-
-static void
-reshape(int w, int h)
-{
-   WIDTH = w;
-   HEIGHT = h;
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   gluPerspective(80.0, w / (float) h, 1.0, 50.0);
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-   glViewport(0, 0, w, h);
-}
-
-static void
-printstring(void *font, char *string)
-{
-   int len, i;
-
-   len = (int) strlen(string);
-   for (i = 0; i < len; i++)
-      glutBitmapCharacter(font, string[i]);
-}
-
-static void
-printhelp(void)
-{
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-   glColor4f(0.0, 0.0, 0.0, 0.5);
-   glRecti(40, 40, 600, 440);
-
-   glColor3f(1.0, 0.0, 0.0);
-   glRasterPos2i(300, 420);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Help");
-
-   glRasterPos2i(60, 390);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Togle Help");
-   glRasterPos2i(60, 360);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "t - Togle Textures");
-   glRasterPos2i(60, 330);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Togle Fog");
-   glRasterPos2i(60, 300);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "m - Togle strips");
-   glRasterPos2i(60, 270);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "b - Togle Back face culling");
-   glRasterPos2i(60, 240);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Arrow Keys - Rotate");
-   glRasterPos2i(60, 210);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "a - Increase velocity");
-   glRasterPos2i(60, 180);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "z - Decrease velocity");
-
-   glRasterPos2i(60, 150);
-   if (joyavailable)
-      printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "j - Togle jostick control (Joystick control available)");
-   else
-      printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "(No Joystick control available)");
-}
-
-static void
-dojoy(void)
-{
-#ifdef WIN32
-   static UINT max[2] = { 0, 0 };
-   static UINT min[2] = { 0xffffffff, 0xffffffff }, center[2];
-   MMRESULT res;
-   JOYINFO joy;
-
-   res = joyGetPos(JOYSTICKID1, &joy);
-
-   if (res == JOYERR_NOERROR) {
-      joyavailable = 1;
-
-      if (max[0] < joy.wXpos)
-	 max[0] = joy.wXpos;
-      if (min[0] > joy.wXpos)
-	 min[0] = joy.wXpos;
-      center[0] = (max[0] + min[0]) / 2;
-
-      if (max[1] < joy.wYpos)
-	 max[1] = joy.wYpos;
-      if (min[1] > joy.wYpos)
-	 min[1] = joy.wYpos;
-      center[1] = (max[1] + min[1]) / 2;
-
-      if (joyactive) {
-	 if (fabs(center[0] - (float) joy.wXpos) > 0.1 * (max[0] - min[0]))
-	    alpha -=
-	       2.0 * (center[0] - (float) joy.wXpos) / (max[0] - min[0]);
-	 if (fabs(center[1] - (float) joy.wYpos) > 0.1 * (max[1] - min[1]))
-	    beta += 2.0 * (center[1] - (float) joy.wYpos) / (max[1] - min[1]);
-
-	 if (joy.wButtons & JOY_BUTTON1)
-	    v += 0.01;
-	 if (joy.wButtons & JOY_BUTTON2)
-	    v -= 0.01;
-      }
-   }
-   else
-      joyavailable = 0;
-#endif
-}
-
-static void
-draw(void)
-{
-   static char frbuf[80] = "";
-   int i;
-   float base, offset;
-
-   if (NiceFog)
-      glHint(GL_FOG_HINT, GL_NICEST);
-   else
-      glHint(GL_FOG_HINT, GL_DONT_CARE);
-
-   dojoy();
-
-   glClear(GL_COLOR_BUFFER_BIT);
-
-   if (usetex)
-      glEnable(GL_TEXTURE_2D);
-   else
-      glDisable(GL_TEXTURE_2D);
-
-   if (fog)
-      glEnable(GL_FOG);
-   else
-      glDisable(GL_FOG);
-
-   glShadeModel(GL_SMOOTH);
-
-   glPushMatrix();
-   calcposobs();
-   gluLookAt(obs[0], obs[1], obs[2],
-	     obs[0] + dir[0], obs[1] + dir[1], obs[2] + dir[2],
-	     0.0, 0.0, 1.0);
-
-   if (dir[0] > 0) {
-      offset = 8.0;
-      base = obs[0] - fmod(obs[0], 8.0);
-   }
-   else {
-      offset = -8.0;
-      base = obs[0] + (8.0 - fmod(obs[0], 8.0));
-   }
-
-   glPushMatrix();
-   glTranslatef(base - offset / 2.0, 0.0, 0.0);
-   for (i = 0; i < NUMBLOC; i++) {
-      glTranslatef(offset, 0.0, 0.0);
-      glBindTexture(GL_TEXTURE_2D, t1id);
-      drawobjs(striplength_skin_11, stripdata_skin_11);
-      glBindTexture(GL_TEXTURE_2D, t2id);
-      drawobjs(striplength_skin_12, stripdata_skin_12);
-      drawobjs(striplength_skin_9, stripdata_skin_9);
-      drawobjs(striplength_skin_13, stripdata_skin_13);
-   }
-   glPopMatrix();
-   glPopMatrix();
-
-   glDisable(GL_TEXTURE_2D);
-   glDisable(GL_FOG);
-   glShadeModel(GL_FLAT);
-
-   glMatrixMode(GL_PROJECTION);
-   glPushMatrix();
-   glLoadIdentity();
-   glOrtho(-0.5, 639.5, -0.5, 479.5, -1.0, 1.0);
-
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-
-   glColor3f(1.0, 0.0, 0.0);
-   glRasterPos2i(10, 10);
-   printstring(GLUT_BITMAP_HELVETICA_18, frbuf);
-   glRasterPos2i(350, 470);
-   printstring(GLUT_BITMAP_HELVETICA_10,
-	       "Tunnel V1.5 Written by David Bucciarelli (tech.hmw@plus.it)");
-
-   if (help)
-      printhelp();
-
-   glMatrixMode(GL_PROJECTION);
-   glPopMatrix();
-   glMatrixMode(GL_MODELVIEW);
-
-   glutSwapBuffers();
-
-   Frames++;
-   {
-      GLint t = glutGet(GLUT_ELAPSED_TIME);
-      if (t - T0 >= 2000) {
-         GLfloat seconds = (t - T0) / 1000.0;
-         GLfloat fps = Frames / seconds;
-         sprintf(frbuf, "Frame rate: %f", fps);
-         T0 = t;
-         Frames = 0;
-      }
-   }
-}
-
-static void
-idle(void)
-{
-   glutPostRedisplay();
-}
-
-
-
-int
-main(int ac, char **av)
-{
-   float fogcolor[4] = { 0.7, 0.7, 0.7, 1.0 };
-
-   fprintf(stderr,
-	   "Tunnel V1.5\nWritten by David Bucciarelli (tech.hmw@plus.it)\n");
-
-   glutInitWindowPosition(0, 0);
-   glutInitWindowSize(WIDTH, HEIGHT);
-   glutInit(&ac, av);
-
-   glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
-
-   if (!(win = glutCreateWindow("Tunnel"))) {
-      fprintf(stderr, "Error, couldn't open window\n");
-      return -1;
-   }
-
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-   gluPerspective(80.0, WIDTH / (float) HEIGHT, 1.0, 50.0);
-
-   glMatrixMode(GL_MODELVIEW);
-
-   glShadeModel(GL_SMOOTH);
-   glDisable(GL_DEPTH_TEST);
-   glEnable(GL_CULL_FACE);
-   glEnable(GL_TEXTURE_2D);
-
-   glEnable(GL_FOG);
-   glFogi(GL_FOG_MODE, GL_EXP2);
-   glFogfv(GL_FOG_COLOR, fogcolor);
-
-   glFogf(GL_FOG_DENSITY, 0.06);
-   glHint(GL_FOG_HINT, GL_NICEST);
-
-   inittextures();
-
-   glClearColor(fogcolor[0], fogcolor[1], fogcolor[2], fogcolor[3]);
-   glClear(GL_COLOR_BUFFER_BIT);
-
-   calcposobs();
-
-   glutReshapeFunc(reshape);
-   glutDisplayFunc(draw);
-   glutKeyboardFunc(key);
-   glutSpecialFunc(special);
-   glutIdleFunc(idle);
-
-   glEnable(GL_BLEND);
-   /*glBlendFunc(GL_SRC_ALPHA_SATURATE,GL_ONE); */
-   /*glEnable(GL_POLYGON_SMOOTH); */
-
-   glutMainLoop();
-
-   return 0;
-}

progs/demos/tunnel2.c

@@ -1,598 +0,0 @@
-/*
- * This program is under the GNU GPL.
- * Use at your own risk.
- *
- * You need TWO Voodoo Graphics boards in order to run
- * this demo !
- *
- * written by David Bucciarelli (tech.hmw@plus.it)
- *            Humanware s.r.l.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <time.h>
-
-#ifdef WIN32
-#include <windows.h>
-#endif
-
-#include <GL/glut.h>
-#include "readtex.c"
-#include "tunneldat.h"
-
-#ifdef FX
-#endif
-
-#ifdef XMESA
-#include "GL/xmesa.h"
-static int fullscreen = 1;
-#endif
-
-#ifdef FX
-GLboolean fxMesaSelectCurrentBoard(int);
-#endif
-
-static int WIDTHC0 = 640;
-static int HEIGHTC0 = 480;
-
-static int WIDTHC1 = 640;
-static int HEIGHTC1 = 480;
-
-static GLint T0 = 0;
-static GLint Frames = 0;
-
-#define NUMBLOC 5
-
-#ifndef M_PI
-#define M_PI 3.1415926535
-#endif
-
-static float obs[3] = { 1000.0, 0.0, 2.0 };
-static float dir[3];
-static float v = 0.5;
-static float alpha = 90.0;
-static float beta = 90.0;
-
-static int fog = 0;
-static int bfcull = 1;
-static int usetex = 1;
-static int cstrip = 0;
-static int help = 1;
-static int joyavailable = 0;
-static int joyactive = 0;
-
-static int channel[2];
-
-static GLuint t1id, t2id;
-
-static void
-inittextures(void)
-{
-   glGenTextures(1, &t1id);
-   glBindTexture(GL_TEXTURE_2D, t1id);
-
-   if (!LoadRGBMipmaps("../images/tile.rgb", GL_RGB)) {
-      fprintf(stderr, "Error reading a texture.\n");
-      exit(-1);
-   }
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-		   GL_LINEAR_MIPMAP_NEAREST);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-   glGenTextures(1, &t2id);
-   glBindTexture(GL_TEXTURE_2D, t2id);
-
-   if (!LoadRGBMipmaps("../images/bw.rgb", GL_RGB)) {
-      fprintf(stderr, "Error reading a texture.\n");
-      exit(-1);
-   }
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-		   GL_LINEAR_MIPMAP_NEAREST);
-   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-}
-
-static void
-drawobjs(const int *l, const float *f)
-{
-   int mend, j;
-
-   if (cstrip) {
-      float r = 0.33, g = 0.33, b = 0.33;
-
-      for (; (*l) != 0;) {
-	 mend = *l++;
-
-	 r += 0.33;
-	 if (r > 1.0) {
-	    r = 0.33;
-	    g += 0.33;
-	    if (g > 1.0) {
-	       g = 0.33;
-	       b += 0.33;
-	       if (b > 1.0)
-		  b = 0.33;
-	    }
-	 }
-
-	 glColor3f(r, g, b);
-	 glBegin(GL_TRIANGLE_STRIP);
-	 for (j = 0; j < mend; j++) {
-	    f += 4;
-	    glTexCoord2fv(f);
-	    f += 2;
-	    glVertex3fv(f);
-	    f += 3;
-	 }
-	 glEnd();
-      }
-   }
-   else
-      for (; (*l) != 0;) {
-	 mend = *l++;
-
-	 glBegin(GL_TRIANGLE_STRIP);
-	 for (j = 0; j < mend; j++) {
-	    glColor4fv(f);
-	    f += 4;
-	    glTexCoord2fv(f);
-	    f += 2;
-	    glVertex3fv(f);
-	    f += 3;
-	 }
-	 glEnd();
-      }
-}
-
-static void
-calcposobs(void)
-{
-   dir[0] = sin(alpha * M_PI / 180.0);
-   dir[1] = cos(alpha * M_PI / 180.0) * sin(beta * M_PI / 180.0);
-   dir[2] = cos(beta * M_PI / 180.0);
-
-   if (dir[0] < 1.0e-5 && dir[0] > -1.0e-5)
-      dir[0] = 0;
-   if (dir[1] < 1.0e-5 && dir[1] > -1.0e-5)
-      dir[1] = 0;
-   if (dir[2] < 1.0e-5 && dir[2] > -1.0e-5)
-      dir[2] = 0;
-
-   obs[0] += v * dir[0];
-   obs[1] += v * dir[1];
-   obs[2] += v * dir[2];
-}
-
-static void
-special(int k, int x, int y)
-{
-   switch (k) {
-   case GLUT_KEY_LEFT:
-      alpha -= 2.0;
-      break;
-   case GLUT_KEY_RIGHT:
-      alpha += 2.0;
-      break;
-   case GLUT_KEY_DOWN:
-      beta -= 2.0;
-      break;
-   case GLUT_KEY_UP:
-      beta += 2.0;
-      break;
-   }
-}
-
-static void
-key(unsigned char k, int x, int y)
-{
-   switch (k) {
-   case 27:
-      exit(0);
-      break;
-
-   case 'a':
-      v += 0.01;
-      break;
-   case 'z':
-      v -= 0.01;
-      break;
-
-#ifdef XMESA
-   case ' ':
-      fullscreen = (!fullscreen);
-
-      glutSetWindow(channel[0]);
-      XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
-
-      glutSetWindow(channel[1]);
-      XMesaSetFXmode(fullscreen ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW);
-      break;
-#endif
-
-   case 'j':
-      joyactive = (!joyactive);
-      break;
-   case 'h':
-      help = (!help);
-      break;
-   case 'f':
-      fog = (!fog);
-      break;
-   case 't':
-      usetex = (!usetex);
-      break;
-   case 'b':
-      if (bfcull) {
-	 glDisable(GL_CULL_FACE);
-	 bfcull = 0;
-      }
-      else {
-	 glEnable(GL_CULL_FACE);
-	 bfcull = 1;
-      }
-      break;
-   case 'm':
-      cstrip = (!cstrip);
-      break;
-
-   case 'd':
-      fprintf(stderr, "Deleting textures...\n");
-      glDeleteTextures(1, &t1id);
-      glDeleteTextures(1, &t2id);
-      fprintf(stderr, "Loading textures...\n");
-      inittextures();
-      fprintf(stderr, "Done.\n");
-      break;
-   }
-}
-
-static void
-reshapechannel0(int w, int h)
-{
-   float ratio;
-
-   WIDTHC0 = w;
-   HEIGHTC0 = h;
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-
-   ratio = 0.5f * w / (float) h;
-
-   glFrustum(-2.0, 0.0, -1.0 * ratio, 1.0 * ratio, 1.0, 60.0);
-
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-   glViewport(0, 0, w, h);
-}
-
-static void
-reshapechannel1(int w, int h)
-{
-   float ratio;
-
-   WIDTHC1 = w;
-   HEIGHTC1 = h;
-   glMatrixMode(GL_PROJECTION);
-   glLoadIdentity();
-
-   ratio = 0.5f * w / (float) h;
-
-   glFrustum(0.0, 2.0, -1.0 * ratio, 1.0 * ratio, 1.0, 60.0);
-
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-   glViewport(0, 0, w, h);
-}
-
-static void
-printstring(void *font, char *string)
-{
-   int len, i;
-
-   len = (int) strlen(string);
-   for (i = 0; i < len; i++)
-      glutBitmapCharacter(font, string[i]);
-}
-
-static void
-printhelp(void)
-{
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-   glColor4f(0.0, 0.0, 0.0, 0.5);
-   glRecti(40, 40, 600, 440);
-
-   glColor3f(1.0, 0.0, 0.0);
-   glRasterPos2i(300, 420);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Help");
-
-   glRasterPos2i(60, 390);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "h - Togle Help");
-   glRasterPos2i(60, 360);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "t - Togle Textures");
-   glRasterPos2i(60, 330);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "f - Togle Fog");
-   glRasterPos2i(60, 300);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "m - Togle strips");
-   glRasterPos2i(60, 270);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "b - Togle Back face culling");
-   glRasterPos2i(60, 240);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "Arrow Keys - Rotate");
-   glRasterPos2i(60, 210);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "a - Increase velocity");
-   glRasterPos2i(60, 180);
-   printstring(GLUT_BITMAP_TIMES_ROMAN_24, "z - Decrease velocity");
-
-   glRasterPos2i(60, 150);
-   if (joyavailable)
-      printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "j - Togle jostick control (Joystick control available)");
-   else
-      printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-		  "(No Joystick control available)");
-}
-
-static void
-dojoy(void)
-{
-#ifdef WIN32
-   static UINT max[2] = { 0, 0 };
-   static UINT min[2] = { 0xffffffff, 0xffffffff }, center[2];
-   MMRESULT res;
-   JOYINFO joy;
-
-   res = joyGetPos(JOYSTICKID1, &joy);
-
-   if (res == JOYERR_NOERROR) {
-      joyavailable = 1;
-
-      if (max[0] < joy.wXpos)
-	 max[0] = joy.wXpos;
-      if (min[0] > joy.wXpos)
-	 min[0] = joy.wXpos;
-      center[0] = (max[0] + min[0]) / 2;
-
-      if (max[1] < joy.wYpos)
-	 max[1] = joy.wYpos;
-      if (min[1] > joy.wYpos)
-	 min[1] = joy.wYpos;
-      center[1] = (max[1] + min[1]) / 2;
-
-      if (joyactive) {
-	 if (fabs(center[0] - (float) joy.wXpos) > 0.1 * (max[0] - min[0]))
-	    alpha -=
-	       2.0 * (center[0] - (float) joy.wXpos) / (max[0] - min[0]);
-	 if (fabs(center[1] - (float) joy.wYpos) > 0.1 * (max[1] - min[1]))
-	    beta += 2.0 * (center[1] - (float) joy.wYpos) / (max[1] - min[1]);
-
-	 if (joy.wButtons & JOY_BUTTON1)
-	    v += 0.01;
-	 if (joy.wButtons & JOY_BUTTON2)
-	    v -= 0.01;
-      }
-   }
-   else
-      joyavailable = 0;
-#endif
-}
-
-static void
-draw(void)
-{
-   static char frbuf[80] = "";
-   int i;
-   float base, offset;
-
-   dojoy();
-
-   glClear(GL_COLOR_BUFFER_BIT);
-
-   glClear(GL_COLOR_BUFFER_BIT);
-
-   if (usetex)
-      glEnable(GL_TEXTURE_2D);
-   else
-      glDisable(GL_TEXTURE_2D);
-
-   if (fog)
-      glEnable(GL_FOG);
-   else
-      glDisable(GL_FOG);
-
-   glShadeModel(GL_SMOOTH);
-
-   glPushMatrix();
-   calcposobs();
-   gluLookAt(obs[0], obs[1], obs[2],
-	     obs[0] + dir[0], obs[1] + dir[1], obs[2] + dir[2],
-	     0.0, 0.0, 1.0);
-
-   if (dir[0] > 0) {
-      offset = 8.0;
-      base = obs[0] - fmod(obs[0], 8.0);
-   }
-   else {
-      offset = -8.0;
-      base = obs[0] + (8.0 - fmod(obs[0], 8.0));
-   }
-
-   glPushMatrix();
-   glTranslatef(base - offset / 2.0, 0.0, 0.0);
-   for (i = 0; i < NUMBLOC; i++) {
-      glTranslatef(offset, 0.0, 0.0);
-      glBindTexture(GL_TEXTURE_2D, t1id);
-      drawobjs(striplength_skin_11, stripdata_skin_11);
-      glBindTexture(GL_TEXTURE_2D, t2id);
-      drawobjs(striplength_skin_12, stripdata_skin_12);
-      drawobjs(striplength_skin_9, stripdata_skin_9);
-      drawobjs(striplength_skin_13, stripdata_skin_13);
-   }
-   glPopMatrix();
-   glPopMatrix();
-
-   glDisable(GL_TEXTURE_2D);
-   glDisable(GL_FOG);
-   glShadeModel(GL_FLAT);
-
-   glMatrixMode(GL_PROJECTION);
-   glPushMatrix();
-   glLoadIdentity();
-   glOrtho(-0.5, 639.5, -0.5, 479.5, -1.0, 1.0);
-
-   glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-
-   glColor3f(1.0, 0.0, 0.0);
-   glRasterPos2i(10, 10);
-   printstring(GLUT_BITMAP_HELVETICA_18, frbuf);
-   glRasterPos2i(350, 470);
-   printstring(GLUT_BITMAP_HELVETICA_10,
-	       "Tunnel2 V1.0 Written by David Bucciarelli (tech.hmw@plus.it)");
-
-   if (help)
-      printhelp();
-
-   glMatrixMode(GL_PROJECTION);
-   glPopMatrix();
-   glMatrixMode(GL_MODELVIEW);
-
-   Frames++;
-   {
-      GLint t = glutGet(GLUT_ELAPSED_TIME);
-      if (t - T0 >= 2000) {
-         GLfloat seconds = (t - T0) / 1000.0;
-         GLfloat fps = Frames / seconds;
-         sprintf(frbuf, "Frame rate: %f", fps);
-         T0 = t;
-         Frames = 0;
-      }
-   }
-}
-
-static void
-drawchannel0(void)
-{
-   glutSetWindow(channel[0]);
-   draw();
-   glutSwapBuffers();
-}
-
-static void
-drawchannel1(void)
-{
-   glutSetWindow(channel[1]);
-   draw();
-   glutSwapBuffers();
-}
-
-static void
-drawall(void)
-{
-   glutSetWindow(channel[0]);
-   draw();
-   glutSetWindow(channel[1]);
-   draw();
-
-   glutSetWindow(channel[0]);
-   glutSwapBuffers();
-   glutSetWindow(channel[1]);
-   glutSwapBuffers();
-}
-
-static void
-init(void)
-{
-   float fogcolor[4] = { 0.7, 0.7, 0.7, 1.0 };
-
-   glShadeModel(GL_SMOOTH);
-   glDisable(GL_DEPTH_TEST);
-   glEnable(GL_CULL_FACE);
-   glEnable(GL_TEXTURE_2D);
-
-   glEnable(GL_FOG);
-   glFogi(GL_FOG_MODE, GL_EXP2);
-   glFogfv(GL_FOG_COLOR, fogcolor);
-
-   glFogf(GL_FOG_DENSITY, 0.06);
-   glHint(GL_FOG_HINT, GL_NICEST);
-
-   glEnable(GL_BLEND);
-   /*
-   glBlendFunc(GL_SRC_ALPHA_SATURATE, GL_ONE);
-   glEnable(GL_POLYGON_SMOOTH);
-   */
-
-   glClearColor(fogcolor[0], fogcolor[1], fogcolor[2], fogcolor[3]);
-   glClear(GL_COLOR_BUFFER_BIT);
-}
-
-int
-main(int ac, char **av)
-{
-   fprintf(stderr,
-	   "Tunnel2 V1.0\nWritten by David Bucciarelli (tech.hmw@plus.it)\n");
-
-   glutInitWindowPosition(0, 0);
-   glutInitWindowSize(WIDTHC0, HEIGHTC0);
-   glutInit(&ac, av);
-
-   glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
-
-#ifdef FX
-   if (!fxMesaSelectCurrentBoard(0)) {
-      fprintf(stderr, "The first Voodoo Graphics board is missing !?!?\n");
-      return -1;
-   }
-#endif
-   if (!(channel[0] = glutCreateWindow("Channel 0"))) {
-      fprintf(stderr, "Error, couldn't open window\n");
-      return -1;
-   }
-
-   reshapechannel0(WIDTHC0, HEIGHTC0);
-   init();
-   inittextures();
-   glutDisplayFunc(drawchannel0);
-   glutReshapeFunc(reshapechannel0);
-   glutKeyboardFunc(key);
-   glutSpecialFunc(special);
-
-#ifdef FX
-   if (!fxMesaSelectCurrentBoard(1)) {
-      fprintf(stderr, "The second Voodoo Graphics board is missing !\n");
-      exit(-1);
-   }
-#endif
-   glutInitWindowPosition(WIDTHC0, 0);
-   glutInitWindowSize(WIDTHC1, HEIGHTC1);
-   if (!(channel[1] = glutCreateWindow("Channel 1"))) {
-      fprintf(stderr, "Error, couldn't open window\n");
-      exit(-1);
-   }
-
-   reshapechannel1(WIDTHC1, HEIGHTC1);
-   init();
-   inittextures();
-   glutDisplayFunc(drawchannel1);
-   glutReshapeFunc(reshapechannel1);
-   glutKeyboardFunc(key);
-   glutSpecialFunc(special);
-
-   glutIdleFunc(drawall);
-
-   calcposobs();
-
-   glutMainLoop();
-
-   return 0;
-}

progs/demos/tunneldat.h

@@ -1,395 +0,0 @@
-/* Object: skin_13 */
-
-#if defined(_MSC_VER) && defined(_WIN32)
-#pragma warning( disable : 4305 )	/* 'initializing' : truncation from 'const double' to 'float' */
-#endif
-
-static const int striplength_skin_13[] = {
-   10, 7, 3, 5, 5, 4, 4, 4, 4, 5, 3, 4, 5, 4, 4, 4, 4, 4, 4, 6,
-   6, 3, 6, 3, 3, 3, 3, 0
-};
-
-static const float stripdata_skin_13[] = {
-   0.415686, 0.415686, 0.415686, 1.000000, 0.000000, 1.500000, 2.000000,
-      4.000000, 0.000000, 0.341176, 0.341176, 0.341176, 1.000000, -0.500000,
-      1.500000, 4.000000, 4.000000, 0.000000, 0.545098, 0.545098, 0.545098,
-      1.000000, 0.000000, 1.000000, 2.000000, 4.000000, 2.000000, 0.435294,
-      0.435294, 0.435294, 1.000000, -0.500000, 1.000000, 4.000000, 4.000000,
-      2.000000, 0.517647, 0.517647, 0.517647, 1.000000, 0.000000, 0.500000,
-      2.000000, 4.000000, 4.000000, 0.450980, 0.450980, 0.450980, 1.000000,
-      -0.500000, 0.500000, 4.000000, 4.000000, 4.000000, 0.427451, 0.427451,
-      0.427451, 1.000000, 0.000000, 0.000000, 2.000000, 4.000000, 6.000000,
-      0.388235, 0.388235, 0.388235, 1.000000, -0.500000, 0.000000, 4.000000,
-      4.000000, 6.000000, 0.356863, 0.356863, 0.356863, 1.000000, 0.000000,
-      -0.500000, 2.000000, 4.000000, 8.000000, 0.333333, 0.333333, 0.333333,
-      1.000000, -0.500000, -0.500000, 4.000000, 4.000000, 8.000000,
-   0.435294, 0.435294, 0.435294, 1.000000, 1.500000, 1.000000, -4.000000,
-      4.000000, 2.000000, 0.415686, 0.415686, 0.415686, 1.000000, 1.000000,
-      1.500000, -2.000000, 4.000000, 0.000000, 0.545098, 0.545098, 0.545098,
-      1.000000, 1.000000, 1.000000, -2.000000, 4.000000, 2.000000, 0.450980,
-      0.450980, 0.450980, 1.000000, 0.500000, 1.500000, 0.000000, 4.000000,
-      0.000000, 0.600000, 0.600000, 0.600000, 1.000000, 0.500000, 1.000000,
-      0.000000, 4.000000, 2.000000, 0.415686, 0.415686, 0.415686, 1.000000,
-      0.000000, 1.500000, 2.000000, 4.000000, 0.000000, 0.545098, 0.545098,
-      0.545098, 1.000000, 0.000000, 1.000000, 2.000000, 4.000000, 2.000000,
-   0.435294, 0.435294, 0.435294, 1.000000, 1.500000, 1.000000, -4.000000,
-      4.000000, 2.000000, 0.341176, 0.341176, 0.341176, 1.000000, 1.500000,
-      1.500000, -4.000000, 4.000000, 0.000000, 0.415686, 0.415686, 0.415686,
-      1.000000, 1.000000, 1.500000, -2.000000, 4.000000, 0.000000,
-   0.356863, 0.356863, 0.356863, 1.000000, 0.000000, -0.500000, 2.000000,
-      4.000000, 8.000000, 0.364706, 0.364706, 0.364706, 1.000000, 0.500000,
-      -0.500000, 0.000000, 4.000000, 8.000000, 0.427451, 0.427451, 0.427451,
-      1.000000, 0.000000, 0.000000, 2.000000, 4.000000, 6.000000, 0.415686,
-      0.415686, 0.415686, 1.000000, 0.395020, -0.133318, 0.420032, 4.000000,
-      6.533272, 0.423529, 0.423529, 0.423529, 1.000000, 0.388550, -0.103582,
-      0.445932, 4.000000, 6.414327,
-   0.423529, 0.423529, 0.423529, 1.000000, 0.388550, -0.103582, 0.445932,
-      4.000000, 6.414327, 0.427451, 0.427451, 0.427451, 1.000000, 0.383423,
-      -0.069344, 0.466541, 4.000000, 6.277375, 0.427451, 0.427451, 0.427451,
-      1.000000, 0.000000, 0.000000, 2.000000, 4.000000, 6.000000, 0.435294,
-      0.435294, 0.435294, 1.000000, 0.380371, -0.034595, 0.478689, 4.000000,
-      6.138380, 0.439216, 0.439216, 0.439216, 1.000000, 0.379272, 0.000000,
-      0.482673, 4.000000, 6.000000,
-   0.407843, 0.407843, 0.407843, 1.000000, 0.414673, -0.191394, 0.341301,
-      4.000000, 6.765576, 0.411765, 0.411765, 0.411765, 1.000000, 0.403687,
-      -0.162957, 0.385368, 4.000000, 6.651829, 0.364706, 0.364706, 0.364706,
-      1.000000, 0.500000, -0.500000, 0.000000, 4.000000, 8.000000, 0.415686,
-      0.415686, 0.415686, 1.000000, 0.395020, -0.133318, 0.420032, 4.000000,
-      6.533272,
-   0.400000, 0.400000, 0.400000, 1.000000, 0.438232, -0.232438, 0.247284,
-      4.000000, 6.929754, 0.403922, 0.403922, 0.403922, 1.000000, 0.425171,
-      -0.212276, 0.299425, 4.000000, 6.849104, 0.364706, 0.364706, 0.364706,
-      1.000000, 0.500000, -0.500000, 0.000000, 4.000000, 8.000000, 0.407843,
-      0.407843, 0.407843, 1.000000, 0.414673, -0.191394, 0.341301, 4.000000,
-      6.765576,
-   0.396078, 0.396078, 0.396078, 1.000000, 0.467285, -0.260554, 0.130636,
-      4.000000, 7.042214, 0.400000, 0.400000, 0.400000, 1.000000, 0.453857,
-      -0.250068, 0.184711, 4.000000, 7.000273, 0.364706, 0.364706, 0.364706,
-      1.000000, 0.500000, -0.500000, 0.000000, 4.000000, 8.000000, 0.400000,
-      0.400000, 0.400000, 1.000000, 0.438232, -0.232438, 0.247284, 4.000000,
-      6.929754,
-   0.396078, 0.396078, 0.396078, 1.000000, 0.500000, -0.270672, 0.000000,
-      4.000000, 7.082688, 0.396078, 0.396078, 0.396078, 1.000000, 0.482788,
-      -0.267902, 0.068730, 4.000000, 7.071609, 0.364706, 0.364706, 0.364706,
-      1.000000, 0.500000, -0.500000, 0.000000, 4.000000, 8.000000, 0.396078,
-      0.396078, 0.396078, 1.000000, 0.467285, -0.260554, 0.130636, 4.000000,
-      7.042214,
-   0.439216, 0.439216, 0.439216, 1.000000, 0.379272, 0.000000, 0.482673,
-      4.000000, 6.000000, 0.474510, 0.474510, 0.474510, 1.000000, 0.379272,
-      0.180448, 0.482673, 4.000000, 5.278208, 0.517647, 0.517647, 0.517647,
-      1.000000, 0.000000, 0.500000, 2.000000, 4.000000, 4.000000, 0.513726,
-      0.513726, 0.513726, 1.000000, 0.379272, 0.360896, 0.482673, 4.000000,
-      4.556417, 0.545098, 0.545098, 0.545098, 1.000000, 0.379272, 0.500000,
-      0.482673, 4.000000, 4.000000,
-   0.545098, 0.545098, 0.545098, 1.000000, 0.379272, 0.500000, 0.482673,
-      4.000000, 4.000000, 0.545098, 0.545098, 0.545098, 1.000000, 0.000000,
-      1.000000, 2.000000, 4.000000, 2.000000, 0.517647, 0.517647, 0.517647,
-      1.000000, 0.000000, 0.500000, 2.000000, 4.000000, 4.000000,
-   0.600000, 0.600000, 0.600000, 1.000000, 0.500000, 1.000000, 0.000000,
-      4.000000, 2.000000, 0.545098, 0.545098, 0.545098, 1.000000, 0.000000,
-      1.000000, 2.000000, 4.000000, 2.000000, 0.552941, 0.552941, 0.552941,
-      1.000000, 0.379272, 0.541344, 0.482673, 4.000000, 3.834625, 0.545098,
-      0.545098, 0.545098, 1.000000, 0.379272, 0.500000, 0.482673, 4.000000,
-      4.000000,
-   0.552941, 0.552941, 0.552941, 1.000000, 0.379272, 0.541344, 0.482673,
-      4.000000, 3.834625, 0.556863, 0.556863, 0.556863, 1.000000, 0.459717,
-      0.541344, 0.160891, 4.000000, 3.834625, 0.600000, 0.600000, 0.600000,
-      1.000000, 0.500000, 1.000000, 0.000000, 4.000000, 2.000000, 0.556863,
-      0.556863, 0.556863, 1.000000, 0.500000, 0.541344, 0.000000, 4.000000,
-      3.834625, 0.556863, 0.556863, 0.556863, 1.000000, 0.540283, 0.541344,
-      -0.160891, 4.000000, 3.834625,
-   0.396078, 0.396078, 0.396078, 1.000000, 0.517212, -0.267902, -0.068730,
-      4.000000, 7.071609, 0.396078, 0.396078, 0.396078, 1.000000, 0.500000,
-      -0.270672, 0.000000, 4.000000, 7.082688, 0.356863, 0.356863, 0.356863,
-      1.000000, 1.000000, -0.500000, -2.000000, 4.000000, 8.000000, 0.364706,
-      0.364706, 0.364706, 1.000000, 0.500000, -0.500000, 0.000000, 4.000000,
-      8.000000,
-   0.400000, 0.400000, 0.400000, 1.000000, 0.546143, -0.250068, -0.184711,
-      4.000000, 7.000273, 0.396078, 0.396078, 0.396078, 1.000000, 0.532715,
-      -0.260554, -0.130636, 4.000000, 7.042214, 0.356863, 0.356863, 0.356863,
-      1.000000, 1.000000, -0.500000, -2.000000, 4.000000, 8.000000, 0.396078,
-      0.396078, 0.396078, 1.000000, 0.517212, -0.267902, -0.068730, 4.000000,
-      7.071609,
-   0.403922, 0.403922, 0.403922, 1.000000, 0.574829, -0.212276, -0.299425,
-      4.000000, 6.849104, 0.400000, 0.400000, 0.400000, 1.000000, 0.561768,
-      -0.232438, -0.247284, 4.000000, 6.929754, 0.356863, 0.356863, 0.356863,
-      1.000000, 1.000000, -0.500000, -2.000000, 4.000000, 8.000000, 0.400000,
-      0.400000, 0.400000, 1.000000, 0.546143, -0.250068, -0.184711, 4.000000,
-      7.000273,
-   0.411765, 0.411765, 0.411765, 1.000000, 0.596313, -0.162957, -0.385368,
-      4.000000, 6.651829, 0.407843, 0.407843, 0.407843, 1.000000, 0.585327,
-      -0.191394, -0.341301, 4.000000, 6.765576, 0.356863, 0.356863, 0.356863,
-      1.000000, 1.000000, -0.500000, -2.000000, 4.000000, 8.000000, 0.403922,
-      0.403922, 0.403922, 1.000000, 0.574829, -0.212276, -0.299425, 4.000000,
-      6.849104,
-   0.423529, 0.423529, 0.423529, 1.000000, 0.611450, -0.103582, -0.445931,
-      4.000000, 6.414327, 0.415686, 0.415686, 0.415686, 1.000000, 0.604980,
-      -0.133318, -0.420033, 4.000000, 6.533272, 0.356863, 0.356863, 0.356863,
-      1.000000, 1.000000, -0.500000, -2.000000, 4.000000, 8.000000, 0.411765,
-      0.411765, 0.411765, 1.000000, 0.596313, -0.162957, -0.385368, 4.000000,
-      6.651829,
-   0.435294, 0.435294, 0.435294, 1.000000, 0.619629, -0.034595, -0.478689,
-      4.000000, 6.138380, 0.427451, 0.427451, 0.427451, 1.000000, 0.616577,
-      -0.069344, -0.466541, 4.000000, 6.277375, 0.356863, 0.356863, 0.356863,
-      1.000000, 1.000000, -0.500000, -2.000000, 4.000000, 8.000000, 0.423529,
-      0.423529, 0.423529, 1.000000, 0.611450, -0.103582, -0.445931, 4.000000,
-      6.414327,
-   0.513726, 0.513726, 0.513726, 1.000000, 0.620728, 0.360896, -0.482673,
-      4.000000, 4.556417, 0.474510, 0.474510, 0.474510, 1.000000, 0.620728,
-      0.180448, -0.482673, 4.000000, 5.278208, 0.427451, 0.427451, 0.427451,
-      1.000000, 1.000000, 0.000000, -2.000000, 4.000000, 6.000000, 0.439216,
-      0.439216, 0.439216, 1.000000, 0.620728, 0.000000, -0.482673, 4.000000,
-      6.000000, 0.356863, 0.356863, 0.356863, 1.000000, 1.000000, -0.500000,
-      -2.000000, 4.000000, 8.000000, 0.435294, 0.435294, 0.435294, 1.000000,
-      0.619629, -0.034595, -0.478689, 4.000000, 6.138380,
-   0.333333, 0.333333, 0.333333, 1.000000, 1.500000, -0.500000, -4.000000,
-      4.000000, 8.000000, 0.388235, 0.388235, 0.388235, 1.000000, 1.500000,
-      0.000000, -4.000000, 4.000000, 6.000000, 0.427451, 0.427451, 0.427451,
-      1.000000, 1.000000, 0.000000, -2.000000, 4.000000, 6.000000, 0.517647,
-      0.517647, 0.517647, 1.000000, 1.000000, 0.500000, -2.000000, 4.000000,
-      4.000000, 0.513726, 0.513726, 0.513726, 1.000000, 0.620728, 0.360896,
-      -0.482673, 4.000000, 4.556417, 0.545098, 0.545098, 0.545098, 1.000000,
-      0.620728, 0.500000, -0.482673, 4.000000, 4.000000,
-   0.333333, 0.333333, 0.333333, 1.000000, 1.500000, -0.500000, -4.000000,
-      4.000000, 8.000000, 0.427451, 0.427451, 0.427451, 1.000000, 1.000000,
-      0.000000, -2.000000, 4.000000, 6.000000, 0.356863, 0.356863, 0.356863,
-      1.000000, 1.000000, -0.500000, -2.000000, 4.000000, 8.000000,
-   0.556863, 0.556863, 0.556863, 1.000000, 0.540283, 0.541344, -0.160891,
-      4.000000, 3.834625, 0.552941, 0.552941, 0.552941, 1.000000, 0.620728,
-      0.541344, -0.482673, 4.000000, 3.834625, 0.545098, 0.545098, 0.545098,
-      1.000000, 1.000000, 1.000000, -2.000000, 4.000000, 2.000000, 0.517647,
-      0.517647, 0.517647, 1.000000, 1.000000, 0.500000, -2.000000, 4.000000,
-      4.000000, 0.450980, 0.450980, 0.450980, 1.000000, 1.500000, 0.500000,
-      -4.000000, 4.000000, 4.000000, 0.388235, 0.388235, 0.388235, 1.000000,
-      1.500000, 0.000000, -4.000000, 4.000000, 6.000000,
-   0.517647, 0.517647, 0.517647, 1.000000, 1.000000, 0.500000, -2.000000,
-      4.000000, 4.000000, 0.552941, 0.552941, 0.552941, 1.000000, 0.620728,
-      0.541344, -0.482673, 4.000000, 3.834625, 0.545098, 0.545098, 0.545098,
-      1.000000, 0.620728, 0.500000, -0.482673, 4.000000, 4.000000,
-   0.450980, 0.450980, 0.450980, 1.000000, 1.500000, 0.500000, -4.000000,
-      4.000000, 4.000000, 0.435294, 0.435294, 0.435294, 1.000000, 1.500000,
-      1.000000, -4.000000, 4.000000, 2.000000, 0.545098, 0.545098, 0.545098,
-      1.000000, 1.000000, 1.000000, -2.000000, 4.000000, 2.000000,
-   0.439216, 0.439216, 0.439216, 1.000000, 0.379272, 0.000000, 0.482673,
-      4.000000, 6.000000, 0.517647, 0.517647, 0.517647, 1.000000, 0.000000,
-      0.500000, 2.000000, 4.000000, 4.000000, 0.427451, 0.427451, 0.427451,
-      1.000000, 0.000000, 0.000000, 2.000000, 4.000000, 6.000000,
-   0.556863, 0.556863, 0.556863, 1.000000, 0.540283, 0.541344, -0.160891,
-      4.000000, 3.834625, 0.545098, 0.545098, 0.545098, 1.000000, 1.000000,
-      1.000000, -2.000000, 4.000000, 2.000000, 0.600000, 0.600000, 0.600000,
-      1.000000, 0.500000, 1.000000, 0.000000, 4.000000, 2.000000
-};
-
-
-/* Object: skin_12 */
-
-static const int striplength_skin_12[] = {
-   12, 12, 12, 12, 12, 0
-};
-
-static const float stripdata_skin_12[] = {
-   0.498039, 0.498039, 0.498039, 1.000000, -0.099976, 1.500000, -2.400000,
-      -4.000000, -0.000002, 0.337255, 0.337255, 0.337255, 1.000000, -0.500000,
-      1.500000, -4.000000, -4.000000, -0.000002, 0.568627, 0.568627, 0.568627,
-      1.000000, -0.099976, 1.100000, -2.400000, -4.000000, 1.599999, 0.341176,
-      0.341176, 0.341176, 1.000000, -0.500000, 1.100000, -4.000000, -4.000000,
-      1.599999, 0.498039, 0.498039, 0.498039, 1.000000, -0.099976, 0.700000,
-      -2.400000, -4.000000, 3.200000, 0.325490, 0.325490, 0.325490, 1.000000,
-      -0.500000, 0.700000, -4.000000, -4.000000, 3.199999, 0.352941, 0.352941,
-      0.352941, 1.000000, -0.099976, 0.300000, -2.400000, -4.000000, 4.800000,
-      0.282353, 0.282353, 0.282353, 1.000000, -0.500000, 0.300000, -4.000000,
-      -4.000000, 4.800000, 0.282353, 0.282353, 0.282353, 1.000000, -0.099976,
-      -0.100000, -2.400000, -4.000000, 6.400001, 0.254902, 0.254902, 0.254902,
-      1.000000, -0.500000, -0.100000, -4.000000, -4.000000, 6.400000,
-      0.239216, 0.239216, 0.239216, 1.000000, -0.099976, -0.500000, -2.400000,
-      -4.000000, 8.000000, 0.227451, 0.227451, 0.227451, 1.000000, -0.500000,
-      -0.500000, -4.000000, -4.000000, 8.000000,
-   0.239216, 0.239216, 0.239216, 1.000000, 1.099976, -0.500000, 2.400001,
-      -4.000000, 8.000000, 0.227451, 0.227451, 0.227451, 1.000000, 1.500000,
-      -0.500000, 4.000002, -4.000000, 8.000000, 0.282353, 0.282353, 0.282353,
-      1.000000, 1.099976, -0.100000, 2.400001, -4.000000, 6.400001, 0.254902,
-      0.254902, 0.254902, 1.000000, 1.500000, -0.100000, 4.000002, -4.000000,
-      6.400001, 0.352941, 0.352941, 0.352941, 1.000000, 1.099976, 0.300000,
-      2.400002, -4.000000, 4.800001, 0.282353, 0.282353, 0.282353, 1.000000,
-      1.500000, 0.300000, 4.000002, -4.000000, 4.800001, 0.498039, 0.498039,
-      0.498039, 1.000000, 1.099976, 0.700000, 2.400002, -4.000000, 3.200000,
-      0.321569, 0.321569, 0.321569, 1.000000, 1.500000, 0.700000, 4.000003,
-      -4.000000, 3.200000, 0.568627, 0.568627, 0.568627, 1.000000, 1.099976,
-      1.100000, 2.400002, -4.000000, 1.599999, 0.341176, 0.341176, 0.341176,
-      1.000000, 1.500000, 1.100000, 4.000003, -4.000000, 1.599999, 0.494118,
-      0.494118, 0.494118, 1.000000, 1.099976, 1.500000, 2.400003, -4.000000,
-      -0.000002, 0.337255, 0.337255, 0.337255, 1.000000, 1.500000, 1.500000,
-      4.000004, -4.000000, -0.000002,
-   0.639216, 0.639216, 0.639216, 1.000000, 0.300049, 1.500000, -0.799999,
-      -4.000000, -0.000002, 0.498039, 0.498039, 0.498039, 1.000000, -0.099976,
-      1.500000, -2.400000, -4.000000, -0.000002, 0.858824, 0.858824, 0.858824,
-      1.000000, 0.300049, 1.100000, -0.799999, -4.000000, 1.599999, 0.568627,
-      0.568627, 0.568627, 1.000000, -0.099976, 1.100000, -2.400000, -4.000000,
-      1.599999, 0.686275, 0.686275, 0.686275, 1.000000, 0.300049, 0.700000,
-      -0.799999, -4.000000, 3.200000, 0.498039, 0.498039, 0.498039, 1.000000,
-      -0.099976, 0.700000, -2.400000, -4.000000, 3.200000, 0.419608, 0.419608,
-      0.419608, 1.000000, 0.300049, 0.300000, -0.800000, -4.000000, 4.800000,
-      0.352941, 0.352941, 0.352941, 1.000000, -0.099976, 0.300000, -2.400000,
-      -4.000000, 4.800000, 0.298039, 0.298039, 0.298039, 1.000000, 0.300049,
-      -0.100000, -0.800000, -4.000000, 6.400001, 0.282353, 0.282353, 0.282353,
-      1.000000, -0.099976, -0.100000, -2.400000, -4.000000, 6.400001,
-      0.247059, 0.247059, 0.247059, 1.000000, 0.300049, -0.500000, -0.800000,
-      -4.000000, 8.000000, 0.239216, 0.239216, 0.239216, 1.000000, -0.099976,
-      -0.500000, -2.400000, -4.000000, 8.000000,
-   0.639216, 0.639216, 0.639216, 1.000000, 0.699951, 1.500000, 0.800002,
-      -4.000000, -0.000002, 0.639216, 0.639216, 0.639216, 1.000000, 0.300049,
-      1.500000, -0.799999, -4.000000, -0.000002, 0.858824, 0.858824, 0.858824,
-      1.000000, 0.699951, 1.100000, 0.800001, -4.000000, 1.599999, 0.858824,
-      0.858824, 0.858824, 1.000000, 0.300049, 1.100000, -0.799999, -4.000000,
-      1.599999, 0.686275, 0.686275, 0.686275, 1.000000, 0.699951, 0.700000,
-      0.800001, -4.000000, 3.200000, 0.686275, 0.686275, 0.686275, 1.000000,
-      0.300049, 0.700000, -0.799999, -4.000000, 3.200000, 0.419608, 0.419608,
-      0.419608, 1.000000, 0.699951, 0.300000, 0.800001, -4.000000, 4.800001,
-      0.419608, 0.419608, 0.419608, 1.000000, 0.300049, 0.300000, -0.800000,
-      -4.000000, 4.800000, 0.298039, 0.298039, 0.298039, 1.000000, 0.699951,
-      -0.100000, 0.800001, -4.000000, 6.400001, 0.298039, 0.298039, 0.298039,
-      1.000000, 0.300049, -0.100000, -0.800000, -4.000000, 6.400001, 0.247059,
-      0.247059, 0.247059, 1.000000, 0.699951, -0.500000, 0.800000, -4.000000,
-      8.000000, 0.247059, 0.247059, 0.247059, 1.000000, 0.300049, -0.500000,
-      -0.800000, -4.000000, 8.000000,
-   0.494118, 0.494118, 0.494118, 1.000000, 1.099976, 1.500000, 2.400003,
-      -4.000000, -0.000002, 0.639216, 0.639216, 0.639216, 1.000000, 0.699951,
-      1.500000, 0.800002, -4.000000, -0.000002, 0.568627, 0.568627, 0.568627,
-      1.000000, 1.099976, 1.100000, 2.400002, -4.000000, 1.599999, 0.858824,
-      0.858824, 0.858824, 1.000000, 0.699951, 1.100000, 0.800001, -4.000000,
-      1.599999, 0.498039, 0.498039, 0.498039, 1.000000, 1.099976, 0.700000,
-      2.400002, -4.000000, 3.200000, 0.686275, 0.686275, 0.686275, 1.000000,
-      0.699951, 0.700000, 0.800001, -4.000000, 3.200000, 0.352941, 0.352941,
-      0.352941, 1.000000, 1.099976, 0.300000, 2.400002, -4.000000, 4.800001,
-      0.419608, 0.419608, 0.419608, 1.000000, 0.699951, 0.300000, 0.800001,
-      -4.000000, 4.800001, 0.282353, 0.282353, 0.282353, 1.000000, 1.099976,
-      -0.100000, 2.400001, -4.000000, 6.400001, 0.298039, 0.298039, 0.298039,
-      1.000000, 0.699951, -0.100000, 0.800001, -4.000000, 6.400001, 0.239216,
-      0.239216, 0.239216, 1.000000, 1.099976, -0.500000, 2.400001, -4.000000,
-      8.000000, 0.247059, 0.247059, 0.247059, 1.000000, 0.699951, -0.500000,
-      0.800000, -4.000000, 8.000000
-};
-
-
-/* Object: skin_11 */
-
-static const int striplength_skin_11[] = {
-   12, 12, 12, 12, 12, 0
-};
-
-static const float stripdata_skin_11[] = {
-   0.145098, 0.145098, 0.145098, 1.000000, -0.099976, 1.500000, -2.400000,
-      4.000002, 0.000000, 0.141176, 0.141176, 0.141176, 1.000000, -0.500000,
-      1.500000, -4.000000, 4.000002, 0.000000, 0.176471, 0.176471, 0.176471,
-      1.000000, -0.099976, 1.100000, -2.400000, 2.400001, 0.000000, 0.145098,
-      0.145098, 0.145098, 1.000000, -0.500000, 1.100000, -4.000000, 2.400001,
-      0.000000, 0.341176, 0.341176, 0.341176, 1.000000, -0.099976, 0.700000,
-      -2.400000, 0.800000, 0.000000, 0.188235, 0.188235, 0.188235, 1.000000,
-      -0.500000, 0.700000, -4.000000, 0.800000, 0.000000, 0.450980, 0.450980,
-      0.450980, 1.000000, -0.099976, 0.300000, -2.400000, -0.800000, 0.000000,
-      0.247059, 0.247059, 0.247059, 1.000000, -0.500000, 0.300000, -4.000000,
-      -0.800000, 0.000000, 0.439216, 0.439216, 0.439216, 1.000000, -0.099976,
-      -0.100000, -2.400000, -2.400000, 0.000000, 0.270588, 0.270588, 0.270588,
-      1.000000, -0.500000, -0.100000, -4.000000, -2.400000, 0.000000,
-      0.364706, 0.364706, 0.364706, 1.000000, -0.099976, -0.500000, -2.400000,
-      -4.000000, 0.000000, 0.258824, 0.258824, 0.258824, 1.000000, -0.500000,
-      -0.500000, -4.000000, -4.000000, 0.000000,
-   0.364706, 0.364706, 0.364706, 1.000000, 1.099976, -0.500000, 2.400001,
-      -4.000000, 0.000000, 0.258824, 0.258824, 0.258824, 1.000000, 1.500000,
-      -0.500000, 4.000002, -4.000000, 0.000000, 0.439216, 0.439216, 0.439216,
-      1.000000, 1.099976, -0.100000, 2.400001, -2.400001, 0.000000, 0.270588,
-      0.270588, 0.270588, 1.000000, 1.500000, -0.100000, 4.000002, -2.400001,
-      0.000000, 0.454902, 0.454902, 0.454902, 1.000000, 1.099976, 0.300000,
-      2.400002, -0.800000, 0.000000, 0.247059, 0.247059, 0.247059, 1.000000,
-      1.500000, 0.300000, 4.000002, -0.800000, 0.000000, 0.341176, 0.341176,
-      0.341176, 1.000000, 1.099976, 0.700000, 2.400002, 0.800000, 0.000000,
-      0.184314, 0.184314, 0.184314, 1.000000, 1.500000, 0.700000, 4.000003,
-      0.800000, 0.000000, 0.176471, 0.176471, 0.176471, 1.000000, 1.099976,
-      1.100000, 2.400002, 2.400001, 0.000000, 0.145098, 0.145098, 0.145098,
-      1.000000, 1.500000, 1.100000, 4.000003, 2.400001, 0.000000, 0.145098,
-      0.145098, 0.145098, 1.000000, 1.099976, 1.500000, 2.400003, 4.000003,
-      0.000000, 0.141176, 0.141176, 0.141176, 1.000000, 1.500000, 1.500000,
-      4.000004, 4.000002, 0.000000,
-   0.145098, 0.145098, 0.145098, 1.000000, 0.300049, 1.500000, -0.799999,
-      4.000002, 0.000000, 0.145098, 0.145098, 0.145098, 1.000000, -0.099976,
-      1.500000, -2.400000, 4.000002, 0.000000, 0.262745, 0.262745, 0.262745,
-      1.000000, 0.300049, 1.100000, -0.799999, 2.400001, 0.000000, 0.176471,
-      0.176471, 0.176471, 1.000000, -0.099976, 1.100000, -2.400000, 2.400001,
-      0.000000, 0.580392, 0.580392, 0.580392, 1.000000, 0.300049, 0.700000,
-      -0.799999, 0.800000, 0.000000, 0.341176, 0.341176, 0.341176, 1.000000,
-      -0.099976, 0.700000, -2.400000, 0.800000, 0.000000, 0.709804, 0.709804,
-      0.709804, 1.000000, 0.300049, 0.300000, -0.800000, -0.800000, 0.000000,
-      0.450980, 0.450980, 0.450980, 1.000000, -0.099976, 0.300000, -2.400000,
-      -0.800000, 0.000000, 0.627451, 0.627451, 0.627451, 1.000000, 0.300049,
-      -0.100000, -0.800000, -2.400001, 0.000000, 0.439216, 0.439216, 0.439216,
-      1.000000, -0.099976, -0.100000, -2.400000, -2.400000, 0.000000,
-      0.458824, 0.458824, 0.458824, 1.000000, 0.300049, -0.500000, -0.800000,
-      -4.000000, 0.000000, 0.364706, 0.364706, 0.364706, 1.000000, -0.099976,
-      -0.500000, -2.400000, -4.000000, 0.000000,
-   0.145098, 0.145098, 0.145098, 1.000000, 0.699951, 1.500000, 0.800002,
-      4.000002, 0.000000, 0.145098, 0.145098, 0.145098, 1.000000, 0.300049,
-      1.500000, -0.799999, 4.000002, 0.000000, 0.262745, 0.262745, 0.262745,
-      1.000000, 0.699951, 1.100000, 0.800001, 2.400001, 0.000000, 0.262745,
-      0.262745, 0.262745, 1.000000, 0.300049, 1.100000, -0.799999, 2.400001,
-      0.000000, 0.580392, 0.580392, 0.580392, 1.000000, 0.699951, 0.700000,
-      0.800001, 0.800000, 0.000000, 0.580392, 0.580392, 0.580392, 1.000000,
-      0.300049, 0.700000, -0.799999, 0.800000, 0.000000, 0.713726, 0.713726,
-      0.713726, 1.000000, 0.699951, 0.300000, 0.800001, -0.800000, 0.000000,
-      0.709804, 0.709804, 0.709804, 1.000000, 0.300049, 0.300000, -0.800000,
-      -0.800000, 0.000000, 0.631373, 0.631373, 0.631373, 1.000000, 0.699951,
-      -0.100000, 0.800001, -2.400001, 0.000000, 0.627451, 0.627451, 0.627451,
-      1.000000, 0.300049, -0.100000, -0.800000, -2.400001, 0.000000, 0.458824,
-      0.458824, 0.458824, 1.000000, 0.699951, -0.500000, 0.800000, -4.000000,
-      0.000000, 0.458824, 0.458824, 0.458824, 1.000000, 0.300049, -0.500000,
-      -0.800000, -4.000000, 0.000000,
-   0.145098, 0.145098, 0.145098, 1.000000, 1.099976, 1.500000, 2.400003,
-      4.000003, 0.000000, 0.145098, 0.145098, 0.145098, 1.000000, 0.699951,
-      1.500000, 0.800002, 4.000002, 0.000000, 0.176471, 0.176471, 0.176471,
-      1.000000, 1.099976, 1.100000, 2.400002, 2.400001, 0.000000, 0.262745,
-      0.262745, 0.262745, 1.000000, 0.699951, 1.100000, 0.800001, 2.400001,
-      0.000000, 0.341176, 0.341176, 0.341176, 1.000000, 1.099976, 0.700000,
-      2.400002, 0.800000, 0.000000, 0.580392, 0.580392, 0.580392, 1.000000,
-      0.699951, 0.700000, 0.800001, 0.800000, 0.000000, 0.454902, 0.454902,
-      0.454902, 1.000000, 1.099976, 0.300000, 2.400002, -0.800000, 0.000000,
-      0.713726, 0.713726, 0.713726, 1.000000, 0.699951, 0.300000, 0.800001,
-      -0.800000, 0.000000, 0.439216, 0.439216, 0.439216, 1.000000, 1.099976,
-      -0.100000, 2.400001, -2.400001, 0.000000, 0.631373, 0.631373, 0.631373,
-      1.000000, 0.699951, -0.100000, 0.800001, -2.400001, 0.000000, 0.364706,
-      0.364706, 0.364706, 1.000000, 1.099976, -0.500000, 2.400001, -4.000000,
-      0.000000, 0.458824, 0.458824, 0.458824, 1.000000, 0.699951, -0.500000,
-      0.800000, -4.000000, 0.000000
-};
-
-
-/* Object: skin_9 */
-
-static const int striplength_skin_9[] = {
-   18, 0
-};
-
-static const float stripdata_skin_9[] = {
-   0.384314, 0.384314, 0.384314, 1.000000, -0.500000, 1.500000, -4.000000,
-      4.000000, 8.000000, 0.384314, 0.384314, 0.384314, 1.000000, 1.500000,
-      1.500000, 4.000000, 4.000000, 8.000000, 0.376471, 0.376471, 0.376471,
-      1.000000, -0.500000, 1.250000, -4.000000, 3.695518, 9.530733, 0.403922,
-      0.403922, 0.403922, 1.000000, 1.500000, 1.250000, 4.000000, 3.695518,
-      9.530733, 0.415686, 0.415686, 0.415686, 1.000000, -0.500000, 1.000000,
-      -4.000000, 2.828427, 10.828427, 0.431373, 0.431373, 0.431373, 1.000000,
-      1.500000, 1.000000, 4.000000, 2.828427, 10.828427, 0.435294, 0.435294,
-      0.435294, 1.000000, -0.500000, 0.750000, -4.000000, 1.530734, 11.695518,
-      0.443137, 0.443137, 0.443137, 1.000000, 1.500000, 0.750000, 4.000000,
-      1.530734, 11.695518, 0.439216, 0.439216, 0.439216, 1.000000, -0.500000,
-      0.500000, -4.000000, 0.000000, 12.000000, 0.435294, 0.435294, 0.435294,
-      1.000000, 1.500000, 0.500000, 4.000000, 0.000000, 12.000000, 0.427451,
-      0.427451, 0.427451, 1.000000, -0.500000, 0.250000, -4.000000, -1.530734,
-      11.695518, 0.411765, 0.411765, 0.411765, 1.000000, 1.500000, 0.250000,
-      4.000000, -1.530734, 11.695518, 0.396078, 0.396078, 0.396078, 1.000000,
-      -0.500000, 0.000000, -4.000000, -2.828427, 10.828427, 0.368627,
-      0.368627, 0.368627, 1.000000, 1.500000, 0.000000, 4.000000, -2.828427,
-      10.828427, 0.341176, 0.341176, 0.341176, 1.000000, -0.500000, -0.250000,
-      -4.000000, -3.695518, 9.530733, 0.301961, 0.301961, 0.301961, 1.000000,
-      1.500000, -0.250000, 4.000000, -3.695518, 9.530733, 0.294118, 0.294118,
-      0.294118, 1.000000, -0.500000, -0.500000, -4.000000, -4.000000,
-      8.000000, 0.294118, 0.294118, 0.294118, 1.000000, 1.500000, -0.500000,
-      4.000000, -4.000000, 8.000000
-};

progs/demos/winpos.c

@@ -1,4 +1,4 @@
-/* $Id: winpos.c,v 1.3 2000/12/24 22:53:54 pesco Exp $ */
+/* $Id: winpos.c,v 1.1 1999/08/19 00:55:40 jtg Exp $ */
 
 /*
  * Example of how to use the GL_MESA_window_pos extension.
@@ -8,37 +8,8 @@
 
 /*
  * $Log: winpos.c,v $
- * Revision 1.3  2000/12/24 22:53:54  pesco
- * * demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util.
- * * demos/Makefile.X11, demos/Makefile.BeOS-R4, demos/Makefile.cygnus:
- * Essentially the same.
- * Program files updated to include "readtex.c", not "../util/readtex.c".
- * * demos/reflect.c: Likewise for "showbuffer.c".
- *
- *
- * * Makefile.am (EXTRA_DIST): Added top-level regular files.
- *
- * * include/GL/Makefile.am (INC_X11): Added glxext.h.
- *
- *
- * * src/GGI/include/ggi/mesa/Makefile.am (EXTRA_HEADERS): Include
- * Mesa GGI headers in dist even if HAVE_GGI is not given.
- *
- * * configure.in: Look for GLUT and demo source dirs in $srcdir.
- *
- * * src/swrast/Makefile.am (libMesaSwrast_la_SOURCES): Set to *.[ch].
- * More source list updates in various Makefile.am's.
- *
- * * Makefile.am (dist-hook): Remove CVS directory from distribution.
- * (DIST_SUBDIRS): List all possible subdirs here.
- * (SUBDIRS): Only list subdirs selected for build again.
- * The above two applied to all subdir Makefile.am's also.
- *
- * Revision 1.2  2000/06/27 17:04:43  brianp
- * fixed compiler warnings
- *
- * Revision 1.1.1.1  1999/08/19 00:55:40  jtg
- * Imported sources
+ * Revision 1.1  1999/08/19 00:55:40  jtg
+ * Initial revision
  *
  * Revision 3.3  1999/03/28 18:24:37  brianp
  * minor clean-up
@@ -59,10 +30,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#define GL_GLEXT_LEGACY
 #include "GL/glut.h"
 
-#include "readtex.c"  /* a hack, I know */
+#include "../util/readtex.c"  /* a hack, I know */
 
 #define IMAGE_FILE "../images/girl.rgb"
 

progs/redbook/Imakefile

@@ -219,3 +219,4 @@ NormalProgramTarget(xfont,xfont.o,NullParameter,$(LOCAL_LIBRARIES),NullParameter
 
 DependTarget()
  
+

progs/redbook/Makefile.X11

@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.3 2000/02/16 01:09:06 brianp Exp $
+# $Id: Makefile.X11,v 1.2 1999/10/27 10:09:53 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.1
@@ -12,7 +12,7 @@
 INCDIR = ../include
 LIBDIR = ../lib
 
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
+GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(XLIBS)
 
 LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)