Prepare changelog for upload

with 04_cleanup-osmesa-configs.patch renamed into 04_debian-configs.patch

Makefile

@@ -71,13 +71,19 @@ bluegene-osmesa \
 bluegene-xlc-osmesa \
 catamount-osmesa-pgi \
 darwin \
+darwin-fat-32bit \
+darwin-fat-all \
 darwin-static \
 darwin-static-x86ppc \
-darwin-x86ppc \
+dragonfly \
+dragonfly-dri \
+dragonfly-dri-amd64 \
+dragonfly-dri-x86 \
 freebsd \
 freebsd-dri \
 freebsd-dri-amd64 \
 freebsd-dri-x86 \
+freebsd-static \
 hpux10 \
 hpux10-gcc \
 hpux10-static \
@@ -166,10 +172,10 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-7.0.3-rc2
-LIB_NAME = MesaLib-7.0.3-rc2
-DEMO_NAME = MesaDemos-7.0.3-rc2
-GLUT_NAME = MesaGLUT-7.0.3-rc2
+DIRECTORY = Mesa-7.0.4
+LIB_NAME = MesaLib-7.0.4
+DEMO_NAME = MesaDemos-7.0.4
+GLUT_NAME = MesaGLUT-7.0.4
 
 MAIN_FILES = \
 	$(DIRECTORY)/Makefile*						\

bin/mklib

@@ -111,6 +111,13 @@ do
 	    # this is a special case (see bugzilla 10876)
 	    DEPS="$DEPS $1"
 	    ;;
+	-Wl*)
+	    # Another special case for DragonFly
+	    DEPS="$DEPS $1"
+	    ;;
+	-Wl*)
+	    DEPS="$DEPS $1"
+	    ;;
 	'-pthread')
 	    DEPS="$DEPS -pthread"
 	    ;;
@@ -198,7 +205,7 @@ fi
 #
 case $ARCH in
 
-    'Linux' | 'OpenBSD' | 'GNU' | GNU/*)
+    'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/*)
 	# we assume gcc
 
 	if [ "x$LINK" = "x" ] ; then

configs/darwin

@@ -4,10 +4,9 @@ include $(TOP)/configs/default
 
 CONFIG_NAME = darwin
 
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-	  -D_BSD_SOURCE -D_GNU_SOURCE \
-	  -DGLX_INDIRECT_RENDERING \
-	  -DPTHREADS -DGLX_ALIAS_UNSUPPORTED -DHAVE_POSIX_MEMALIGN
+DEFINES = -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \
+	  -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE \
+	  -DPTHREADS -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING
 
 # Compiler and flags
 CC = gcc
@@ -37,4 +36,5 @@ GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
 APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11/lib -lX11 -lXmu -lXt -lXi -lm
 
 # omit glw lib for now:
-SRC_DIRS = glx/x11 glu glut/glx
+SRC_DIRS = glx/x11 glu glut/glx mesa
+DRIVER_DIRS = osmesa

configs/darwin-fat-32bit

@@ -0,0 +1,7 @@
+# Configuration for Darwin / MacOS X, making 32bit fat dynamic libs
+
+RC_CFLAGS=-arch ppc -arch i386
+
+include $(TOP)/configs/darwin
+
+CONFIG_NAME = darwin-fat-32bit

configs/darwin-fat-all

@@ -0,0 +1,7 @@
+# Configuration for Darwin / MacOS X, making 32bit and 64bit fat dynamic libs
+
+RC_CFLAGS=-arch ppc -arch i386 -arch ppc64 -arch x86_64
+
+include $(TOP)/configs/darwin
+
+CONFIG_NAME = darwin-fat-all

configs/darwin-x86ppc

@@ -1,37 +0,0 @@
-# Configuration for Darwin / MacOS X, making dynamic libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = darwin
-
-# Compiler and flags
-CC = cc
-CXX = cc
-CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-         -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
-CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-         -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
-
-MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.dylib
-GLU_LIB_NAME = libGLU.dylib
-GLUT_LIB_NAME = libglut.dylib
-GLW_LIB_NAME = libGLw.dylib
-OSMESA_LIB_NAME = libOSMesa.dylib
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext
-GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-
-# omit glw lib for now:
-SRC_DIRS = mesa glu glut/glx
-

configs/debian-default

@@ -1,17 +0,0 @@
-# Define Debian-specific defaults.
-
-CONFIG_NAME = debian-default
-
-OPT_FLAGS = -O2 -g
-
-# override settings in configs/linux-x86-64
-LIB_DIR = lib
-EXTRA_LIB_PATH =
-
-SRC_DIRS = mesa
-PROGRAM_DIRS =
-
-INSTALL_DIR = /usr
-
-# vim: ft=make
-

configs/debian-dri-amd64

@@ -1,9 +0,0 @@
-# Configuration for building the DRI drivers on i386.
-
-include $(TOP)/configs/linux-dri-x86-64
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-dri-amd64
-
-# vim: ft=make
-

configs/debian-dri-any

@@ -1,9 +0,0 @@
-# Configuration for building the DRI drivers on the build architecture.
-
-include $(TOP)/configs/linux-dri
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-dri-any
-
-# vim: ft=make
-

configs/debian-dri-default

@@ -1,36 +0,0 @@
-# Configuration defaults for building the DRI drivers and DRI/GLX-enabled
-# libGL.
-
-include $(TOP)/configs/debian-default
-
-CONFIG_NAME = debian-dri-default
-
-SRC_DIRS = glx/x11 mesa progs
-DRIVER_DIRS = dri
-PROGRAM_DIRS = xdemos
-PROGS = glxdemo \
-        glxgears \
-        glxheads \
-        glxinfo
-
-LIB_DIR = lib/glx
-
-DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
-DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
-
-DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
-
-ARCH_X86 = i386 amd64
-
-ifneq ($(findstring $(DEB_BUILD_ARCH), $(ARCH_X86)),)
-	DRI_DIRS += i810 i915 i915tex i965 sis unichrome
-endif
-
-ifeq ($(DEB_BUILD_ARCH), sparc)
-	DRI_DIRS += ffb
-endif
-
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-
-# vim: ft=make
-

configs/debian-dri-i386

@@ -1,9 +0,0 @@
-# Configuration for building the DRI drivers on i386.
-
-include $(TOP)/configs/linux-dri-x86
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-dri-i386
-
-# vim: ft=make
-

configs/debian-dri-i386-i686

@@ -1,14 +0,0 @@
-# Configuration for building the DRI drivers on i386.
-
-include $(TOP)/configs/linux-dri-x86
-include $(TOP)/configs/debian-dri-optimized-default
-
-CONFIG_NAME = debian-dri-i386-i686
-
-ARCH_FLAGS = -march=i686
-LIB_DIR = lib/glx/i686/cmov
-
-DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri/i686/cmov
-
-# vim: ft=make
-

configs/debian-dri-optimized-default

@@ -1,13 +0,0 @@
-# Configuration defaults for CPU-optimized builds of the DRI drivers and
-# DRI/GLX-enabled libGL.
-
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-dri-optimized-default
-
-# override so that the utility programs are not rebuilt with CPU-specific
-# optimizations
-SRC_DIRS = glx/x11 mesa
-
-# vim: ft=make
-

configs/debian-indirect-default

@@ -1,7 +0,0 @@
-# Configuration defaults for building GLX-enabled libGL.
-
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-indirect-default
-
-DRI_DIRS = 

configs/debian-indirect-hurd-i386

@@ -1,9 +0,0 @@
-# Configuration for building the DRI drivers on the build architecture.
-
-include $(TOP)/configs/linux-indirect
-include $(TOP)/configs/debian-indirect-default
-
-CONFIG_NAME = debian-indirect-hurd-i386
-
-# vim: ft=make
-

configs/debian-osmesa

@@ -1,9 +0,0 @@
-# Configuration for building only OSMesa on Debian.
-
-include $(TOP)/configs/linux-osmesa
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa
-
-# vim: ft=make
-

configs/debian-osmesa-default

@@ -1,10 +0,0 @@
-# Configuration defaults for building OSMesa.
-
-include $(TOP)/configs/debian-default
-
-CONFIG_NAME = debian-osmesa-default
-
-DRIVER_DIRS = osmesa
-
-# vim: ft=make
-

configs/debian-osmesa-static

@@ -1,9 +0,0 @@
-# Configuration for building only OSMesa (static version) on Debian.
-
-include $(TOP)/configs/linux-osmesa-static
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa-static
-
-# vim: ft=make
-

configs/debian-osmesa16

@@ -1,10 +0,0 @@
-# Configuration for building OSMesa with support for 16 bits per color
-# channel.
-
-include $(TOP)/configs/linux-osmesa16
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa16
-
-# vim: ft=make
-

configs/debian-osmesa16-static

@@ -1,10 +0,0 @@
-# Configuration for building a static version of OSMesa with support for 16
-# bits per color channel.
-
-include $(TOP)/configs/linux-osmesa16-static
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa16-static
-
-# vim: ft=make
-

configs/debian-osmesa32

@@ -1,10 +0,0 @@
-# Configuration for building OSMesa with support for 32 bits per color
-# channel.
-
-include $(TOP)/configs/linux-osmesa32
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa32
-
-# vim: ft=make
-

configs/debian-osmesa32-static

@@ -1,10 +0,0 @@
-# Configuration for building a static version of OSMesa with support for 32
-# bits per color channel.
-
-include $(TOP)/configs/linux-osmesa32-static
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa32-static
-
-# vim: ft=make
-

configs/debian-swx11+glu-alpha-ev5

@@ -1,12 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) on alpha (ev5 optimized).
-
-include $(TOP)/configs/linux-alpha
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-alpha-ev5
-
-SRC_DIRS = mesa
-LIB_DIR = lib/ev5/cmov
-
-# vim: ft=make
-

configs/debian-swx11+glu-amd64

@@ -1,10 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on amd64.
-
-include $(TOP)/configs/linux-x86-64
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-amd64
-
-# vim: ft=make
-

configs/debian-swx11+glu-any

@@ -1,9 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) on the build architecture.
-
-include $(TOP)/configs/linux
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-any
-
-# vim: ft=make
-

configs/debian-swx11+glu-default

@@ -1,14 +0,0 @@
-# Configuration defaults for building Mesa (swx11 and GLU).
-
-include $(TOP)/configs/debian-default
-
-CONFIG_NAME = debian-swx11+glu-default
-
-SRC_DIRS = mesa glu glw
-DRIVER_DIRS = x11
-
-GLW_SOURCES += GLwMDrawA.c
-GLW_LIB_DEPS += -lXm
-
-# vim: ft=make
-

configs/debian-swx11+glu-i386

@@ -1,10 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on i386.
-
-include $(TOP)/configs/linux-x86
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-i386
-
-# vim: ft=make
-

configs/debian-swx11+glu-i386-i686

@@ -1,14 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on i386 (i686 optimized).
-
-include $(TOP)/configs/linux-x86
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-i386-i686
-
-ARCH_FLAGS += -march=i686
-SRC_DIRS = mesa
-LIB_DIR = lib/i686/cmov
-
-# vim: ft=make
-

configs/debian-swx11+glu-powerpc-603

@@ -1,13 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on powerpc (603 optimized).
-
-include $(TOP)/configs/linux-ppc
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-powerpc-603
-
-SRC_DIRS = mesa
-LIB_DIR = lib/603/cmov
-
-# vim: ft=make
-

configs/debian-swx11+glu-ppc64

@@ -1,11 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on ppc64.
-
-include $(TOP)/configs/debian-swx11+glu-any
-
-CONFIG_NAME = debian-swx11+glu-ppc64
-
-LIB_DIR = lib64
-
-# vim: ft=make
-

configs/debian-swx11+glu-sparc

@@ -1,10 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on sparc.
-
-include $(TOP)/configs/linux-sparc
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-sparc
-
-# vim: ft=make
-

configs/debian-swx11+glu-sparc-ultrasparc

@@ -1,13 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on sparc (ultrasparc-optimized).
-
-include $(TOP)/configs/linux-ultrasparc
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-sparc-ultrasparc
-
-SRC_DIRS = mesa
-LIB_DIR = lib/ultrasparc/cmov
-
-# vim: ft=make
-

configs/debian-swx11+glu-static-amd64

@@ -1,10 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU)
-# on amd64.
-
-include $(TOP)/configs/linux-x86-64-static
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-static-amd64
-
-# vim: ft=make
-

configs/debian-swx11+glu-static-any

@@ -1,10 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU)
-# on the build architecture.
-
-include $(TOP)/configs/linux-static
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-static-any
-
-# vim: ft=make
-

configs/debian-swx11+glu-static-i386

@@ -1,10 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU)
-# on i386.
-
-include $(TOP)/configs/linux-x86-static
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-static-i386
-
-# vim: ft=make
-

configs/debian-swx11+glu-static-ppc64

@@ -1,11 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU)
-# on ppc64.
-
-include $(TOP)/configs/debian-swx11+glu-static-any
-
-CONFIG_NAME = debian-swx11+glu-static-ppc64
-
-LIB_DIR = lib64
-
-# vim: ft=make
-

configs/default

@@ -10,7 +10,7 @@ CONFIG_NAME = default
 # Version info
 MESA_MAJOR=7
 MESA_MINOR=0
-MESA_TINY=2
+MESA_TINY=4
 
 # external projects.  This should be useless now that we use libdrm.
 DRM_SOURCE_PATH=$(TOP)/../drm
@@ -30,9 +30,11 @@ MKDEP_OPTIONS = -fdepend
 MAKE = make
 INSTALL = $(TOP)/bin/minstall
 
-# Python and flags (generally only needed by the developers)
+# Tools for regenerating glapi (generally only needed by the developers)
 PYTHON2 = python
 PYTHON_FLAGS = -t -O -O
+INDENT = indent
+INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
 
 # Library names (base name)
 GL_LIB = GL

configs/default-bp

@@ -1,75 +0,0 @@
-# Default/template configuration
-
-# This is included by other config files which may override some
-# of these variables.
-
-CONFIG_NAME = default
-
-# Version info
-MESA_MAJOR=6
-MESA_MINOR=3
-MESA_TINY=0
-
-# external projects
-#DRM_SOURCE_PATH=$(TOP)/../drm
-DRM_SOURCE_PATH=/home/projects/DRI-freedesktop/drm
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -O
-CXXFLAGS = -O
-GLU_CFLAGS = 
-
-# Misc tools and flags
-MKLIB_OPTIONS = 
-MKDEP = makedepend
-MKDEP_OPTIONS = -fdepend
-MAKE = make
-
-# Library names (base name)
-GL_LIB = GL
-GLU_LIB = GLU
-GLUT_LIB = glut
-GLW_LIB = GLw
-OSMESA_LIB = OSMesa
-
-
-# Library names (actual file names)
-GL_LIB_NAME = lib$(GL_LIB).so
-GLU_LIB_NAME = lib$(GLU_LIB).so
-GLUT_LIB_NAME = lib$(GLUT_LIB).so
-GLW_LIB_NAME = lib$(GLW_LIB).so
-OSMESA_LIB_NAME = lib$(OSMesa).so
-
-
-# Optional assembly language optimization files for libGL
-ASM_SOURCES = 
-
-# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
-# order to build the Motif widget too)
-GLW_SOURCES = GLwDrawA.c
-
-
-# Directories
-LIB_DIR = $(TOP)/lib
-INSTALL_PREFIX = /usr/local
-SRC_DIRS = mesa glu glut/glx glw
-GLU_DIRS = sgi
-DRIVER_DIRS = x11 osmesa
-# Which subdirs under $(TOP)/progs/ to enter:
-PROGRAM_DIRS = demos redbook samples xdemos
-
-
-# Library/program dependencies
-GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
-
-
-# Shading language support (set to 0 or 1)
-SHADING_LANGUAGE = 0
-

configs/dragonfly

@@ -0,0 +1,38 @@
+# Configuration for DragonFly
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = DragonFly
+
+# Compiler and flags
+CC = cc
+CXX = c++
+MAKE = gmake
+
+OPT_FLAGS  = -O2
+PIC_FLAGS  = -fPIC
+
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \
+	-DHZ=100
+
+X11_INCLUDES = -I/usr/pkg/include
+
+CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) \
+	-ffast-math -pedantic
+
+CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES)
+
+GLUT_CFLAGS = -fexceptions
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+EXTRA_LIB_PATH = -L/usr/pkg/lib
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) \
+	-l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
+
+# Installation directories (for make install)
+INSTALL_DIR = /usr/pkg
+DRI_DRIVER_INSTALL_DIR = /usr/pkg/lib/modules/dri/
+

configs/dragonfly-dri

@@ -0,0 +1,56 @@
+# -*-makefile-*-
+# Configuration for dragonfly-dri: DragonFly DRI hardware drivers
+
+include $(TOP)/configs/dragonfly
+
+CONFIG_NAME = dragonfly-dri
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+WARN_FLAGS = -Wall
+OPT_FLAGS = -O -g
+
+EXPAT_INCLUDES = -I/usr/pkg/include
+X11_INCLUDES = -I/usr/pkg/include
+DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
+	-DHAVE_ALIAS
+
+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes \
+	-std=c99 -Wundef -ffast-math $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
+
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi \
+	-pedantic $(ASM_FLAGS) $(X11_INCLUDES) 
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+ASM_SOURCES = 
+
+# Library/program dependencies
+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
+LIBDRM_LIB = `pkg-config --libs libdrm`
+DRI_LIB_DEPS = -L/usr/pkg/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
+GL_LIB_DEPS = -L/usr/pkg/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
+	-lm -lpthread $(LIBDRM_LIB)
+
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/pkg/lib -lGLU -lGL -lX11 -lXmu \
+	-lXt -lXi -lm
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/pkg/lib -lGL -lXt -lX11
+
+
+# Directories
+SRC_DIRS = glx/x11 mesa glu glut/glx glw
+DRIVER_DIRS = dri
+PROGRAM_DIRS = 
+WINDOW_SYSTEM = dri
+
+DRM_SOURCE_PATH = $(TOP)/../drm
+
+# ffb and gamma are missing because they have not been converted to use the new
+# interface.
+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
+	   unichrome savage sis
+

configs/dragonfly-dri-amd64

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

configs/dragonfly-dri-x86

@@ -0,0 +1,13 @@
+# -*-makefile-*-
+# Configuration for dragonfly-dri-x86: DragonFly DRI hardware drivers
+
+include $(TOP)/configs/dragonfly-dri
+
+CONFIG_NAME = dragonfly-dri-x86
+
+# Unnecessary on x86, generally.
+PIC_FLAGS = 
+
+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)

configs/freebsd-static

@@ -0,0 +1,27 @@
+# Configuration for generic FreeBSD, making static libs
+# Written by cy on 2008-04-23.
+
+include $(TOP)/configs/freebsd
+
+CONFIG_NAME = freebsd-static
+
+MKLIB_OPTIONS = -static
+PIC_FLAGS =
+
+# Library names (actual file names)
+GL_LIB_NAME = libGL.a
+GLU_LIB_NAME = libGLU.a
+GLUT_LIB_NAME = libglut.a
+GLW_LIB_NAME = libGLw.a
+OSMESA_LIB_NAME = libOSMesa.a
+
+# Library/program dependencies (static libs don't have dependencies)
+GL_LIB_DEPS = 
+OSMESA_LIB_DEPS = 
+GLU_LIB_DEPS = 
+GLUT_LIB_DEPS = 
+GLW_LIB_DEPS = 
+
+# Need to specify all libraries we may need
+APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread \
+	-lstdc++ -lm

configs/linux-dri-bp

@@ -1,55 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
-#MKDEP_OPTIONS = -MF depend
-
-WARN_FLAGS = -Wall
-OPT_FLAGS  = -g
-PIC_FLAGS  = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 
-
-X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-
-CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
-	$(ASM_FLAGS) -std=c99 -ffast-math 
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-
-ASM_SOURCES = 
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
-GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB)  -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS  = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
-
-
-# Directories
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
-DRIVER_DIRS = dri
-PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri
-
-# ffb and gamma are missing because they have not been converted to use the new
-# interface.
-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon s3v \
-	savage sis tdfx trident unichrome fb

configs/linux-osmesa-static

@@ -1,14 +0,0 @@
-# Configuration for building only libOSMesa on Linux, no Xlib driver
-# This doesn't really have any Linux dependencies, so it should be usable
-# on other (gcc-based) systems.
-
-include $(TOP)/configs/linux-osmesa
-
-CONFIG_NAME = linux-osmesa-static
-
-# Compiler and flags
-MKLIB_OPTIONS = -static
-
-# Library names
-OSMESA_LIB_NAME = libOSMesa.a
-

configs/linux-osmesa32-static

@@ -1,28 +0,0 @@
-# Configuration for 32 bits/channel OSMesa library on Linux
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-osmesa32-static
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-MKLIB_OPTIONS = -static
-
-
-# Library names
-OSMESA_LIB = OSMesa32
-OSMESA_LIB_NAME = libOSMesa32.a
-
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS = 
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lOSMesa32

configs/linux-tcc

@@ -1,22 +0,0 @@
-# Configuration for debugging on Linux
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-tcc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-TCC_DIR=/home/progs/tcc-0.9.20
-
-CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DUSE_TCC -I$(TCC_DIR)
-
-CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
-
-GLUT_CFLAGS = -fexceptions
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L$(TCC_DIR) -ltcc -ldl
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

debian/changelog

@@ -1,3 +1,44 @@
+mesa (7.0.3-3) unstable; urgency=low
+
+  * Pull from mesa_7_0_branch (718724de).
+    + Fix intel_batchbuffer_space on i965, closes: #455817.
+    + Fix busy error in i915_wait_irq for real now, closes: #467319.
+  * Move our configs/ changes from the .diff.gz into our quilt patches,
+    with 04_cleanup-osmesa-configs.patch renamed into 04_debian-configs.patch,
+    closes: #485161.
+
+ -- Brice Goglin <bgoglin@debian.org>  Tue, 17 Jun 2008 20:00:51 +0200
+
+mesa (7.0.3-2) unstable; urgency=low
+
+  * Pull from mesa_7_0_branch (03447de3).
+  * Set right cliprects for the current draw region on Intel, closes: #467319.
+  * Use BRW_TEXCOORDMODE_CLAMP instead of BRW_TEXCOORDMODE_CLAMP_BORDER
+    to implement GL_CLAMP on i965, closes: #478880.
+  * Fix segment fault with BASE_LEVEL set to 5 for MipMap on i915,
+    closes: #451339.
+  * Disable low impact fallback on r300 by default, closes: #440868.
+
+ -- Brice Goglin <bgoglin@debian.org>  Fri, 13 Jun 2008 06:53:29 +0200
+
+mesa (7.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Only call ProgramStringNotify if program parsing succeeded,
+    closes: #473551.
+
+ -- Brice Goglin <bgoglin@debian.org>  Fri, 11 Apr 2008 08:42:37 +0200
+
+mesa (7.0.3~rc2-2) unstable; urgency=low
+
+  * Pull from mesa_7_0_branch (1e83d70b).
+  * Fixes regression in the i965 dri driver (closes: #470984, #470084)
+  * Update 02_use-ieee-fp-on-s390-and-m68k.patch.
+  * Change libgl1-mesa-swx11-i686's pre-dependency on libgl1-mesa-swx11 to a
+    regular versioned dependency, and add ${shlibs:Depends}.
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 31 Mar 2008 16:47:31 +0200
+
 mesa (7.0.3~rc2-1) unstable; urgency=low
 
   * New upstream release candidate.

debian/control

@@ -60,7 +60,7 @@ Package: libgl1-mesa-swx11-i686
 Section: libs
 Priority: extra
 Architecture: i386
-Pre-Depends: libgl1-mesa-swx11
+Depends: libgl1-mesa-swx11 (= ${binary:Version}), ${shlibs:Depends}
 Description: Mesa OpenGL runtime [i686 optimized]
  Mesa is a 3-D graphics library with an API which is very similar to
  that of OpenGL.  To the extent that Mesa utilizes the OpenGL command

debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch

@@ -12,7 +12,7 @@ Index: mesa/src/mesa/main/imports.h
  #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
 -    defined(__s390x__) || defined(__powerpc__) || \
 +    defined(__s390__) || defined(__s390x__) || defined(__powerpc__) || \
-     defined(__amd64__) || \
+     defined(__amd64__) || defined(__x86_64__) || \
 +    defined(__m68k__) || \
      defined(ia64) || defined(__ia64__) || \
      defined(__hppa__) || defined(hpux) || \

debian/patches/04_cleanup-osmesa-configs.patch

@@ -1,197 +0,0 @@
-Index: mesa/configs/linux-osmesa
-===================================================================
---- mesa.orig/configs/linux-osmesa	2007-11-11 00:24:07.000000000 +0100
-+++ mesa/configs/linux-osmesa	2007-11-11 00:33:20.000000000 +0100
-@@ -9,8 +9,17 @@
- # Compiler and flags
- CC = gcc
- CXX = g++
--CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
--CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-+
-+PIC_FLAGS  = -fPIC
-+
-+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-+	-D_BSD_SOURCE -D_GNU_SOURCE \
-+	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
-+
-+CFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
-+	$(ASM_FLAGS) -ffast-math
-+
-+CXXFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
- 
- # Work around aliasing bugs - developers should comment this out
- CFLAGS += -fno-strict-aliasing
-@@ -26,3 +35,4 @@
- OSMESA_LIB_DEPS = -lm -lpthread
- GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
- APP_LIB_DEPS = -lOSMesa -lGLU
-+
-Index: mesa/configs/linux-osmesa-static
-===================================================================
---- mesa.orig/configs/linux-osmesa-static	2007-11-11 00:24:01.000000000 +0100
-+++ mesa/configs/linux-osmesa-static	2007-11-11 00:33:20.000000000 +0100
-@@ -8,7 +8,8 @@
- 
- # Compiler and flags
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
- 
- # Library names
--OSMESA_LIB_NAME = libOSMesa.a
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
- 
-Index: mesa/configs/linux-osmesa16
-===================================================================
---- mesa.orig/configs/linux-osmesa16	2007-11-11 00:24:07.000000000 +0100
-+++ mesa/configs/linux-osmesa16	2007-11-11 00:33:41.000000000 +0100
-@@ -1,31 +1,19 @@
- # Configuration for 16 bits/channel OSMesa library on Linux
- 
--include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa
- 
- CONFIG_NAME = linux-osmesa16
- 
--# Compiler and flags
--CC = gcc
--CXX = g++
--CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
--CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
--
- # Work around aliasing bugs - developers should comment this out
- CFLAGS += -fno-strict-aliasing
- CXXFLAGS += -fno-strict-aliasing
--
-+DEFINES += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=32
- # Library names
- OSMESA_LIB = OSMesa16
--OSMESA_LIB_NAME = libOSMesa16.so
--
- 
- # Directories
--SRC_DIRS = mesa glu
--DRIVER_DIRS = osmesa
- PROGRAM_DIRS = 
- 
--
- # Dependencies
--OSMESA_LIB_DEPS = -lm -lpthread
--GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
--APP_LIB_DEPS = -lOSMesa16
-+APP_LIB_DEPS = -l$(OSMESA_LIB)
-+
-Index: mesa/configs/linux-osmesa16-static
-===================================================================
---- mesa.orig/configs/linux-osmesa16-static	2007-11-11 00:24:07.000000000 +0100
-+++ mesa/configs/linux-osmesa16-static	2007-11-11 00:33:20.000000000 +0100
-@@ -1,14 +1,10 @@
- # Configuration for 16 bits/channel OSMesa library on Linux
- 
--include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa16
- 
- CONFIG_NAME = linux-osmesa16-static
- 
- # Compiler and flags
--CC = gcc
--CXX = g++
--CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
--CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
- MKLIB_OPTIONS = -static
- PIC_FLAGS =
- 
-@@ -17,16 +13,5 @@
- CXXFLAGS += -fno-strict-aliasing
- 
- # Library names
--OSMESA_LIB = OSMesa16
--OSMESA_LIB_NAME = libOSMesa16.a
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
- 
--
--# Directories
--SRC_DIRS = mesa glu
--DRIVER_DIRS = osmesa
--PROGRAM_DIRS = 
--
--
--# Dependencies
--OSMESA_LIB_DEPS = -lm -lpthread
--APP_LIB_DEPS = -lOSMesa16
-Index: mesa/configs/linux-osmesa32
-===================================================================
---- mesa.orig/configs/linux-osmesa32	2007-11-11 00:24:07.000000000 +0100
-+++ mesa/configs/linux-osmesa32	2007-11-11 00:33:51.000000000 +0100
-@@ -1,31 +1,22 @@
- # Configuration for 32 bits/channel OSMesa library on Linux
- 
--include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa
- 
- CONFIG_NAME = linux-osmesa32
- 
- # Compiler and flags
--CC = gcc
--CXX = g++
--CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
--CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
- 
- # Work around aliasing bugs - developers should comment this out
- CFLAGS += -fno-strict-aliasing
- CXXFLAGS += -fno-strict-aliasing
-+DEFINES += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
- 
- # Library names
- OSMESA_LIB = OSMesa32
--OSMESA_LIB_NAME = libOSMesa32.so
--
- 
- # Directories
--SRC_DIRS = mesa glu
--DRIVER_DIRS = osmesa
- PROGRAM_DIRS = 
- 
--
- # Dependencies
--OSMESA_LIB_DEPS = -lm -lpthread
--GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
--APP_LIB_DEPS = -lOSMesa32
-+APP_LIB_DEPS = -l$(OSMESA_LIB)
-+
-Index: mesa/configs/linux-osmesa32-static
-===================================================================
---- mesa.orig/configs/linux-osmesa32-static	2007-11-11 00:24:01.000000000 +0100
-+++ mesa/configs/linux-osmesa32-static	2007-11-11 00:33:20.000000000 +0100
-@@ -1,28 +1,13 @@
- # Configuration for 32 bits/channel OSMesa library on Linux
- 
--include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa32
- 
- CONFIG_NAME = linux-osmesa32-static
- 
- # Compiler and flags
--CC = gcc
--CXX = g++
--CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
--CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
- MKLIB_OPTIONS = -static
--
-+PIC_FLAGS =
- 
- # Library names
--OSMESA_LIB = OSMesa32
--OSMESA_LIB_NAME = libOSMesa32.a
--
--
--# Directories
--SRC_DIRS = mesa glu
--DRIVER_DIRS = osmesa
--PROGRAM_DIRS = 
--
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
- 
--# Dependencies
--OSMESA_LIB_DEPS = -lm -lpthread
--APP_LIB_DEPS = -lOSMesa32

debian/patches/04_debian-configs.patch

@@ -0,0 +1,892 @@
+---
+ configs/debian-default                    |   17 ++++++
+ configs/debian-dri-amd64                  |    9 +++
+ configs/debian-dri-any                    |    9 +++
+ configs/debian-dri-default                |   36 ++++++++++++++
+ configs/debian-dri-i386                   |    9 +++
+ configs/debian-dri-i386-i686              |   14 +++++
+ configs/debian-dri-optimized-default      |   13 +++++
+ configs/debian-indirect-default           |    7 ++
+ configs/debian-indirect-hurd-i386         |    9 +++
+ configs/debian-osmesa                     |    9 +++
+ configs/debian-osmesa-default             |   10 ++++
+ configs/debian-osmesa-static              |    9 +++
+ configs/debian-osmesa16                   |   10 ++++
+ configs/debian-osmesa16-static            |   10 ++++
+ configs/debian-osmesa32                   |   10 ++++
+ configs/debian-osmesa32-static            |   10 ++++
+ configs/debian-swx11+glu-alpha-ev5        |   12 ++++
+ configs/debian-swx11+glu-amd64            |   10 ++++
+ configs/debian-swx11+glu-any              |    9 +++
+ configs/debian-swx11+glu-default          |   14 +++++
+ configs/debian-swx11+glu-i386             |   10 ++++
+ configs/debian-swx11+glu-i386-i686        |   14 +++++
+ configs/debian-swx11+glu-powerpc-603      |   13 +++++
+ configs/debian-swx11+glu-ppc64            |   11 ++++
+ configs/debian-swx11+glu-sparc            |   10 ++++
+ configs/debian-swx11+glu-sparc-ultrasparc |   13 +++++
+ configs/debian-swx11+glu-static-amd64     |   10 ++++
+ configs/debian-swx11+glu-static-any       |   10 ++++
+ configs/debian-swx11+glu-static-i386      |   10 ++++
+ configs/debian-swx11+glu-static-ppc64     |   11 ++++
+ configs/default-bp                        |   75 ++++++++++++++++++++++++++++++
+ configs/linux-dri-bp                      |   55 ++++++++++++++++++++++
+ configs/linux-osmesa                      |   14 ++++-
+ configs/linux-osmesa-static               |   15 ++++++
+ configs/linux-osmesa16                    |   20 +-------
+ configs/linux-osmesa16-static             |   19 -------
+ configs/linux-osmesa32                    |   17 +-----
+ configs/linux-osmesa32-static             |   13 +++++
+ configs/linux-tcc                         |   22 ++++++++
+ 39 files changed, 550 insertions(+), 48 deletions(-)
+
+Index: mesa/configs/debian-default
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-default	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,17 @@
++# Define Debian-specific defaults.
++
++CONFIG_NAME = debian-default
++
++OPT_FLAGS = -O2 -g
++
++# override settings in configs/linux-x86-64
++LIB_DIR = lib
++EXTRA_LIB_PATH =
++
++SRC_DIRS = mesa
++PROGRAM_DIRS =
++
++INSTALL_DIR = /usr
++
++# vim: ft=make
++
+Index: mesa/configs/debian-dri-amd64
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-dri-amd64	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,9 @@
++# Configuration for building the DRI drivers on i386.
++
++include $(TOP)/configs/linux-dri-x86-64
++include $(TOP)/configs/debian-dri-default
++
++CONFIG_NAME = debian-dri-amd64
++
++# vim: ft=make
++
+Index: mesa/configs/debian-dri-any
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-dri-any	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,9 @@
++# Configuration for building the DRI drivers on the build architecture.
++
++include $(TOP)/configs/linux-dri
++include $(TOP)/configs/debian-dri-default
++
++CONFIG_NAME = debian-dri-any
++
++# vim: ft=make
++
+Index: mesa/configs/debian-dri-default
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-dri-default	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,36 @@
++# Configuration defaults for building the DRI drivers and DRI/GLX-enabled
++# libGL.
++
++include $(TOP)/configs/debian-default
++
++CONFIG_NAME = debian-dri-default
++
++SRC_DIRS = glx/x11 mesa progs
++DRIVER_DIRS = dri
++PROGRAM_DIRS = xdemos
++PROGS = glxdemo \
++        glxgears \
++        glxheads \
++        glxinfo
++
++LIB_DIR = lib/glx
++
++DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
++DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
++
++DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
++
++ARCH_X86 = i386 amd64
++
++ifneq ($(findstring $(DEB_BUILD_ARCH), $(ARCH_X86)),)
++	DRI_DIRS += i810 i915 i915tex i965 sis unichrome
++endif
++
++ifeq ($(DEB_BUILD_ARCH), sparc)
++	DRI_DIRS += ffb
++endif
++
++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
++
++# vim: ft=make
++
+Index: mesa/configs/debian-dri-i386
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-dri-i386	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,9 @@
++# Configuration for building the DRI drivers on i386.
++
++include $(TOP)/configs/linux-dri-x86
++include $(TOP)/configs/debian-dri-default
++
++CONFIG_NAME = debian-dri-i386
++
++# vim: ft=make
++
+Index: mesa/configs/debian-dri-i386-i686
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-dri-i386-i686	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,14 @@
++# Configuration for building the DRI drivers on i386.
++
++include $(TOP)/configs/linux-dri-x86
++include $(TOP)/configs/debian-dri-optimized-default
++
++CONFIG_NAME = debian-dri-i386-i686
++
++ARCH_FLAGS = -march=i686
++LIB_DIR = lib/glx/i686/cmov
++
++DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri/i686/cmov
++
++# vim: ft=make
++
+Index: mesa/configs/debian-dri-optimized-default
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-dri-optimized-default	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,13 @@
++# Configuration defaults for CPU-optimized builds of the DRI drivers and
++# DRI/GLX-enabled libGL.
++
++include $(TOP)/configs/debian-dri-default
++
++CONFIG_NAME = debian-dri-optimized-default
++
++# override so that the utility programs are not rebuilt with CPU-specific
++# optimizations
++SRC_DIRS = glx/x11 mesa
++
++# vim: ft=make
++
+Index: mesa/configs/debian-indirect-default
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-indirect-default	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,7 @@
++# Configuration defaults for building GLX-enabled libGL.
++
++include $(TOP)/configs/debian-dri-default
++
++CONFIG_NAME = debian-indirect-default
++
++DRI_DIRS = 
+Index: mesa/configs/debian-indirect-hurd-i386
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-indirect-hurd-i386	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,9 @@
++# Configuration for building the DRI drivers on the build architecture.
++
++include $(TOP)/configs/linux-indirect
++include $(TOP)/configs/debian-indirect-default
++
++CONFIG_NAME = debian-indirect-hurd-i386
++
++# vim: ft=make
++
+Index: mesa/configs/debian-osmesa
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-osmesa	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,9 @@
++# Configuration for building only OSMesa on Debian.
++
++include $(TOP)/configs/linux-osmesa
++include $(TOP)/configs/debian-osmesa-default
++
++CONFIG_NAME = debian-osmesa
++
++# vim: ft=make
++
+Index: mesa/configs/debian-osmesa-default
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-osmesa-default	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,10 @@
++# Configuration defaults for building OSMesa.
++
++include $(TOP)/configs/debian-default
++
++CONFIG_NAME = debian-osmesa-default
++
++DRIVER_DIRS = osmesa
++
++# vim: ft=make
++
+Index: mesa/configs/debian-osmesa-static
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-osmesa-static	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,9 @@
++# Configuration for building only OSMesa (static version) on Debian.
++
++include $(TOP)/configs/linux-osmesa-static
++include $(TOP)/configs/debian-osmesa-default
++
++CONFIG_NAME = debian-osmesa-static
++
++# vim: ft=make
++
+Index: mesa/configs/debian-osmesa16
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-osmesa16	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,10 @@
++# Configuration for building OSMesa with support for 16 bits per color
++# channel.
++
++include $(TOP)/configs/linux-osmesa16
++include $(TOP)/configs/debian-osmesa-default
++
++CONFIG_NAME = debian-osmesa16
++
++# vim: ft=make
++
+Index: mesa/configs/debian-osmesa16-static
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-osmesa16-static	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,10 @@
++# Configuration for building a static version of OSMesa with support for 16
++# bits per color channel.
++
++include $(TOP)/configs/linux-osmesa16-static
++include $(TOP)/configs/debian-osmesa-default
++
++CONFIG_NAME = debian-osmesa16-static
++
++# vim: ft=make
++
+Index: mesa/configs/debian-osmesa32
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-osmesa32	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,10 @@
++# Configuration for building OSMesa with support for 32 bits per color
++# channel.
++
++include $(TOP)/configs/linux-osmesa32
++include $(TOP)/configs/debian-osmesa-default
++
++CONFIG_NAME = debian-osmesa32
++
++# vim: ft=make
++
+Index: mesa/configs/debian-osmesa32-static
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-osmesa32-static	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,10 @@
++# Configuration for building a static version of OSMesa with support for 32
++# bits per color channel.
++
++include $(TOP)/configs/linux-osmesa32-static
++include $(TOP)/configs/debian-osmesa-default
++
++CONFIG_NAME = debian-osmesa32-static
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-alpha-ev5
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-alpha-ev5	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,12 @@
++# Configuration for building Mesa (swx11 and GLU) on alpha (ev5 optimized).
++
++include $(TOP)/configs/linux-alpha
++include $(TOP)/configs/debian-swx11+glu-default
++
++CONFIG_NAME = debian-swx11+glu-alpha-ev5
++
++SRC_DIRS = mesa
++LIB_DIR = lib/ev5/cmov
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-amd64
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-amd64	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,10 @@
++# Configuration for building Mesa (swx11 and GLU) with runtime-detected
++# assembler optimizations on amd64.
++
++include $(TOP)/configs/linux-x86-64
++include $(TOP)/configs/debian-swx11+glu-default
++
++CONFIG_NAME = debian-swx11+glu-amd64
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-any
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-any	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,9 @@
++# Configuration for building Mesa (swx11 and GLU) on the build architecture.
++
++include $(TOP)/configs/linux
++include $(TOP)/configs/debian-swx11+glu-default
++
++CONFIG_NAME = debian-swx11+glu-any
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-default
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-default	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,14 @@
++# Configuration defaults for building Mesa (swx11 and GLU).
++
++include $(TOP)/configs/debian-default
++
++CONFIG_NAME = debian-swx11+glu-default
++
++SRC_DIRS = mesa glu glw
++DRIVER_DIRS = x11
++
++GLW_SOURCES += GLwMDrawA.c
++GLW_LIB_DEPS += -lXm
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-i386
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-i386	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,10 @@
++# Configuration for building Mesa (swx11 and GLU) with runtime-detected
++# assembler optimizations on i386.
++
++include $(TOP)/configs/linux-x86
++include $(TOP)/configs/debian-swx11+glu-default
++
++CONFIG_NAME = debian-swx11+glu-i386
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-i386-i686
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-i386-i686	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,14 @@
++# Configuration for building Mesa (swx11 and GLU) with runtime-detected
++# assembler optimizations on i386 (i686 optimized).
++
++include $(TOP)/configs/linux-x86
++include $(TOP)/configs/debian-swx11+glu-default
++
++CONFIG_NAME = debian-swx11+glu-i386-i686
++
++ARCH_FLAGS += -march=i686
++SRC_DIRS = mesa
++LIB_DIR = lib/i686/cmov
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-powerpc-603
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-powerpc-603	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,13 @@
++# Configuration for building Mesa (swx11 and GLU) with runtime-detected
++# assembler optimizations on powerpc (603 optimized).
++
++include $(TOP)/configs/linux-ppc
++include $(TOP)/configs/debian-swx11+glu-default
++
++CONFIG_NAME = debian-swx11+glu-powerpc-603
++
++SRC_DIRS = mesa
++LIB_DIR = lib/603/cmov
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-ppc64
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-ppc64	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,11 @@
++# Configuration for building Mesa (swx11 and GLU) with runtime-detected
++# assembler optimizations on ppc64.
++
++include $(TOP)/configs/debian-swx11+glu-any
++
++CONFIG_NAME = debian-swx11+glu-ppc64
++
++LIB_DIR = lib64
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-sparc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-sparc	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,10 @@
++# Configuration for building Mesa (swx11 and GLU) with runtime-detected
++# assembler optimizations on sparc.
++
++include $(TOP)/configs/linux-sparc
++include $(TOP)/configs/debian-swx11+glu-default
++
++CONFIG_NAME = debian-swx11+glu-sparc
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-sparc-ultrasparc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-sparc-ultrasparc	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,13 @@
++# Configuration for building Mesa (swx11 and GLU) with runtime-detected
++# assembler optimizations on sparc (ultrasparc-optimized).
++
++include $(TOP)/configs/linux-ultrasparc
++include $(TOP)/configs/debian-swx11+glu-default
++
++CONFIG_NAME = debian-swx11+glu-sparc-ultrasparc
++
++SRC_DIRS = mesa
++LIB_DIR = lib/ultrasparc/cmov
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-static-amd64
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-static-amd64	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,10 @@
++# Configuration for building static versions of the libraries (swx11 and GLU)
++# on amd64.
++
++include $(TOP)/configs/linux-x86-64-static
++include $(TOP)/configs/debian-swx11+glu-default
++
++CONFIG_NAME = debian-swx11+glu-static-amd64
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-static-any
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-static-any	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,10 @@
++# Configuration for building static versions of the libraries (swx11 and GLU)
++# on the build architecture.
++
++include $(TOP)/configs/linux-static
++include $(TOP)/configs/debian-swx11+glu-default
++
++CONFIG_NAME = debian-swx11+glu-static-any
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-static-i386
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-static-i386	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,10 @@
++# Configuration for building static versions of the libraries (swx11 and GLU)
++# on i386.
++
++include $(TOP)/configs/linux-x86-static
++include $(TOP)/configs/debian-swx11+glu-default
++
++CONFIG_NAME = debian-swx11+glu-static-i386
++
++# vim: ft=make
++
+Index: mesa/configs/debian-swx11+glu-static-ppc64
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/debian-swx11+glu-static-ppc64	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,11 @@
++# Configuration for building static versions of the libraries (swx11 and GLU)
++# on ppc64.
++
++include $(TOP)/configs/debian-swx11+glu-static-any
++
++CONFIG_NAME = debian-swx11+glu-static-ppc64
++
++LIB_DIR = lib64
++
++# vim: ft=make
++
+Index: mesa/configs/default-bp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/default-bp	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,75 @@
++# Default/template configuration
++
++# This is included by other config files which may override some
++# of these variables.
++
++CONFIG_NAME = default
++
++# Version info
++MESA_MAJOR=6
++MESA_MINOR=3
++MESA_TINY=0
++
++# external projects
++#DRM_SOURCE_PATH=$(TOP)/../drm
++DRM_SOURCE_PATH=/home/projects/DRI-freedesktop/drm
++
++# Compiler and flags
++CC = cc
++CXX = CC
++CFLAGS = -O
++CXXFLAGS = -O
++GLU_CFLAGS = 
++
++# Misc tools and flags
++MKLIB_OPTIONS = 
++MKDEP = makedepend
++MKDEP_OPTIONS = -fdepend
++MAKE = make
++
++# Library names (base name)
++GL_LIB = GL
++GLU_LIB = GLU
++GLUT_LIB = glut
++GLW_LIB = GLw
++OSMESA_LIB = OSMesa
++
++
++# Library names (actual file names)
++GL_LIB_NAME = lib$(GL_LIB).so
++GLU_LIB_NAME = lib$(GLU_LIB).so
++GLUT_LIB_NAME = lib$(GLUT_LIB).so
++GLW_LIB_NAME = lib$(GLW_LIB).so
++OSMESA_LIB_NAME = lib$(OSMesa).so
++
++
++# Optional assembly language optimization files for libGL
++ASM_SOURCES = 
++
++# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
++# order to build the Motif widget too)
++GLW_SOURCES = GLwDrawA.c
++
++
++# Directories
++LIB_DIR = $(TOP)/lib
++INSTALL_PREFIX = /usr/local
++SRC_DIRS = mesa glu glut/glx glw
++GLU_DIRS = sgi
++DRIVER_DIRS = x11 osmesa
++# Which subdirs under $(TOP)/progs/ to enter:
++PROGRAM_DIRS = demos redbook samples xdemos
++
++
++# Library/program dependencies
++GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
++OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
++GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
++GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
++GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
++APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
++
++
++# Shading language support (set to 0 or 1)
++SHADING_LANGUAGE = 0
++
+Index: mesa/configs/linux-dri-bp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/linux-dri-bp	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,55 @@
++# -*-makefile-*-
++# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
++
++include $(TOP)/configs/default
++
++CONFIG_NAME = linux-dri
++
++# Compiler and flags
++CC = gcc
++CXX = g++
++
++MKDEP = /usr/X11R6/bin/makedepend
++#MKDEP = gcc -M
++#MKDEP_OPTIONS = -MF depend
++
++WARN_FLAGS = -Wall
++OPT_FLAGS  = -g
++PIC_FLAGS  = -fPIC
++
++# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
++ARCH_FLAGS ?=
++
++DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
++	-D_BSD_SOURCE -D_GNU_SOURCE \
++	-DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 
++
++X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
++
++CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
++	$(ASM_FLAGS) -std=c99 -ffast-math 
++
++CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
++
++
++ASM_SOURCES = 
++
++# Library/program dependencies
++EXTRA_LIB_PATH=-L/usr/X11R6/lib
++
++DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
++GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
++GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB)  -lX11 -lXmu -lXt -lXi -lm
++GLW_LIB_DEPS  = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
++
++
++# Directories
++SRC_DIRS = glx/x11 mesa glu glut/glx glw
++DRIVER_DIRS = dri
++PROGRAM_DIRS = 
++WINDOW_SYSTEM=dri
++
++# ffb and gamma are missing because they have not been converted to use the new
++# interface.
++DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon s3v \
++	savage sis tdfx trident unichrome fb
+Index: mesa/configs/linux-osmesa-static
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/linux-osmesa-static	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,15 @@
++# Configuration for building only libOSMesa on Linux, no Xlib driver
++# This doesn't really have any Linux dependencies, so it should be usable
++# on other (gcc-based) systems.
++
++include $(TOP)/configs/linux-osmesa
++
++CONFIG_NAME = linux-osmesa-static
++
++# Compiler and flags
++MKLIB_OPTIONS = -static
++PIC_FLAGS =
++
++# Library names
++OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
++
+Index: mesa/configs/linux-osmesa32-static
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/linux-osmesa32-static	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,13 @@
++# Configuration for 32 bits/channel OSMesa library on Linux
++
++include $(TOP)/configs/linux-osmesa32
++
++CONFIG_NAME = linux-osmesa32-static
++
++# Compiler and flags
++MKLIB_OPTIONS = -static
++PIC_FLAGS =
++
++# Library names
++OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
++
+Index: mesa/configs/linux-tcc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mesa/configs/linux-tcc	2008-06-17 19:27:49.000000000 +0200
+@@ -0,0 +1,22 @@
++# Configuration for debugging on Linux
++
++include $(TOP)/configs/default
++
++CONFIG_NAME = linux-tcc
++
++# Compiler and flags
++CC = gcc
++CXX = g++
++
++TCC_DIR=/home/progs/tcc-0.9.20
++
++CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DUSE_TCC -I$(TCC_DIR)
++
++CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
++
++GLUT_CFLAGS = -fexceptions
++
++GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L$(TCC_DIR) -ltcc -ldl
++GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
++GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
++APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
+Index: mesa/configs/linux-osmesa
+===================================================================
+--- mesa.orig/configs/linux-osmesa	2008-06-16 00:50:38.000000000 +0200
++++ mesa/configs/linux-osmesa	2008-06-17 19:27:49.000000000 +0200
+@@ -9,8 +9,17 @@
+ # Compiler and flags
+ CC = gcc
+ CXX = g++
+-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
+-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
++
++PIC_FLAGS  = -fPIC
++
++DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
++	-D_BSD_SOURCE -D_GNU_SOURCE \
++	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
++
++CFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
++	$(ASM_FLAGS) -ffast-math
++
++CXXFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
+ 
+ # Work around aliasing bugs - developers should comment this out
+ CFLAGS += -fno-strict-aliasing
+@@ -26,3 +35,4 @@
+ OSMESA_LIB_DEPS = -lm -lpthread
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+ APP_LIB_DEPS = -lOSMesa -lGLU
++
+Index: mesa/configs/linux-osmesa16
+===================================================================
+--- mesa.orig/configs/linux-osmesa16	2008-06-16 00:50:38.000000000 +0200
++++ mesa/configs/linux-osmesa16	2008-06-17 19:27:49.000000000 +0200
+@@ -1,31 +1,19 @@
+ # Configuration for 16 bits/channel OSMesa library on Linux
+ 
+-include $(TOP)/configs/default
++include $(TOP)/configs/linux-osmesa
+ 
+ CONFIG_NAME = linux-osmesa16
+ 
+-# Compiler and flags
+-CC = gcc
+-CXX = g++
+-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+-
+ # Work around aliasing bugs - developers should comment this out
+ CFLAGS += -fno-strict-aliasing
+ CXXFLAGS += -fno-strict-aliasing
+-
++DEFINES += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=32
+ # Library names
+ OSMESA_LIB = OSMesa16
+-OSMESA_LIB_NAME = libOSMesa16.so
+-
+ 
+ # Directories
+-SRC_DIRS = mesa glu
+-DRIVER_DIRS = osmesa
+ PROGRAM_DIRS = 
+ 
+-
+ # Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
+-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+-APP_LIB_DEPS = -lOSMesa16
++APP_LIB_DEPS = -l$(OSMESA_LIB)
++
+Index: mesa/configs/linux-osmesa16-static
+===================================================================
+--- mesa.orig/configs/linux-osmesa16-static	2008-06-16 00:50:38.000000000 +0200
++++ mesa/configs/linux-osmesa16-static	2008-06-17 19:27:49.000000000 +0200
+@@ -1,14 +1,10 @@
+ # Configuration for 16 bits/channel OSMesa library on Linux
+ 
+-include $(TOP)/configs/default
++include $(TOP)/configs/linux-osmesa16
+ 
+ CONFIG_NAME = linux-osmesa16-static
+ 
+ # Compiler and flags
+-CC = gcc
+-CXX = g++
+-CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+-CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+ MKLIB_OPTIONS = -static
+ PIC_FLAGS =
+ 
+@@ -17,16 +13,5 @@
+ CXXFLAGS += -fno-strict-aliasing
+ 
+ # Library names
+-OSMESA_LIB = OSMesa16
+-OSMESA_LIB_NAME = libOSMesa16.a
++OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+ 
+-
+-# Directories
+-SRC_DIRS = mesa glu
+-DRIVER_DIRS = osmesa
+-PROGRAM_DIRS = 
+-
+-
+-# Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
+-APP_LIB_DEPS = -lOSMesa16
+Index: mesa/configs/linux-osmesa32
+===================================================================
+--- mesa.orig/configs/linux-osmesa32	2008-06-16 00:50:38.000000000 +0200
++++ mesa/configs/linux-osmesa32	2008-06-17 19:27:49.000000000 +0200
+@@ -1,31 +1,22 @@
+ # Configuration for 32 bits/channel OSMesa library on Linux
+ 
+-include $(TOP)/configs/default
++include $(TOP)/configs/linux-osmesa
+ 
+ CONFIG_NAME = linux-osmesa32
+ 
+ # Compiler and flags
+-CC = gcc
+-CXX = g++
+-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+ 
+ # Work around aliasing bugs - developers should comment this out
+ CFLAGS += -fno-strict-aliasing
+ CXXFLAGS += -fno-strict-aliasing
++DEFINES += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+ 
+ # Library names
+ OSMESA_LIB = OSMesa32
+-OSMESA_LIB_NAME = libOSMesa32.so
+-
+ 
+ # Directories
+-SRC_DIRS = mesa glu
+-DRIVER_DIRS = osmesa
+ PROGRAM_DIRS = 
+ 
+-
+ # Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
+-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+-APP_LIB_DEPS = -lOSMesa32
++APP_LIB_DEPS = -l$(OSMESA_LIB)
++

debian/patches/series

@@ -2,4 +2,4 @@
 01_fix-makefile.patch
 02_use-ieee-fp-on-s390-and-m68k.patch
 03_optional-progs-and-install.patch
-04_cleanup-osmesa-configs.patch
+04_debian-configs.patch

docs/news.html

@@ -11,6 +11,13 @@
 <H1>News</H1>
 
 
+<h2>April 4, 2008</h2>
+<p>
+<a href="relnotes-7.0.3.html">Mesa 7.0.3</a> is released.
+This is a bug-fix release.
+</p>
+
+
 <h2>November 13, 2007</h2>
 
 <p>

docs/relnotes-7.0.3.html

@@ -8,7 +8,7 @@
 
 <body bgcolor="#eeeeee">
 
-<H1>Mesa 7.0.3 Release Notes / February TBD, 2008</H1>
+<H1>Mesa 7.0.3 Release Notes / April 4, 2008</H1>
 
 <p>
 Mesa 7.0.3 is a stable release with bug fixes since version 7.0.2.
@@ -17,6 +17,15 @@ Mesa 7.0.3 is a stable release with bug fixes since version 7.0.2.
 
 <h2>MD5 checksums</h2>
 <pre>
+3fd1cb76531b2515ef7db92d9a93dbf8  MesaLib-7.0.3.tar.gz
+e6e6379d7793af40a6bc3ce1bace572e  MesaLib-7.0.3.tar.bz2
+97882bac195229ee0b78cab82e0e3be1  MesaLib-7.0.3.zip
+8abf6bbcb1661e7dd4ce73b3fbb85898  MesaDemos-7.0.3.tar.gz
+47fd6863621d3c9c7dbb870ab7f0c303  MesaDemos-7.0.3.tar.bz2
+99e442e14da1928f76a7297bb421a3af  MesaDemos-7.0.3.zip
+2b50fe9fadc4709b57c52adef09fce3c  MesaGLUT-7.0.3.tar.gz
+0ff23c4e91b238abae63a5fc9fa003e7  MesaGLUT-7.0.3.tar.bz2
+70e83554a4462dad28e0d6e20f79aada  MesaGLUT-7.0.3.zip
 </pre>
 
 
@@ -39,8 +48,18 @@ Mesa 7.0.3 is a stable release with bug fixes since version 7.0.2.
 <li>Fixed potential crash in glDrawPixels(GL_DEPTH_COMPONENT) (bug 13915)
 <li>Bad strings given to glProgramStringARB() didn't generate GL_INVALID_OPERATION
 <li>Fixed minor point rasterization regression (bug 11016)
+<li>state.texenv.color state var didn't work in GL_ARB_fragment_program (bug 14931)
+<li>glBitmap from a PBO didn't always work
+<li>glGetTexImage into a PBO didn't always work
+<li>Comments at the end of ARB vertex/fragment programs crashed the parser
 </ul>
 
+<h2>Changes</h2>
+<ul>
+<li>Updated glext.h to version 40
+</ul>
+
+
 
 <h2>Driver Status</h2>
 

docs/relnotes-7.0.4.html

@@ -0,0 +1,67 @@
+<HTML>
+
+<TITLE>Mesa Release Notes</TITLE>
+
+<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
+
+<BODY>
+
+<body bgcolor="#eeeeee">
+
+<H1>Mesa 7.0.4 Release Notes / (TBD 2008)</H1>
+
+<p>
+Mesa 7.0.4 is a stable release with bug fixes since version 7.0.3.
+</p>
+
+
+<h2>MD5 checksums</h2>
+<pre>
+</pre>
+
+
+<h2>Bug fixes</h2>
+<ul>
+<li>define #extension GL_ARB_texture_rectangle in shading language
+<li>fixed WIN32 compile problem in libGLU
+<li>Fixed a per-vertex glMaterial bug which could cause bad lighting
+<li>Fixed potential crash in AA/smoothed triangle rendering when using a fragment shader
+<li>Fixed glDrawElement + VBO segfault (bug 16156)
+<li>Fixed GLSL linker bug causing generic vertex attributes to get aliased
+<li>Fixed stack overflow when using glPixelZoom on Windows
+</ul>
+
+<h2>Changes</h2>
+<ul>
+<li>Added support for DragonFly OS
+<li>Added a build config for FreeBSD static libs (Anatolij Shkodin)
+<li>Enabled GL_EXT_multi_draw_arrays extension in R200/R300 drivers
+<li>Enabled GL_ARB_point_sprite extension in I965 driver
+<li>Enabled GL_EXT_texture_sRGB extension in I965 driver
+<li>Added support for GL shading language in I965 driver
+</ul>
+
+
+
+
+<h2>Driver Status</h2>
+
+<pre>
+Driver			Status
+----------------------	----------------------
+DRI drivers		varies with the driver
+XMesa/GLX (on Xlib)	implements OpenGL 2.1
+OSMesa (off-screen)	implements OpenGL 2.1
+Windows/Win32		implements OpenGL 2.1
+Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
+SVGA			unsupported
+Wind River UGL		unsupported
+DJGPP			unsupported
+GGI			unsupported
+BeOS			unsupported
+Allegro			unsupported
+D3D			unsupported
+</pre>
+
+</body>
+</html>

docs/relnotes.html

@@ -20,6 +20,7 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>
 
 <UL>
+<LI><A HREF="relnotes-7.0.4.html">7.0.4 release notes</A>
 <LI><A HREF="relnotes-7.0.3.html">7.0.3 release notes</A>
 <LI><A HREF="relnotes-7.0.2.html">7.0.2 release notes</A>
 <LI><A HREF="relnotes-7.0.1.html">7.0.1 release notes</A>

include/GL/glext.h

@@ -46,9 +46,9 @@ extern "C" {
 /*************************************************************/
 
 /* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2007/02/12 */
+/* glext.h last updated 2008/03/24 */
 /* Current version at http://www.opengl.org/registry/ */
-#define GL_GLEXT_VERSION 39
+#define GL_GLEXT_VERSION 40
 
 #ifndef GL_VERSION_1_2
 #define GL_UNSIGNED_BYTE_3_3_2            0x8032
@@ -3091,8 +3091,8 @@ extern "C" {
 #ifndef GL_EXT_framebuffer_blit
 #define GL_READ_FRAMEBUFFER_EXT           0x8CA8
 #define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
-#define GL_READ_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
-#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   0x8CAA
+#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
+#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
 #endif
 
 #ifndef GL_EXT_framebuffer_multisample
@@ -3379,6 +3379,9 @@ extern "C" {
 #define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
 #endif
 
+#ifndef GL_GREMEDY_frame_terminator
+#endif
+
 
 /*************************************************************/
 
@@ -7252,6 +7255,14 @@ typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint
 typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
 #endif
 
+#ifndef GL_GREMEDY_frame_terminator
+#define GL_GREMEDY_frame_terminator 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
+#endif
+
 
 #ifdef __cplusplus
 }

progs/xdemos/glthreads.c

@@ -505,7 +505,7 @@ main(int argc, char *argv[])
    for (i = 0; i < numThreads; i++) {
       pthread_create(&WinThreads[i].Thread, NULL, thread_function,
                      (void*) &WinThreads[i]);
-      printf("glthreads: Created thread %u\n", (unsigned int) WinThreads[i].Thread);
+      printf("glthreads: Created thread %p\n", WinThreads[i].Thread);
    }
 
    if (MultiDisplays)

src/glu/sgi/libutil/mipmap.c

@@ -6627,7 +6627,7 @@ typedef void (GLAPIENTRY *TexImage3Dproc)( GLenum target, GLint level,
 
 static TexImage3Dproc pTexImage3D = 0;
 
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__WIN32__)
 #  include <dlfcn.h>
 #  include <sys/types.h>
 #else
@@ -6642,7 +6642,7 @@ static void gluTexImage3D( GLenum target, GLint level,
 			   const GLvoid *pixels )
 {
    if (!pTexImage3D) {
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__WIN32__)
       pTexImage3D = (TexImage3Dproc) wglGetProcAddress("glTexImage3D");
       if (!pTexImage3D)
 	 pTexImage3D = (TexImage3Dproc) wglGetProcAddress("glTexImage3DEXT");

src/glu/sgi/libutil/quad.c

@@ -713,8 +713,8 @@ gluSphere(GLUquadric *qobj, GLdouble radius, GLint slices, GLint stacks)
     GLfloat cosCache3b[CACHE_SIZE];
     GLfloat angle;
     GLfloat zLow, zHigh;
-    GLfloat sintemp1, sintemp2, sintemp3 = 0.0, sintemp4 = 0.0;
-    GLfloat costemp1, costemp2 = 0.0, costemp3 = 0.0, costemp4 = 0.0;
+    GLfloat sintemp1 = 0.0, sintemp2 = 0.0, sintemp3 = 0.0, sintemp4 = 0.0;
+    GLfloat costemp1 = 0.0, costemp2 = 0.0, costemp3 = 0.0, costemp4 = 0.0;
     GLboolean needCache2, needCache3;
     GLint start, finish;
 

src/glut/glx/Makefile

@@ -126,6 +126,6 @@ depend: $(SOURCES)
 	@ echo "running $(MKDEP)"
 	@ touch depend
 	@ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES) \
-		> /dev/null 
+		$(X11_INCLUDES) > /dev/null 
 
 include depend

src/glw/Makefile

@@ -61,7 +61,7 @@ $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
 depend: $(GLW_SOURCES)
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(GLW_SOURCES) \
-		> /dev/null 
+		$(X11_INCLUDES) > /dev/null 
 
 
 include depend

src/glx/x11/indirect_reqsize.c

@@ -0,0 +1,832 @@
+/* DO NOT EDIT - This file generated automatically by glX_proto_size.py (from Mesa) script */
+
+/*
+ * (C) Copyright IBM Corporation 2005
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * IBM,
+ * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+
+#include <GL/gl.h>
+#include "glxserver.h"
+#include "glxbyteorder.h"
+#include "indirect_size.h"
+#include "indirect_reqsize.h"
+
+#define __GLX_PAD(x)  (((x) + 3) & ~3)
+
+#if defined(__CYGWIN__) || defined(__MINGW32__)
+#  undef HAVE_ALIAS
+#endif
+#ifdef HAVE_ALIAS
+#  define ALIAS2(from,to) \
+    GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
+        __attribute__ ((alias( # to )));
+#  define ALIAS(from,to) ALIAS2( from, __glX ## to ## ReqSize )
+#else
+#  define ALIAS(from,to) \
+    GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
+    { return __glX ## to ## ReqSize( pc, swap ); }
+#endif
+
+
+int
+__glXCallListsReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei n = *(GLsizei *) (pc + 0);
+    GLenum type = *(GLenum *) (pc + 4);
+    GLsizei compsize;
+
+    if (swap) {
+        n = bswap_32(n);
+        type = bswap_32(type);
+    }
+
+    compsize = __glCallLists_size(type);
+    return __GLX_PAD((compsize * n));
+}
+
+int
+__glXBitmapReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = 0;
+    GLint skip_images = 0;
+    GLint skip_rows = *(GLint *) (pc + 8);
+    GLint alignment = *(GLint *) (pc + 16);
+    GLsizei width = *(GLsizei *) (pc + 20);
+    GLsizei height = *(GLsizei *) (pc + 24);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        skip_rows = bswap_32(skip_rows);
+        alignment = bswap_32(alignment);
+        width = bswap_32(width);
+        height = bswap_32(height);
+    }
+
+    return __glXImageSize(GL_COLOR_INDEX, GL_BITMAP, 0, width, height, 1,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXFogfvReqSize(const GLbyte *pc, Bool swap)
+{
+    GLenum pname = *(GLenum *) (pc + 0);
+    GLsizei compsize;
+
+    if (swap) {
+        pname = bswap_32(pname);
+    }
+
+    compsize = __glFogfv_size(pname);
+    return __GLX_PAD((compsize * 4));
+}
+
+int
+__glXLightfvReqSize(const GLbyte *pc, Bool swap)
+{
+    GLenum pname = *(GLenum *) (pc + 4);
+    GLsizei compsize;
+
+    if (swap) {
+        pname = bswap_32(pname);
+    }
+
+    compsize = __glLightfv_size(pname);
+    return __GLX_PAD((compsize * 4));
+}
+
+int
+__glXLightModelfvReqSize(const GLbyte *pc, Bool swap)
+{
+    GLenum pname = *(GLenum *) (pc + 0);
+    GLsizei compsize;
+
+    if (swap) {
+        pname = bswap_32(pname);
+    }
+
+    compsize = __glLightModelfv_size(pname);
+    return __GLX_PAD((compsize * 4));
+}
+
+int
+__glXMaterialfvReqSize(const GLbyte *pc, Bool swap)
+{
+    GLenum pname = *(GLenum *) (pc + 4);
+    GLsizei compsize;
+
+    if (swap) {
+        pname = bswap_32(pname);
+    }
+
+    compsize = __glMaterialfv_size(pname);
+    return __GLX_PAD((compsize * 4));
+}
+
+int
+__glXPolygonStippleReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = 0;
+    GLint skip_images = 0;
+    GLint skip_rows = *(GLint *) (pc + 8);
+    GLint alignment = *(GLint *) (pc + 16);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        skip_rows = bswap_32(skip_rows);
+        alignment = bswap_32(alignment);
+    }
+
+    return __glXImageSize(GL_COLOR_INDEX, GL_BITMAP, 0, 32, 32, 1,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXTexParameterfvReqSize(const GLbyte *pc, Bool swap)
+{
+    GLenum pname = *(GLenum *) (pc + 4);
+    GLsizei compsize;
+
+    if (swap) {
+        pname = bswap_32(pname);
+    }
+
+    compsize = __glTexParameterfv_size(pname);
+    return __GLX_PAD((compsize * 4));
+}
+
+int
+__glXTexImage1DReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = 0;
+    GLint skip_images = 0;
+    GLint skip_rows = *(GLint *) (pc + 8);
+    GLint alignment = *(GLint *) (pc + 16);
+    GLenum target = *(GLenum *) (pc + 20);
+    GLsizei width = *(GLsizei *) (pc + 32);
+    GLenum format = *(GLenum *) (pc + 44);
+    GLenum type = *(GLenum *) (pc + 48);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        skip_rows = bswap_32(skip_rows);
+        alignment = bswap_32(alignment);
+        target = bswap_32(target);
+        width = bswap_32(width);
+        format = bswap_32(format);
+        type = bswap_32(type);
+    }
+
+    return __glXImageSize(format, type, target, width, 1, 1,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXTexImage2DReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = 0;
+    GLint skip_images = 0;
+    GLint skip_rows = *(GLint *) (pc + 8);
+    GLint alignment = *(GLint *) (pc + 16);
+    GLenum target = *(GLenum *) (pc + 20);
+    GLsizei width = *(GLsizei *) (pc + 32);
+    GLsizei height = *(GLsizei *) (pc + 36);
+    GLenum format = *(GLenum *) (pc + 44);
+    GLenum type = *(GLenum *) (pc + 48);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        skip_rows = bswap_32(skip_rows);
+        alignment = bswap_32(alignment);
+        target = bswap_32(target);
+        width = bswap_32(width);
+        height = bswap_32(height);
+        format = bswap_32(format);
+        type = bswap_32(type);
+    }
+
+    return __glXImageSize(format, type, target, width, height, 1,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXTexEnvfvReqSize(const GLbyte *pc, Bool swap)
+{
+    GLenum pname = *(GLenum *) (pc + 4);
+    GLsizei compsize;
+
+    if (swap) {
+        pname = bswap_32(pname);
+    }
+
+    compsize = __glTexEnvfv_size(pname);
+    return __GLX_PAD((compsize * 4));
+}
+
+int
+__glXTexGendvReqSize(const GLbyte *pc, Bool swap)
+{
+    GLenum pname = *(GLenum *) (pc + 4);
+    GLsizei compsize;
+
+    if (swap) {
+        pname = bswap_32(pname);
+    }
+
+    compsize = __glTexGendv_size(pname);
+    return __GLX_PAD((compsize * 8));
+}
+
+int
+__glXTexGenfvReqSize(const GLbyte *pc, Bool swap)
+{
+    GLenum pname = *(GLenum *) (pc + 4);
+    GLsizei compsize;
+
+    if (swap) {
+        pname = bswap_32(pname);
+    }
+
+    compsize = __glTexGenfv_size(pname);
+    return __GLX_PAD((compsize * 4));
+}
+
+int
+__glXPixelMapfvReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei mapsize = *(GLsizei *) (pc + 4);
+
+    if (swap) {
+        mapsize = bswap_32(mapsize);
+    }
+
+    return __GLX_PAD((mapsize * 4));
+}
+
+int
+__glXPixelMapusvReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei mapsize = *(GLsizei *) (pc + 4);
+
+    if (swap) {
+        mapsize = bswap_32(mapsize);
+    }
+
+    return __GLX_PAD((mapsize * 2));
+}
+
+int
+__glXDrawPixelsReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = 0;
+    GLint skip_images = 0;
+    GLint skip_rows = *(GLint *) (pc + 8);
+    GLint alignment = *(GLint *) (pc + 16);
+    GLsizei width = *(GLsizei *) (pc + 20);
+    GLsizei height = *(GLsizei *) (pc + 24);
+    GLenum format = *(GLenum *) (pc + 28);
+    GLenum type = *(GLenum *) (pc + 32);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        skip_rows = bswap_32(skip_rows);
+        alignment = bswap_32(alignment);
+        width = bswap_32(width);
+        height = bswap_32(height);
+        format = bswap_32(format);
+        type = bswap_32(type);
+    }
+
+    return __glXImageSize(format, type, 0, width, height, 1,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXPrioritizeTexturesReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei n = *(GLsizei *) (pc + 0);
+
+    if (swap) {
+        n = bswap_32(n);
+    }
+
+    return __GLX_PAD((n * 4) + (n * 4));
+}
+
+int
+__glXTexSubImage1DReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = 0;
+    GLint skip_images = 0;
+    GLint skip_rows = *(GLint *) (pc + 8);
+    GLint alignment = *(GLint *) (pc + 16);
+    GLenum target = *(GLenum *) (pc + 20);
+    GLsizei width = *(GLsizei *) (pc + 36);
+    GLenum format = *(GLenum *) (pc + 44);
+    GLenum type = *(GLenum *) (pc + 48);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        skip_rows = bswap_32(skip_rows);
+        alignment = bswap_32(alignment);
+        target = bswap_32(target);
+        width = bswap_32(width);
+        format = bswap_32(format);
+        type = bswap_32(type);
+    }
+
+    return __glXImageSize(format, type, target, width, 1, 1,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXTexSubImage2DReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = 0;
+    GLint skip_images = 0;
+    GLint skip_rows = *(GLint *) (pc + 8);
+    GLint alignment = *(GLint *) (pc + 16);
+    GLenum target = *(GLenum *) (pc + 20);
+    GLsizei width = *(GLsizei *) (pc + 36);
+    GLsizei height = *(GLsizei *) (pc + 40);
+    GLenum format = *(GLenum *) (pc + 44);
+    GLenum type = *(GLenum *) (pc + 48);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        skip_rows = bswap_32(skip_rows);
+        alignment = bswap_32(alignment);
+        target = bswap_32(target);
+        width = bswap_32(width);
+        height = bswap_32(height);
+        format = bswap_32(format);
+        type = bswap_32(type);
+    }
+
+    return __glXImageSize(format, type, target, width, height, 1,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXColorTableReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = 0;
+    GLint skip_images = 0;
+    GLint skip_rows = *(GLint *) (pc + 8);
+    GLint alignment = *(GLint *) (pc + 16);
+    GLenum target = *(GLenum *) (pc + 20);
+    GLsizei width = *(GLsizei *) (pc + 28);
+    GLenum format = *(GLenum *) (pc + 32);
+    GLenum type = *(GLenum *) (pc + 36);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        skip_rows = bswap_32(skip_rows);
+        alignment = bswap_32(alignment);
+        target = bswap_32(target);
+        width = bswap_32(width);
+        format = bswap_32(format);
+        type = bswap_32(type);
+    }
+
+    return __glXImageSize(format, type, target, width, 1, 1,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXColorTableParameterfvReqSize(const GLbyte *pc, Bool swap)
+{
+    GLenum pname = *(GLenum *) (pc + 4);
+    GLsizei compsize;
+
+    if (swap) {
+        pname = bswap_32(pname);
+    }
+
+    compsize = __glColorTableParameterfv_size(pname);
+    return __GLX_PAD((compsize * 4));
+}
+
+int
+__glXColorSubTableReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = 0;
+    GLint skip_images = 0;
+    GLint skip_rows = *(GLint *) (pc + 8);
+    GLint alignment = *(GLint *) (pc + 16);
+    GLenum target = *(GLenum *) (pc + 20);
+    GLsizei count = *(GLsizei *) (pc + 28);
+    GLenum format = *(GLenum *) (pc + 32);
+    GLenum type = *(GLenum *) (pc + 36);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        skip_rows = bswap_32(skip_rows);
+        alignment = bswap_32(alignment);
+        target = bswap_32(target);
+        count = bswap_32(count);
+        format = bswap_32(format);
+        type = bswap_32(type);
+    }
+
+    return __glXImageSize(format, type, target, count, 1, 1,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXConvolutionFilter1DReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = 0;
+    GLint skip_images = 0;
+    GLint skip_rows = *(GLint *) (pc + 8);
+    GLint alignment = *(GLint *) (pc + 16);
+    GLenum target = *(GLenum *) (pc + 20);
+    GLsizei width = *(GLsizei *) (pc + 28);
+    GLenum format = *(GLenum *) (pc + 36);
+    GLenum type = *(GLenum *) (pc + 40);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        skip_rows = bswap_32(skip_rows);
+        alignment = bswap_32(alignment);
+        target = bswap_32(target);
+        width = bswap_32(width);
+        format = bswap_32(format);
+        type = bswap_32(type);
+    }
+
+    return __glXImageSize(format, type, target, width, 1, 1,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXConvolutionFilter2DReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = 0;
+    GLint skip_images = 0;
+    GLint skip_rows = *(GLint *) (pc + 8);
+    GLint alignment = *(GLint *) (pc + 16);
+    GLenum target = *(GLenum *) (pc + 20);
+    GLsizei width = *(GLsizei *) (pc + 28);
+    GLsizei height = *(GLsizei *) (pc + 32);
+    GLenum format = *(GLenum *) (pc + 36);
+    GLenum type = *(GLenum *) (pc + 40);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        skip_rows = bswap_32(skip_rows);
+        alignment = bswap_32(alignment);
+        target = bswap_32(target);
+        width = bswap_32(width);
+        height = bswap_32(height);
+        format = bswap_32(format);
+        type = bswap_32(type);
+    }
+
+    return __glXImageSize(format, type, target, width, height, 1,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXConvolutionParameterfvReqSize(const GLbyte *pc, Bool swap)
+{
+    GLenum pname = *(GLenum *) (pc + 4);
+    GLsizei compsize;
+
+    if (swap) {
+        pname = bswap_32(pname);
+    }
+
+    compsize = __glConvolutionParameterfv_size(pname);
+    return __GLX_PAD((compsize * 4));
+}
+
+int
+__glXTexImage3DReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = *(GLint *) (pc + 8);
+    GLint skip_rows = *(GLint *) (pc + 16);
+    GLint skip_images = *(GLint *) (pc + 20);
+    GLint alignment = *(GLint *) (pc + 32);
+    GLenum target = *(GLenum *) (pc + 36);
+    GLsizei width = *(GLsizei *) (pc + 48);
+    GLsizei height = *(GLsizei *) (pc + 52);
+    GLsizei depth = *(GLsizei *) (pc + 56);
+    GLenum format = *(GLenum *) (pc + 68);
+    GLenum type = *(GLenum *) (pc + 72);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        image_height = bswap_32(image_height);
+        skip_rows = bswap_32(skip_rows);
+        skip_images = bswap_32(skip_images);
+        alignment = bswap_32(alignment);
+        target = bswap_32(target);
+        width = bswap_32(width);
+        height = bswap_32(height);
+        depth = bswap_32(depth);
+        format = bswap_32(format);
+        type = bswap_32(type);
+    }
+
+    return __glXImageSize(format, type, target, width, height, depth,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXTexSubImage3DReqSize(const GLbyte *pc, Bool swap)
+{
+    GLint row_length = *(GLint *) (pc + 4);
+    GLint image_height = *(GLint *) (pc + 8);
+    GLint skip_rows = *(GLint *) (pc + 16);
+    GLint skip_images = *(GLint *) (pc + 20);
+    GLint alignment = *(GLint *) (pc + 32);
+    GLenum target = *(GLenum *) (pc + 36);
+    GLsizei width = *(GLsizei *) (pc + 60);
+    GLsizei height = *(GLsizei *) (pc + 64);
+    GLsizei depth = *(GLsizei *) (pc + 68);
+    GLenum format = *(GLenum *) (pc + 76);
+    GLenum type = *(GLenum *) (pc + 80);
+
+    if (swap) {
+        row_length = bswap_32(row_length);
+        image_height = bswap_32(image_height);
+        skip_rows = bswap_32(skip_rows);
+        skip_images = bswap_32(skip_images);
+        alignment = bswap_32(alignment);
+        target = bswap_32(target);
+        width = bswap_32(width);
+        height = bswap_32(height);
+        depth = bswap_32(depth);
+        format = bswap_32(format);
+        type = bswap_32(type);
+    }
+
+    return __glXImageSize(format, type, target, width, height, depth,
+                          image_height, row_length, skip_images,
+                          skip_rows, alignment);
+}
+
+int
+__glXCompressedTexImage1DARBReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei imageSize = *(GLsizei *) (pc + 20);
+
+    if (swap) {
+        imageSize = bswap_32(imageSize);
+    }
+
+    return __GLX_PAD(imageSize);
+}
+
+int
+__glXCompressedTexImage2DARBReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei imageSize = *(GLsizei *) (pc + 24);
+
+    if (swap) {
+        imageSize = bswap_32(imageSize);
+    }
+
+    return __GLX_PAD(imageSize);
+}
+
+int
+__glXCompressedTexImage3DARBReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei imageSize = *(GLsizei *) (pc + 28);
+
+    if (swap) {
+        imageSize = bswap_32(imageSize);
+    }
+
+    return __GLX_PAD(imageSize);
+}
+
+int
+__glXCompressedTexSubImage3DARBReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei imageSize = *(GLsizei *) (pc + 36);
+
+    if (swap) {
+        imageSize = bswap_32(imageSize);
+    }
+
+    return __GLX_PAD(imageSize);
+}
+
+int
+__glXProgramStringARBReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei len = *(GLsizei *) (pc + 8);
+
+    if (swap) {
+        len = bswap_32(len);
+    }
+
+    return __GLX_PAD(len);
+}
+
+int
+__glXDrawBuffersARBReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei n = *(GLsizei *) (pc + 0);
+
+    if (swap) {
+        n = bswap_32(n);
+    }
+
+    return __GLX_PAD((n * 4));
+}
+
+int
+__glXPointParameterfvEXTReqSize(const GLbyte *pc, Bool swap)
+{
+    GLenum pname = *(GLenum *) (pc + 0);
+    GLsizei compsize;
+
+    if (swap) {
+        pname = bswap_32(pname);
+    }
+
+    compsize = __glPointParameterfvEXT_size(pname);
+    return __GLX_PAD((compsize * 4));
+}
+
+int
+__glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap)
+{
+    GLuint num = *(GLuint *) (pc + 8);
+
+    if (swap) {
+        num = bswap_32(num);
+    }
+
+    return __GLX_PAD((num * 32));
+}
+
+int
+__glXProgramParameters4fvNVReqSize(const GLbyte *pc, Bool swap)
+{
+    GLuint num = *(GLuint *) (pc + 8);
+
+    if (swap) {
+        num = bswap_32(num);
+    }
+
+    return __GLX_PAD((num * 16));
+}
+
+int
+__glXVertexAttribs1dvNVReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei n = *(GLsizei *) (pc + 4);
+
+    if (swap) {
+        n = bswap_32(n);
+    }
+
+    return __GLX_PAD((n * 8));
+}
+
+int
+__glXVertexAttribs2dvNVReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei n = *(GLsizei *) (pc + 4);
+
+    if (swap) {
+        n = bswap_32(n);
+    }
+
+    return __GLX_PAD((n * 16));
+}
+
+int
+__glXVertexAttribs3dvNVReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei n = *(GLsizei *) (pc + 4);
+
+    if (swap) {
+        n = bswap_32(n);
+    }
+
+    return __GLX_PAD((n * 24));
+}
+
+int
+__glXVertexAttribs3fvNVReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei n = *(GLsizei *) (pc + 4);
+
+    if (swap) {
+        n = bswap_32(n);
+    }
+
+    return __GLX_PAD((n * 12));
+}
+
+int
+__glXVertexAttribs3svNVReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei n = *(GLsizei *) (pc + 4);
+
+    if (swap) {
+        n = bswap_32(n);
+    }
+
+    return __GLX_PAD((n * 6));
+}
+
+int
+__glXVertexAttribs4dvNVReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei n = *(GLsizei *) (pc + 4);
+
+    if (swap) {
+        n = bswap_32(n);
+    }
+
+    return __GLX_PAD((n * 32));
+}
+
+int
+__glXProgramNamedParameter4fvNVReqSize(const GLbyte *pc, Bool swap)
+{
+    GLsizei len = *(GLsizei *) (pc + 4);
+
+    if (swap) {
+        len = bswap_32(len);
+    }
+
+    return __GLX_PAD(len);
+}
+
+ALIAS(Fogiv, Fogfv)
+    ALIAS(Lightiv, Lightfv)
+    ALIAS(LightModeliv, LightModelfv)
+    ALIAS(Materialiv, Materialfv)
+    ALIAS(TexParameteriv, TexParameterfv)
+    ALIAS(TexEnviv, TexEnvfv)
+    ALIAS(TexGeniv, TexGenfv)
+    ALIAS(PixelMapuiv, PixelMapfv)
+    ALIAS(ColorTableParameteriv, ColorTableParameterfv)
+    ALIAS(ConvolutionParameteriv, ConvolutionParameterfv)
+    ALIAS(CompressedTexSubImage1DARB, CompressedTexImage1DARB)
+    ALIAS(CompressedTexSubImage2DARB, CompressedTexImage3DARB)
+    ALIAS(LoadProgramNV, ProgramStringARB)
+    ALIAS(RequestResidentProgramsNV, DrawBuffersARB)
+    ALIAS(VertexAttribs1fvNV, PixelMapfv)
+    ALIAS(VertexAttribs1svNV, PixelMapusv)
+    ALIAS(VertexAttribs2fvNV, VertexAttribs1dvNV)
+    ALIAS(VertexAttribs2svNV, PixelMapfv)
+    ALIAS(VertexAttribs4fvNV, VertexAttribs2dvNV)
+    ALIAS(VertexAttribs4svNV, VertexAttribs1dvNV)
+    ALIAS(VertexAttribs4ubvNV, PixelMapfv)
+    ALIAS(PointParameterivNV, PointParameterfvEXT)
+    ALIAS(ProgramNamedParameter4dvNV, CompressedTexSubImage3DARB)
+    ALIAS(DeleteFramebuffersEXT, DrawBuffersARB)
+    ALIAS(DeleteRenderbuffersEXT, DrawBuffersARB)

src/glx/x11/indirect_reqsize.h

@@ -0,0 +1,121 @@
+/* DO NOT EDIT - This file generated automatically by glX_proto_size.py (from Mesa) script */
+
+/*
+ * (C) Copyright IBM Corporation 2005
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * IBM,
+ * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#if !defined( _INDIRECT_REQSIZE_H_ )
+#  define _INDIRECT_REQSIZE_H_
+
+#  if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
+#    define HIDDEN  __attribute__((visibility("hidden")))
+#  else
+#    define HIDDEN
+#  endif
+
+#  if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
+#    define PURE __attribute__((pure))
+#  else
+#    define PURE
+#  endif
+
+extern PURE HIDDEN int __glXCallListsReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXBitmapReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXFogfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXFogivReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXLightfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXLightivReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXLightModelfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXLightModelivReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXMaterialfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXMaterialivReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXPolygonStippleReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexParameterfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexParameterivReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexImage1DReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexImage2DReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexEnvfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexEnvivReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexGendvReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexGenfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexGenivReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXMap1dReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXMap1fReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXMap2dReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXMap2fReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXPixelMapfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXPixelMapuivReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXPixelMapusvReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXDrawPixelsReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXDrawArraysReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXPrioritizeTexturesReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexSubImage1DReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexSubImage2DReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXColorTableReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXColorTableParameterfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXColorTableParameterivReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXColorSubTableReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXConvolutionFilter1DReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXConvolutionFilter2DReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXConvolutionParameterfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXConvolutionParameterivReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXSeparableFilter2DReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexImage3DReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXTexSubImage3DReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXCompressedTexImage1DARBReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXCompressedTexImage2DARBReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXCompressedTexImage3DARBReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXCompressedTexSubImage1DARBReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXCompressedTexSubImage2DARBReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXCompressedTexSubImage3DARBReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXProgramStringARBReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXDrawBuffersARBReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXPointParameterfvEXTReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXLoadProgramNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXProgramParameters4fvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXRequestResidentProgramsNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs1dvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs1fvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs1svNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs2dvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs2fvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs2svNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs3dvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs3fvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs3svNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs4dvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs4fvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs4svNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXVertexAttribs4ubvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXPointParameterivNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXProgramNamedParameter4dvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXProgramNamedParameter4fvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXDeleteFramebuffersEXTReqSize(const GLbyte *pc, Bool swap);
+extern PURE HIDDEN int __glXDeleteRenderbuffersEXTReqSize(const GLbyte *pc, Bool swap);
+
+#  undef HIDDEN
+#  undef PURE
+
+#endif /* !defined( _INDIRECT_REQSIZE_H_ ) */

src/glx/x11/indirect_size_get.h

@@ -0,0 +1,102 @@
+/* DO NOT EDIT - This file generated automatically by glX_proto_size.py (from Mesa) script */
+
+/*
+ * (C) Copyright IBM Corporation 2004
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * IBM,
+ * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#if !defined( _INDIRECT_SIZE_GET_H_ )
+#  define _INDIRECT_SIZE_GET_H_
+
+/**
+ * \file
+ * Prototypes for functions used to determine the number of data elements in
+ * various GLX protocol messages.
+ *
+ * \author Ian Romanick <idr@us.ibm.com>
+ */
+
+#  if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
+#    define PURE __attribute__((pure))
+#  else
+#    define PURE
+#  endif
+
+#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#    define FASTCALL __attribute__((fastcall))
+#  else
+#    define FASTCALL
+#  endif
+
+#  if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
+#    define INTERNAL  __attribute__((visibility("internal")))
+#  else
+#    define INTERNAL
+#  endif
+
+extern INTERNAL PURE FASTCALL GLint __glGetBooleanv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetDoublev_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetFloatv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetIntegerv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetLightfv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetLightiv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetMaterialfv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetMaterialiv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetTexEnvfv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetTexEnviv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetTexGendv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetTexGenfv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetTexGeniv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetTexParameterfv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetTexParameteriv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetTexLevelParameterfv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetTexLevelParameteriv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetColorTableParameterfv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetColorTableParameteriv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint
+__glGetConvolutionParameterfv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint
+__glGetConvolutionParameteriv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetHistogramParameterfv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetHistogramParameteriv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetMinmaxParameterfv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetMinmaxParameteriv_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetProgramivARB_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvARB_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvARB_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribivARB_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetQueryObjectivARB_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetQueryObjectuivARB_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetQueryivARB_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetProgramivNV_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvNV_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvNV_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribivNV_size(GLenum);
+extern INTERNAL PURE FASTCALL GLint
+__glGetFramebufferAttachmentParameterivEXT_size(GLenum);
+
+#  undef PURE
+#  undef FASTCALL
+#  undef INTERNAL
+
+#endif /* !defined( _INDIRECT_SIZE_GET_H_ ) */

src/mesa/Makefile

@@ -89,7 +89,8 @@ fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(COMMON_DRIVER_OBJECTS)
 # Stand-alone Mesa libGL and libOSMesa
 STAND_ALONE_DRIVER_SOURCES = \
 	$(COMMON_DRIVER_SOURCES) \
-	$(X11_DRIVER_SOURCES)
+	$(X11_DRIVER_SOURCES) \
+	$(GLIDE_DRIVER_SOURCES) 
 
 STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o)
 

src/mesa/drivers/dri/common/dri_util.c

@@ -486,6 +486,9 @@ static void driSwapBuffers( __DRInativeDisplay *dpy, void *drawablePrivate )
     __DRIdrawablePrivate *dPriv = (__DRIdrawablePrivate *) drawablePrivate;
     drm_clip_rect_t rect;
 
+    if (!dPriv->numClipRects)
+        return;
+
     dPriv->swapBuffers(dPriv);
 
     /* Check that we actually have the new damage report method */

src/mesa/drivers/dri/common/vblank.c

@@ -233,8 +233,8 @@ static int do_wait( drmVBlank * vbl, GLuint * vbl_seq, int fd )
       if ( first_time ) {
 	 fprintf(stderr, 
 		 "%s: drmWaitVBlank returned %d, IRQs don't seem to be"
-		 " working correctly.\nTry running with LIBGL_THROTTLE_REFRESH"
-		 " and LIBL_SYNC_REFRESH unset.\n", __FUNCTION__, ret);
+		 " working correctly.\nTry adjusting the vblank_mode"
+		 " configuration parameter.\n", __FUNCTION__, ret);
 	 first_time = GL_FALSE;
       }
 

src/mesa/drivers/dri/common/xmlconfig.c

@@ -63,6 +63,9 @@ extern char *program_invocation_name, *program_invocation_short_name;
 #elif defined(__NetBSD__) && defined(__NetBSD_Version) && (__NetBSD_Version >= 106000100)
 #    include <stdlib.h>
 #    define GET_PROGRAM_NAME() getprogname()
+#elif defined(__DragonFly__)
+#    include <stdlib.h>
+#    define GET_PROGRAM_NAME() getprogname()
 #endif
 
 #if !defined(GET_PROGRAM_NAME)

src/mesa/drivers/dri/i915/i915_context.h

@@ -29,6 +29,7 @@
 #define I915CONTEXT_INC
 
 #include "intel_context.h"
+#include "i915_reg.h"
 
 #define I915_FALLBACK_TEXTURE		 0x1000
 #define I915_FALLBACK_COLORMASK		 0x2000
@@ -103,6 +104,7 @@
 
 #define I915_PROGRAM_SIZE      192
 
+#define I915_MAX_INSN          (I915_MAX_TEX_INSN+I915_MAX_ALU_INSN)
 
 /* Hardware version of a parsed fragment program.  "Derived" from the
  * mesa fragment_program struct.
@@ -153,6 +155,10 @@ struct i915_fragment_program {
 				 */
 
 
+   /* Track which R registers are "live" for each instruction.
+    * A register is live between the time it's written to and the last time
+    * it's read. */
+   GLuint usedRegs[I915_MAX_INSN];
 
    /* Helpers for i915_fragprog.c:
     */

src/mesa/drivers/dri/i915/i915_fragprog.c

@@ -42,7 +42,20 @@
 #include "program.h"
 #include "programopt.h"
 
-
+static const GLfloat sin_quad_constants[2][4] = {
+   {
+      2.0,
+      -1.0,
+      .5,
+      .75
+   },
+   {
+      4.0,
+      -4.0,
+      1.0 / (2.0 * M_PI),
+      .2225
+   }
+};
 
 /* 1, -1/3!, 1/5!, -1/7! */
 static const GLfloat sin_constants[4] = {  1.0, 
@@ -91,7 +104,7 @@ static GLuint src_vector( struct i915_fragment_program *p,
 	    break;
 	 case FRAG_ATTRIB_FOGC:
 	    src = i915_emit_decl( p,  REG_TYPE_T, T_FOG_W, D0_CHANNEL_W ); 
-	    src = swizzle( src, W, W, W, W );
+	    src = swizzle(src, W, ZERO, ZERO, ONE);
 	    break;
 	 case FRAG_ATTRIB_TEX0:
 	 case FRAG_ATTRIB_TEX1:
@@ -211,7 +224,7 @@ do {								\
    GLuint coord = src_vector( p, &inst->SrcReg[0], program);	\
    /* Texel lookup */						\
 								\
-   i915_emit_texld( p,						\
+   i915_emit_texld( p, get_live_regs(p, inst),						\
 	       get_result_vector( p, inst ),			\
 	       get_result_flags( inst ),			\
 	       sampler,						\
@@ -234,6 +247,43 @@ do {									\
 #define EMIT_2ARG_ARITH( OP ) EMIT_ARITH( OP, 2 )
 #define EMIT_3ARG_ARITH( OP ) EMIT_ARITH( OP, 3 )
 
+/* 
+ * TODO: consider moving this into core 
+ */
+static void calc_live_regs( struct i915_fragment_program *p )
+{
+    const struct gl_fragment_program *program = p->ctx->FragmentProgram._Current;
+    GLuint regsUsed = 0xffff0000;
+    GLint i;
+   
+    for (i = program->Base.NumInstructions - 1; i >= 0; i--) {
+        struct prog_instruction *inst = &program->Base.Instructions[i];
+        int opArgs = _mesa_num_inst_src_regs(inst->Opcode);
+        int a;
+
+        /* Register is written to: unmark as live for this and preceeding ops */ 
+        if (inst->DstReg.File == PROGRAM_TEMPORARY)
+            regsUsed &= ~(1 << inst->DstReg.Index);
+
+        for (a = 0; a < opArgs; a++) {
+            /* Register is read from: mark as live for this and preceeding ops */ 
+            if (inst->SrcReg[a].File == PROGRAM_TEMPORARY)
+                regsUsed |= 1 << inst->SrcReg[a].Index;
+        }
+
+        p->usedRegs[i] = regsUsed;
+    }
+}
+
+static GLuint get_live_regs( struct i915_fragment_program *p, 
+                             const struct prog_instruction *inst )
+{
+    const struct gl_fragment_program *program = p->ctx->FragmentProgram._Current;
+    GLuint nr = inst - program->Base.Instructions;
+
+    return p->usedRegs[nr];
+}
+ 
 
 /* Possible concerns:
  *
@@ -267,9 +317,18 @@ static void upload_program( struct i915_fragment_program *p )
       return;
    }
 
+   if (program->Base.NumInstructions > I915_MAX_INSN) {
+       i915_program_error( p, "Exceeded max instructions" );
+       return;
+    }
+
+   /* Not always needed:
+    */
+   calc_live_regs(p);
+
    while (1) {
       GLuint src0, src1, src2, flags;
-      GLuint tmp = 0;
+      GLuint tmp = 0, consts0 = 0, consts1 = 0;
 
       switch (inst->Opcode) {
       case OPCODE_ABS: 
@@ -297,67 +356,87 @@ static void upload_program( struct i915_fragment_program *p )
 	 break;
 
       case OPCODE_COS:
-	 src0 = src_vector( p, &inst->SrcReg[0], program);
-	 tmp = i915_get_utemp( p );
+         src0 = src_vector(p, &inst->SrcReg[0], program);
+         tmp = i915_get_utemp(p);
+	 consts0 = i915_emit_const4fv(p, sin_quad_constants[0]);
+	 consts1 = i915_emit_const4fv(p, sin_quad_constants[1]);
 
-	 i915_emit_arith( p, 
-			 A0_MUL,
+	 /* Reduce range from repeating about [-pi,pi] to [-1,1] */
+         i915_emit_arith(p,
+                         A0_MAD,
+                         tmp, A0_DEST_CHANNEL_X, 0,
+                         src0,
+			 swizzle(consts1, Z, ZERO, ZERO, ZERO), /* 1/(2pi) */
+			 swizzle(consts0, W, ZERO, ZERO, ZERO)); /* .75 */
+
+         i915_emit_arith(p, A0_FRC, tmp, A0_DEST_CHANNEL_X, 0, tmp, 0, 0);
+
+	 i915_emit_arith(p,
+			 A0_MAD,
 			 tmp, A0_DEST_CHANNEL_X, 0,
-			 src0, 
-			 i915_emit_const1f(p, 1.0/(M_PI * 2)),
+			 tmp,
+			 swizzle(consts0, X, ZERO, ZERO, ZERO), /* 2 */
+			 swizzle(consts0, Y, ZERO, ZERO, ZERO)); /* -1 */
+
+	 /* Compute COS with the same calculation used for SIN, but a
+	  * different source range has been mapped to [-1,1] this time.
+	  */
+
+	 /* tmp.y = abs(tmp.x); {x, abs(x), 0, 0} */
+	 i915_emit_arith(p,
+                         A0_MAX,
+			 tmp, A0_DEST_CHANNEL_Y, 0,
+			 swizzle(tmp, ZERO, X, ZERO, ZERO),
+			 negate(swizzle(tmp, ZERO, X, ZERO, ZERO), 0, 1, 0, 0),
 			 0);
 
-	 i915_emit_arith( p, 
-			 A0_MOD,
-			 tmp, A0_DEST_CHANNEL_X, 0,
-			 tmp, 
-			 0, 0 );
-
-	 /* By choosing different taylor constants, could get rid of this mul:
-	  */
-	 i915_emit_arith( p, 
+	 /* tmp.y = tmp.y * tmp.x; {x, x * abs(x), 0, 0} */
+	 i915_emit_arith(p,
 			 A0_MUL,
-			 tmp, A0_DEST_CHANNEL_X, 0,
-			 tmp, 
-			 i915_emit_const1f(p, (M_PI * 2)),
+			 tmp, A0_DEST_CHANNEL_Y, 0,
+			 swizzle(tmp, ZERO, X, ZERO, ZERO),
+			 tmp,
 			 0);
 
-	 /* 
-	  * t0.xy = MUL x.xx11, x.x1111  ; x^2, x, 1, 1
-	  * t0 = MUL t0.xyxy t0.xx11 ; x^4, x^3, x^2, 1
-	  * t0 = MUL t0.xxz1 t0.z111    ; x^6 x^4 x^2 1
-	  * result = DP4 t0, cos_constants
+	 /* tmp.x = tmp.xy DP sin_quad_constants[2].xy */
+         i915_emit_arith(p,
+                         A0_DP3,
+                         tmp, A0_DEST_CHANNEL_X, 0,
+			 tmp,
+                         swizzle(consts1, X, Y, ZERO, ZERO),
+			 0);
+
+	 /* tmp.x now contains a first approximation (y).  Now, weight it
+	  * against tmp.y**2 to get closer.
 	  */
-	 i915_emit_arith( p, 
-			 A0_MUL,
-			 tmp, A0_DEST_CHANNEL_XY, 0,
-			 swizzle(tmp, X,X,ONE,ONE), 
-			 swizzle(tmp, X,ONE,ONE,ONE), 0);
+	 i915_emit_arith(p,
+                         A0_MAX,
+			 tmp, A0_DEST_CHANNEL_Y, 0,
+			 swizzle(tmp, ZERO, X, ZERO, ZERO),
+			 negate(swizzle(tmp, ZERO, X, ZERO, ZERO), 0, 1, 0, 0),
+			 0);
 
-	 i915_emit_arith( p, 
-			 A0_MUL,
-			 tmp, A0_DEST_CHANNEL_XYZ, 0,
-			 swizzle(tmp, X,Y,X,ONE), 
-			 swizzle(tmp, X,X,ONE,ONE), 0);
+	 /* tmp.y = tmp.x * tmp.y - tmp.x; {y, y * abs(y) - y, 0, 0} */
+	 i915_emit_arith(p,
+			 A0_MAD,
+			 tmp, A0_DEST_CHANNEL_Y, 0,
+			 swizzle(tmp, ZERO, X, ZERO, ZERO),
+			 swizzle(tmp, ZERO, Y, ZERO, ZERO),
+			 negate(swizzle(tmp, ZERO, X, ZERO, ZERO), 0, 1, 0, 0));
 
-	 i915_emit_arith( p, 
-			 A0_MUL,
-			 tmp, A0_DEST_CHANNEL_XYZ, 0,
-			 swizzle(tmp, X,X,Z,ONE), 
-			 swizzle(tmp, Z,ONE,ONE,ONE), 0);
-	    
-	 i915_emit_arith( p, 
-			 A0_DP4,
-			 get_result_vector( p, inst ), 
-			 get_result_flags( inst ), 0,
-			 swizzle(tmp, ONE,Z,Y,X),
-			 i915_emit_const4fv( p, cos_constants ), 0);
+	 /* result = .2225 * tmp.y + tmp.x =.2225(y * abs(y) - y) + y= */
+	 i915_emit_arith(p,
+			 A0_MAD,
+                         get_result_vector(p, inst),
+                         get_result_flags(inst), 0,
+			 swizzle(consts1, W, W, W, W),
+			 swizzle(tmp, Y, Y, Y, Y),
+			 swizzle(tmp, X, X, X, X));
+         break;
 
-	 break;
-
-      case OPCODE_DP3: 
-	 EMIT_2ARG_ARITH( A0_DP3 );
-	 break;
+      case OPCODE_DP3:
+         EMIT_2ARG_ARITH(A0_DP3);
+         break;
 
       case OPCODE_DP4: 
 	 EMIT_2ARG_ARITH( A0_DP4 );
@@ -414,11 +493,9 @@ static void upload_program( struct i915_fragment_program *p )
 	 src0 = src_vector( p, &inst->SrcReg[0], program);
 	 tmp = i915_get_utemp( p );
 
-	 i915_emit_texld( p,
-			 tmp, A0_DEST_CHANNEL_ALL, /* use a dummy dest reg */
-			 0,
-			 src0,
-			 T0_TEXKILL );
+	 i915_emit_texld(p, get_live_regs(p, inst),
+			 tmp, A0_DEST_CHANNEL_ALL,   /* use a dummy dest reg */
+			 0, src0, T0_TEXKILL);
 	 break;
 
       case OPCODE_LG2: 
@@ -638,62 +715,86 @@ static void upload_program( struct i915_fragment_program *p )
 	 break;
 
       case OPCODE_SIN:
-	 src0 = src_vector( p, &inst->SrcReg[0], program);
-	 tmp = i915_get_utemp( p );
+         src0 = src_vector(p, &inst->SrcReg[0], program);
+         tmp = i915_get_utemp(p);
+	 consts0 = i915_emit_const4fv(p, sin_quad_constants[0]);
+	 consts1 = i915_emit_const4fv(p, sin_quad_constants[1]);
 
-	 i915_emit_arith( p, 
-			 A0_MUL,
+	 /* Reduce range from repeating about [-pi,pi] to [-1,1] */
+         i915_emit_arith(p,
+                         A0_MAD,
+                         tmp, A0_DEST_CHANNEL_X, 0,
+                         src0,
+			 swizzle(consts1, Z, ZERO, ZERO, ZERO), /* 1/(2pi) */
+			 swizzle(consts0, Z, ZERO, ZERO, ZERO)); /* .5 */
+
+         i915_emit_arith(p, A0_FRC, tmp, A0_DEST_CHANNEL_X, 0, tmp, 0, 0);
+	 i915_emit_arith(p,
+			 A0_MAD,
 			 tmp, A0_DEST_CHANNEL_X, 0,
-			 src0, 
-			 i915_emit_const1f(p, 1.0/(M_PI * 2)),
+			 tmp,
+			 swizzle(consts0, X, ZERO, ZERO, ZERO), /* 2 */
+			 swizzle(consts0, Y, ZERO, ZERO, ZERO)); /* -1 */
+
+	 /* Compute sin using a quadratic and quartic.  It gives continuity
+	  * that repeating the Taylor series lacks every 2*pi, and has
+	  * reduced error.
+	  *
+	  * The idea was described at:
+	  * http://www.devmaster.net/forums/showthread.php?t=5784
+	  */
+	 /* tmp.y = abs(tmp.x); {x, abs(x), 0, 0} */
+	 i915_emit_arith(p,
+                         A0_MAX,
+			 tmp, A0_DEST_CHANNEL_Y, 0,
+			 swizzle(tmp, ZERO, X, ZERO, ZERO),
+			 negate(swizzle(tmp, ZERO, X, ZERO, ZERO), 0, 1, 0, 0),
 			 0);
 
-	 i915_emit_arith( p, 
-			 A0_MOD,
-			 tmp, A0_DEST_CHANNEL_X, 0,
-			 tmp, 
-			 0, 0 );
-
-	 /* By choosing different taylor constants, could get rid of this mul:
-	  */
-	 i915_emit_arith( p, 
+	 /* tmp.y = tmp.y * tmp.x; {x, x * abs(x), 0, 0} */
+	 i915_emit_arith(p,
 			 A0_MUL,
-			 tmp, A0_DEST_CHANNEL_X, 0,
-			 tmp, 
-			 i915_emit_const1f(p, (M_PI * 2)),
+			 tmp, A0_DEST_CHANNEL_Y, 0,
+			 swizzle(tmp, ZERO, X, ZERO, ZERO),
+			 tmp,
 			 0);
 
-	 /* 
-	  * t0.xy = MUL x.xx11, x.x1111  ; x^2, x, 1, 1
-	  * t0 = MUL t0.xyxy t0.xx11 ; x^4, x^3, x^2, x
-	  * t1 = MUL t0.xyyw t0.yz11    ; x^7 x^5 x^3 x
-	  * result = DP4 t1.wzyx, sin_constants
+	 /* tmp.x = tmp.xy DP sin_quad_constants[2].xy */
+         i915_emit_arith(p,
+                         A0_DP3,
+                         tmp, A0_DEST_CHANNEL_X, 0,
+			 tmp,
+                         swizzle(consts1, X, Y, ZERO, ZERO),
+			 0);
+
+	 /* tmp.x now contains a first approximation (y).  Now, weight it
+	  * against tmp.y**2 to get closer.
 	  */
-	 i915_emit_arith( p, 
-			 A0_MUL,
-			 tmp, A0_DEST_CHANNEL_XY, 0,
-			 swizzle(tmp, X,X,ONE,ONE), 
-			 swizzle(tmp, X,ONE,ONE,ONE), 0);
+	 i915_emit_arith(p,
+                         A0_MAX,
+			 tmp, A0_DEST_CHANNEL_Y, 0,
+			 swizzle(tmp, ZERO, X, ZERO, ZERO),
+			 negate(swizzle(tmp, ZERO, X, ZERO, ZERO), 0, 1, 0, 0),
+			 0);
 
-	 i915_emit_arith( p, 
-			 A0_MUL,
-			 tmp, A0_DEST_CHANNEL_ALL, 0,
-			 swizzle(tmp, X,Y,X,Y), 
-			 swizzle(tmp, X,X,ONE,ONE), 0);
+	 /* tmp.y = tmp.x * tmp.y - tmp.x; {y, y * abs(y) - y, 0, 0} */
+	 i915_emit_arith(p,
+			 A0_MAD,
+			 tmp, A0_DEST_CHANNEL_Y, 0,
+			 swizzle(tmp, ZERO, X, ZERO, ZERO),
+			 swizzle(tmp, ZERO, Y, ZERO, ZERO),
+			 negate(swizzle(tmp, ZERO, X, ZERO, ZERO), 0, 1, 0, 0));
 
-	 i915_emit_arith( p, 
-			 A0_MUL,
-			 tmp, A0_DEST_CHANNEL_ALL, 0,
-			 swizzle(tmp, X,Y,Y,W), 
-			 swizzle(tmp, X,Z,ONE,ONE), 0);
-	    
-	 i915_emit_arith( p, 
-			 A0_DP4,
-			 get_result_vector( p, inst ), 
-			 get_result_flags( inst ), 0,
-			 swizzle(tmp, W, Z, Y, X ),
-			 i915_emit_const4fv( p, sin_constants ), 0);
-	 break;
+	 /* result = .2225 * tmp.y + tmp.x =.2225(y * abs(y) - y) + y= */
+	 i915_emit_arith(p,
+			 A0_MAD,
+                         get_result_vector(p, inst),
+                         get_result_flags(inst), 0,
+			 swizzle(consts1, W, W, W, W),
+			 swizzle(tmp, Y, Y, Y, Y),
+			 swizzle(tmp, X, X, X, X));
+
+         break;
 
       case OPCODE_SLT: 
 	 EMIT_2ARG_ARITH( A0_SLT );

src/mesa/drivers/dri/i915/i915_program.c

@@ -194,27 +194,43 @@ GLuint i915_emit_arith( struct i915_fragment_program *p,
    return dest;
 }
 
+static GLuint get_free_rreg (struct i915_fragment_program *p, 
+                             GLuint live_regs)
+{
+    int bit = ffs(~live_regs);
+    if (!bit) {
+        i915_program_error(p, "Can't find free R reg");
+        return UREG_BAD;
+    }
+    return UREG(REG_TYPE_R, bit - 1);
+}
+
 GLuint i915_emit_texld( struct i915_fragment_program *p,
+			GLuint live_regs,               
 			GLuint dest,
 			GLuint destmask,
 			GLuint sampler,
 			GLuint coord,
 			GLuint op )
 {
-   if (coord != UREG(GET_UREG_TYPE(coord), GET_UREG_NR(coord))) {
-      /* No real way to work around this in the general case - need to
-       * allocate and declare a new temporary register (a utemp won't
-       * do).  Will fallback for now.
-       */
-      i915_program_error(p, "Can't (yet) swizzle TEX arguments");
-      return 0;
-   }
+    if (coord != UREG(GET_UREG_TYPE(coord), GET_UREG_NR(coord))) {
+        /* With the help of the "needed registers" table created earlier, pick
+         * a register we can MOV the swizzled TC to (since TEX doesn't support
+         * swizzled sources) */
+        GLuint swizCoord = get_free_rreg(p, live_regs);
+        if (swizCoord == UREG_BAD) 
+            return 0;
 
-   /* Don't worry about saturate as we only support  
+        i915_emit_arith( p, A0_MOV, swizCoord, A0_DEST_CHANNEL_ALL, 0, coord, 0, 0 );
+        coord = swizCoord;
+    }
+
+   /* Don't worry about saturate as we only support texture formats
+    * that are always in the 0..1 range.
     */
    if (destmask != A0_DEST_CHANNEL_ALL) {
       GLuint tmp = i915_get_utemp(p);
-      i915_emit_texld( p, tmp, A0_DEST_CHANNEL_ALL, sampler, coord, op );
+      i915_emit_texld( p, 0, tmp, A0_DEST_CHANNEL_ALL, sampler, coord, op );
       i915_emit_arith( p, A0_MOV, dest, destmask, 0, tmp, 0, 0 );
       return dest;
    }

src/mesa/drivers/dri/i915/i915_program.h

@@ -110,6 +110,7 @@ extern void i915_release_utemps( struct i915_fragment_program *p );
 
 
 extern GLuint i915_emit_texld( struct i915_fragment_program *p,
+			      GLuint live_regs, 
 			      GLuint dest,
 			      GLuint destmask,
 			      GLuint sampler,

src/mesa/drivers/dri/i915/i915_texprog.c

@@ -69,7 +69,7 @@ static GLuint get_source( struct i915_fragment_program *p,
 	 if (p->VB->TexCoordPtr[unit]->size == 4)
 	    op = T0_TEXLDP;
 
-	 p->src_texture = i915_emit_texld( p, tmp, A0_DEST_CHANNEL_ALL, 
+	 p->src_texture = i915_emit_texld( p, 0, tmp, A0_DEST_CHANNEL_ALL, 
 					  sampler, texcoord, op );
       }
 

src/mesa/drivers/dri/i915/i915_texstate.c

@@ -454,7 +454,12 @@ static void i915SetTexImages( i915ContextPtr i915,
 
    case MESA_FORMAT_Z16:
       t->intel.texelBytes = 2;
-      textureFormat = (MAPSURF_16BIT | MT_16BIT_L16);
+      if (tObj->DepthMode == GL_ALPHA)
+	  textureFormat = (MAPSURF_16BIT | MT_16BIT_A16);
+      else if (tObj->DepthMode == GL_INTENSITY)
+	  textureFormat = (MAPSURF_16BIT | MT_16BIT_I16);
+      else
+	  textureFormat = (MAPSURF_16BIT | MT_16BIT_L16);
       break;
 
    case MESA_FORMAT_RGBA_DXT1:
@@ -604,8 +609,13 @@ static void i915ImportTexObjState( struct gl_texture_object *texObj )
       shadow = SS2_SHADOW_ENABLE;
       shadow |= intel_translate_compare_func( texObj->CompareFunc );
       
-      minFilt = FILTER_4X4_FLAT;
-      magFilt = FILTER_4X4_FLAT;
+      if (texObj->Target == GL_TEXTURE_1D) {
+	  minFilt = FILTER_NEAREST;
+	  magFilt = FILTER_NEAREST;
+      } else {
+	  minFilt = FILTER_4X4_FLAT;
+	  magFilt = FILTER_4X4_FLAT;
+      }
    }
 
 

src/mesa/drivers/dri/i915/intel_context.c

@@ -117,6 +117,8 @@ const GLubyte *intelGetString( GLcontext *ctx, GLenum name )
 	 chipset = "Intel(R) 865G"; break;
       case PCI_CHIP_I915_G:
 	 chipset = "Intel(R) 915G"; break;
+      case PCI_CHIP_E7221_G:
+	 chipset = "Intel (R) E7221G (i915)"; break;
       case PCI_CHIP_I915_GM:
 	 chipset = "Intel(R) 915GM"; break;
       case PCI_CHIP_I945_G:

src/mesa/drivers/dri/i915/intel_context.h

@@ -361,6 +361,8 @@ do {									\
 #define SUBPIXEL_X 0.125
 #define SUBPIXEL_Y 0.125
 
+#define ALIGN(value, alignment)  ((value + alignment - 1) & ~(alignment - 1))
+
 #define INTEL_FIREVERTICES(intel)		\
 do {						\
    if ((intel)->prim.flush)			\
@@ -451,6 +453,7 @@ extern int INTEL_DEBUG;
 #define PCI_CHIP_I855_GM		0x3582
 #define PCI_CHIP_I865_G			0x2572
 #define PCI_CHIP_I915_G			0x2582
+#define PCI_CHIP_E7221_G		0x258A
 #define PCI_CHIP_I915_GM		0x2592
 #define PCI_CHIP_I945_G			0x2772
 #define PCI_CHIP_I945_GM		0x27A2

src/mesa/drivers/dri/i915/intel_screen.c

@@ -53,7 +53,7 @@ DRI_CONF_BEGIN
     DRI_CONF_SECTION_END
     DRI_CONF_SECTION_QUALITY
        DRI_CONF_FORCE_S3TC_ENABLE(false)
-       DRI_CONF_ALLOW_LARGE_TEXTURES(1)
+       DRI_CONF_ALLOW_LARGE_TEXTURES(2)
       DRI_CONF_SECTION_END
 DRI_CONF_END;
 const GLuint __driNConfigOptions = 4;
@@ -511,6 +511,7 @@ static GLboolean intelCreateContext( const __GLcontextModes *mesaVis,
 				sharedContextPrivate );
 
    case PCI_CHIP_I915_G:
+   case PCI_CHIP_E7221_G: 
    case PCI_CHIP_I915_GM:
    case PCI_CHIP_I945_G:
    case PCI_CHIP_I945_GM:

src/mesa/drivers/dri/i915/intel_state.c

@@ -189,12 +189,12 @@ static void intelDrawBuffer(GLcontext *ctx, GLenum mode )
    if ( intel->sarea->pf_current_page == 1 ) 
       front ^= 1;
    
-   intelSetFrontClipRects( intel );
-
    if (front) {
+      intelSetFrontClipRects( intel );
       intel->drawRegion = &intel->intelScreen->front;
       intel->readRegion = &intel->intelScreen->front;
    } else {
+      intelSetBackClipRects( intel );
       intel->drawRegion = &intel->intelScreen->back;
       intel->readRegion = &intel->intelScreen->back;
    }

src/mesa/drivers/dri/i915/intel_tex.c

@@ -759,7 +759,7 @@ int intelUploadTexImages( intelContextPtr intel,
 			  GLuint face)
 {
    const int numLevels = t->base.lastLevel - t->base.firstLevel + 1;
-   const struct gl_texture_image *firstImage = t->image[face][t->base.firstLevel].image;
+   const struct gl_texture_image *firstImage = t->image[face][0].image;
    int pitch = firstImage->RowStride * firstImage->TexFormat->TexelBytes;
 
    /* Can we texture out of the existing client data? */

src/mesa/drivers/dri/i915/intel_tris.c

@@ -202,12 +202,19 @@ static void intel_wpos_triangle( intelContextPtr intel,
 {
    GLuint offset = intel->wpos_offset;
    GLuint size = intel->wpos_size;
-   
-   __memcpy( ((char *)v0) + offset, v0, size );
-   __memcpy( ((char *)v1) + offset, v1, size );
-   __memcpy( ((char *)v2) + offset, v2, size );
+   GLfloat *v0_wpos = (GLfloat *)((char *)v0 + offset);
+   GLfloat *v1_wpos = (GLfloat *)((char *)v1 + offset);
+   GLfloat *v2_wpos = (GLfloat *)((char *)v2 + offset);
 
-   intel_draw_triangle( intel, v0, v1, v2 );
+   __memcpy(v0_wpos, v0, size);
+   __memcpy(v1_wpos, v1, size);
+   __memcpy(v2_wpos, v2, size);
+
+   v0_wpos[1] = -v0_wpos[1] + intel->driDrawable->h;
+   v1_wpos[1] = -v1_wpos[1] + intel->driDrawable->h;
+   v2_wpos[1] = -v2_wpos[1] + intel->driDrawable->h;
+
+   intel_draw_triangle(intel, v0, v1, v2);
 }
 
 
@@ -217,9 +224,14 @@ static void intel_wpos_line( intelContextPtr intel,
 {
    GLuint offset = intel->wpos_offset;
    GLuint size = intel->wpos_size;
+   GLfloat *v0_wpos = (GLfloat *)((char *)v0 + offset);
+   GLfloat *v1_wpos = (GLfloat *)((char *)v1 + offset);
 
-   __memcpy( ((char *)v0) + offset, v0, size );
-   __memcpy( ((char *)v1) + offset, v1, size );
+   __memcpy(v0_wpos, v0, size);
+   __memcpy(v1_wpos, v1, size);
+
+   v0_wpos[1] = -v0_wpos[1] + intel->driDrawable->h;
+   v1_wpos[1] = -v1_wpos[1] + intel->driDrawable->h;
 
    intel_draw_line( intel, v0, v1 );
 }
@@ -230,8 +242,10 @@ static void intel_wpos_point( intelContextPtr intel,
 {
    GLuint offset = intel->wpos_offset;
    GLuint size = intel->wpos_size;
+   GLfloat *v0_wpos = (GLfloat *)((char *)v0 + offset);
 
-   __memcpy( ((char *)v0) + offset, v0, size );
+   __memcpy(v0_wpos, v0, size);
+   v0_wpos[1] = -v0_wpos[1] + intel->driDrawable->h;
 
    intel_draw_point( intel, v0 );
 }

src/mesa/drivers/dri/i915tex/i915_fragprog.c

@@ -94,7 +94,7 @@ src_vector(struct i915_fragment_program *p,
          break;
       case FRAG_ATTRIB_FOGC:
          src = i915_emit_decl(p, REG_TYPE_T, T_FOG_W, D0_CHANNEL_W);
-         src = swizzle(src, W, W, W, W);
+         src = swizzle(src, W, ZERO, ZERO, ONE);
          break;
       case FRAG_ATTRIB_TEX0:
       case FRAG_ATTRIB_TEX1:

src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c

@@ -365,6 +365,7 @@ intel_miptree_image_data(struct intel_context *intel,
    }
 }
 
+extern GLuint intel_compressed_alignment(GLenum);
 /* Copy mipmap image between trees
  */
 void
@@ -382,8 +383,12 @@ intel_miptree_image_copy(struct intel_context *intel,
    const GLuint *src_depth_offset = intel_miptree_depth_offsets(src, level);
    GLuint i;
 
-   if (dst->compressed)
-      height /= 4;
+   if (dst->compressed) {
+       GLuint alignment = intel_compressed_alignment(dst->internal_format);
+       height = (height + 3) / 4;
+       width = ((width + alignment - 1) & ~(alignment - 1));
+   }
+
    for (i = 0; i < depth; i++) {
       intel_region_copy(intel->intelScreen,
                         dst->region, dst_offset + dst_depth_offset[i],

src/mesa/drivers/dri/i915tex/intel_screen.c

@@ -56,7 +56,7 @@ PUBLIC const char __driConfigOptions[] =
    DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
    DRI_CONF_SECTION_END DRI_CONF_SECTION_QUALITY
    DRI_CONF_FORCE_S3TC_ENABLE(false)
-   DRI_CONF_ALLOW_LARGE_TEXTURES(1)
+   DRI_CONF_ALLOW_LARGE_TEXTURES(2)
    DRI_CONF_SECTION_END DRI_CONF_END;
      const GLuint __driNConfigOptions = 4;
 

src/mesa/drivers/dri/i965/Makefile

@@ -70,6 +70,7 @@ DRIVER_SOURCES = \
 	brw_wm_emit.c \
 	brw_wm_fp.c \
 	brw_wm_iz.c \
+	brw_wm_glsl.c \
 	brw_wm_pass0.c \
 	brw_wm_pass1.c \
 	brw_wm_pass2.c \

src/mesa/drivers/dri/i965/brw_cc.c

@@ -76,8 +76,8 @@ static void upload_cc_unit( struct brw_context *brw )
       cc.cc1.stencil_write_mask = brw->attribs.Stencil->WriteMask[0];
       cc.cc1.stencil_test_mask = brw->attribs.Stencil->ValueMask[0];
 
-      if (brw->attribs.Stencil->TestTwoSide) {
-	 cc.cc0.bf_stencil_enable = brw->attribs.Stencil->TestTwoSide;
+      if (brw->attribs.Stencil->_TestTwoSide) {
+	 cc.cc0.bf_stencil_enable = brw->attribs.Stencil->_TestTwoSide;
 	 cc.cc0.bf_stencil_func = intel_translate_compare_func(brw->attribs.Stencil->Function[1]);
 	 cc.cc0.bf_stencil_fail_op = intel_translate_stencil_op(brw->attribs.Stencil->FailFunc[1]);
 	 cc.cc0.bf_stencil_pass_depth_fail_op = intel_translate_stencil_op(brw->attribs.Stencil->ZFailFunc[1]);
@@ -90,7 +90,8 @@ static void upload_cc_unit( struct brw_context *brw )
       /* Not really sure about this:
        */
       if (brw->attribs.Stencil->WriteMask[0] ||
-	  (brw->attribs.Stencil->TestTwoSide && brw->attribs.Stencil->WriteMask[1]))
+	  (brw->attribs.Stencil->_TestTwoSide &&
+	   brw->attribs.Stencil->WriteMask[1]))
 	 cc.cc0.stencil_write_enable = 1;
    }
 

src/mesa/drivers/dri/i965/brw_clip.h

@@ -42,7 +42,7 @@
  * up polygon offset and flatshading at this point:
  */
 struct brw_clip_prog_key {
-   GLuint attrs:16;		
+   GLuint attrs:32;		
    GLuint primitive:4;
    GLuint nr_userclip:3;
    GLuint do_flat_shading:1;
@@ -51,7 +51,7 @@ struct brw_clip_prog_key {
    GLuint fill_ccw:2;		/* includes cull information */
    GLuint offset_cw:1;
    GLuint offset_ccw:1;
-   GLuint pad0:1;
+   GLuint pad0:17;
 
    GLuint copy_bfc_cw:1;
    GLuint copy_bfc_ccw:1;

src/mesa/drivers/dri/i965/brw_clip_state.c

@@ -43,7 +43,8 @@ static void upload_clip_unit( struct brw_context *brw )
    memset(&clip, 0, sizeof(clip));
 
    /* CACHE_NEW_CLIP_PROG */
-   clip.thread0.grf_reg_count = ((brw->clip.prog_data->total_grf-1) & ~15) / 16;
+   clip.thread0.grf_reg_count =
+      ALIGN(brw->clip.prog_data->total_grf, 16) / 16 - 1;
    clip.thread0.kernel_start_pointer = brw->clip.prog_gs_offset >> 6;
    clip.thread3.urb_entry_read_length = brw->clip.prog_data->urb_read_length;
    clip.thread3.const_urb_entry_read_length = brw->clip.prog_data->curb_read_length;

src/mesa/drivers/dri/i965/brw_clip_unfilled.c

@@ -220,8 +220,8 @@ static void apply_one_offset( struct brw_clip_compile *c,
 			  struct brw_indirect vert )
 {
    struct brw_compile *p = &c->func;
-   struct brw_reg pos = deref_4f(vert, c->offset[VERT_RESULT_HPOS]);
-   struct brw_reg z = get_element(pos, 2);
+   struct brw_reg z = deref_1f(vert, c->header_position_offset +
+			       2 * type_sz(BRW_REGISTER_TYPE_F));
 
    brw_ADD(p, z, z, vec1(c->reg.offset));
 }

src/mesa/drivers/dri/i965/brw_clip_util.c

@@ -343,7 +343,7 @@ void brw_clip_init_clipmask( struct brw_clip_compile *c )
       release_tmp(c, tmp);
    }
 
-   if (BRW_IS_IGD(p->brw)) {
+   if (!BRW_IS_IGD(p->brw)) {
        /* Test for -ve rhw workaround 
         */
        brw_set_conditionalmod(p, BRW_CONDITIONAL_NZ);

src/mesa/drivers/dri/i965/brw_context.c

@@ -44,6 +44,8 @@
 #include "api_noop.h"
 #include "vtxfmt.h"
 
+#include "shader/shader_api.h"
+
 /***************************************
  * Mesa's Driver Functions
  ***************************************/
@@ -60,12 +62,21 @@ static const struct dri_extension brw_extensions[] =
     { NULL,                                NULL }
 };
 
+static void brwUseProgram(GLcontext *ctx, GLuint program)
+{
+   _mesa_use_program(ctx, program);
+}
 
+static void brwInitProgFuncs( struct dd_function_table *functions )
+{
+   functions->UseProgram = brwUseProgram;
+}
 static void brwInitDriverFunctions( struct dd_function_table *functions )
 {
    intelInitDriverFunctions( functions );
    brwInitTextureFuncs( functions );
    brwInitFragProgFuncs( functions );
+   brwInitProgFuncs( functions );
 }
 
 

src/mesa/drivers/dri/i965/brw_curbe.c

@@ -305,7 +305,7 @@ static void upload_constant_buffer(struct brw_context *brw)
       
       if (!brw_pool_alloc(pool, 
 			  bufsz,
-			  6,
+			  1 << 6,
 			  &brw->curbe.gs_offset)) {
 	 _mesa_printf("out of GS memory for curbe\n");
 	 assert(0);

src/mesa/drivers/dri/i965/brw_defines.h

@@ -240,6 +240,8 @@
 #define BRW_FRONTWINDING_CW      0
 #define BRW_FRONTWINDING_CCW     1
 
+#define BRW_SPRITE_POINT_ENABLE  16
+
 #define BRW_INDEX_BYTE     0
 #define BRW_INDEX_WORD     1
 #define BRW_INDEX_DWORD    2

src/mesa/drivers/dri/i965/brw_draw_upload.c

@@ -291,7 +291,7 @@ static void get_space( struct brw_context *brw,
 		       struct gl_buffer_object **vbo_return,
 		       GLuint *offset_return )
 {
-   size = (size + 63) & ~63;
+   size = ALIGN(size, 64);
    
    if (brw->vb.upload.offset + size > BRW_UPLOAD_INIT_SIZE)
       wrap_buffers(brw, size);
@@ -593,6 +593,31 @@ void brw_upload_indices( struct brw_context *brw,
 				 ib_size,
 				 index_buffer->ptr,
 				 bufferobj);
+   } else {
+      /* If the index buffer isn't aligned to its element size, we have to
+       * rebase it into a temporary.
+       */
+       if ((get_size(index_buffer->type) - 1) & offset) {
+           struct gl_buffer_object *vbo;
+           GLuint voffset;
+           GLubyte *map = ctx->Driver.MapBuffer(ctx,
+                                                GL_ELEMENT_ARRAY_BUFFER_ARB,
+                                                GL_DYNAMIC_DRAW_ARB,
+                                                bufferobj);
+           map += offset;
+           get_space(brw, ib_size, &vbo, &voffset);
+           
+           ctx->Driver.BufferSubData(ctx,
+                                     GL_ELEMENT_ARRAY_BUFFER_ARB,
+                                     voffset,
+                                     ib_size,
+                                     map,
+                                     vbo);
+           ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, bufferobj);
+
+           bufferobj = vbo;
+           offset = voffset;
+       }
    }
 
    /* Emit the indexbuffer packet: