Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1

18 files changed, 24 insertions, 1299 deletions

diff --git a/src/mesa/Makefile.DJ b/src/mesa/Makefile.DJ
deleted file mode 100644
index 06a13fb1ab..0000000000
--- a/src/mesa/Makefile.DJ
+++ /dev/null
@@ -1,166 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  5.1
-# 
-# Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# DOS/DJGPP core makefile v1.7 for Mesa
-#
-#  Copyright (C) 2002 - Daniel Borca
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	CFLAGS
-#
-#	GLIDE		path to Glide3 SDK; used with FX.
-#			default = $(TOP)/glide3
-#	FX=1		build for 3dfx Glide3. Note that this disables
-#			compilation of most DMesa code and requires fxMesa.
-#			As a consequence, you'll need the DJGPP Glide3
-#			library to build any application.
-#			default = no
-#	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
-#			default = no
-#
-#    Targets:
-#	all:		build GL
-#	clean:		remove object files
-#
-
-
-
-.PHONY: all clean
-.INTERMEDIATE: x86/gen_matypes.exe
-
-TOP = ../..
-GLIDE ?= $(TOP)/glide3
-LIBDIR = $(TOP)/lib
-GL_LIB = libgl.a
-GL_DXE = gl.dxe
-GL_IMP = libigl.a
-
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
-
-CC = gcc
-CFLAGS += $(INCLUDE_DIRS)
-CFLAGS += -DUSE_EXTERNAL_DXTN_LIB=1
-ifeq ($(FX),1)
-CFLAGS += -D__DOS__
-CFLAGS += -I$(GLIDE)/include -DFX
-LIBNAME = "Mesa/FX DJGPP"
-else
-LIBNAME = "Mesa DJGPP"
-endif
-
-AR = ar
-ARFLAGS = crus
-
-HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-include sources
-
-ifeq ($(X86),1)
-CFLAGS += -DUSE_X86_ASM
-CFLAGS += -DUSE_MMX_ASM
-CFLAGS += -DUSE_SSE_ASM
-CFLAGS += -DUSE_3DNOW_ASM
-X86_SOURCES += $(X86_API)
-else
-X86_SOURCES =
-endif
-
-DRIVER_SOURCES = \
-	drivers/dos/dmesa.c
-ifeq ($(FX),1)
-DRIVER_SOURCES += \
-	$(GLIDE_DRIVER_SOURCES)
-else
-DRIVER_SOURCES += \
-	$(OSMESA_DRIVER_SOURCES) \
-	drivers/dos/video.c \
-	drivers/dos/vesa.c \
-	drivers/dos/blit.S \
-	drivers/dos/vga.c \
-	drivers/dos/null.c \
-	drivers/dos/dpmi.c
-endif
-
-SOURCES = $(CORE_SOURCES) $(X86_SOURCES) $(COMMON_DRIVER_SOURCES) $(DRIVER_SOURCES)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-X86_OBJECTS = $(addsuffix .o,$(basename $(X86_SOURCES)))
-
-.c.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-.S.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-.s.o:
-	$(CC) -o $@ $(CFLAGS) -x assembler-with-cpp -c $<
-
-all: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GL_DXE) $(LIBDIR)/$(GL_IMP)
-
-$(LIBDIR)/$(GL_LIB): $(OBJECTS)
-	$(AR) $(ARFLAGS) $@ $^
-
-$(LIBDIR)/$(GL_DXE) $(LIBDIR)/$(GL_IMP): $(OBJECTS)
-ifeq ($(HAVEDXE3),)
-	$(warning Missing DXE3 package... Skipping $(GL_DXE))
-else
-ifeq ($(FX),1)
-	-dxe3gen -o $(LIBDIR)/$(GL_DXE) -Y $(LIBDIR)/$(GL_IMP) -D $(LIBNAME) -E _gl -E _DMesa -P glide3x.dxe -U $^
-else
-	-dxe3gen -o $(LIBDIR)/$(GL_DXE) -Y $(LIBDIR)/$(GL_IMP) -D $(LIBNAME) -E _gl -E _DMesa -U $^
-endif
-endif
-
-$(X86_OBJECTS): x86/matypes.h
-
-x86/matypes.h: x86/gen_matypes.exe
-	$< > $@
-
-x86/gen_matypes.exe: x86/gen_matypes.c
-	$(CC) -o $@ $(CFLAGS) -s $<
-
-clean:
-	-$(call UNLINK,array_cache/*.o)
-	-$(call UNLINK,glapi/*.o)
-	-$(call UNLINK,main/*.o)
-	-$(call UNLINK,math/*.o)
-	-$(call UNLINK,shader/*.o)
-	-$(call UNLINK,sparc/*.o)
-	-$(call UNLINK,ppc/*.o)
-	-$(call UNLINK,swrast/*.o)
-	-$(call UNLINK,swrast_setup/*.o)
-	-$(call UNLINK,tnl/*.o)
-	-$(call UNLINK,x86/*.o)
-	-$(call UNLINK,drivers/common/*.o)
-	-$(call UNLINK,drivers/dos/*.o)
-	-$(call UNLINK,drivers/glide/*.o)
diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw
deleted file mode 100644
index 3b52834bd1..0000000000
--- a/src/mesa/Makefile.mgw
+++ /dev/null
@@ -1,235 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  7.0
-# 
-# Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# MinGW core makefile v1.4 for Mesa
-#
-#  Copyright (C) 2002 - Daniel Borca
-#  Email : dborca@users.sourceforge.net
-#  Web   : http://www.geocities.com/dborca
-
-# MinGW core-gl makefile updated for Mesa 7.0
-#
-#  updated : by Heromyth, on 2007-7-21
-#  Email   : zxpmyth@yahoo.com.cn
-#  Bugs    : 1) All the default settings work fine. But the setting X86=1 can't work. 
-#            The others havn't been tested yet.
-#            2) The generated DLLs are *not* compatible with the ones built
-#            with the other compilers like VC8, especially for GLUT. 
-#            3) Although more tests are needed, it can be used individually!
-
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	CFLAGS
-#
-#	GLIDE		path to Glide3 SDK; used with FX.
-#			default = $(TOP)/glide3
-#	FX=1		build for 3dfx Glide3. Note that this disables
-#			compilation of most WMesa code and requires fxMesa.
-#			As a consequence, you'll need the Win32 Glide3
-#			library to build any application.
-#			default = no
-#	ICD=1		build the installable client driver interface
-#			(windows opengl driver interface)
-#			default = no
-#	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
-#			default = no
-#
-#    Targets:
-#	all:		build GL
-#	clean:		remove object files
-#
-
-
-.PHONY: all clean
-.INTERMEDIATE: x86/gen_matypes.exe
-.SUFFIXES: .rc .res
-
-# Set this to the prefix of your build tools, i.e. mingw32-
-TOOLS_PREFIX = mingw32-
-
-
-
-TOP = ../..
-GLIDE ?= $(TOP)/glide3
-LIBDIR = $(TOP)/lib
-ifeq ($(ICD),1)
-  GL_DLL = mesa32.dll
-  GL_IMP = libmesa32.a
-else
-  GL_DLL = opengl32.dll
-  GL_IMP = libopengl32.a
-endif
-
-GL_DEF = gl.def
-
-include $(TOP)/configs/config.mgw
-GL_USING_STDCALL ?= 1
-
-MESA_LIB = libmesa.a
-
-LDLIBS = -lgdi32 -luser32 -liberty
-LDFLAGS = -Wl,--out-implib=$(LIBDIR)/$(GL_IMP) -Wl,--output-def=$(LIBDIR)/gl.def
-
-CC = $(TOOLS_PREFIX)gcc
-CFLAGS += -DBUILD_GL32 -D_OPENGL32_ -D_DLL -DMESA_MINWARN -DNDEBUG -D_USRDLL -DGDI_EXPORTS
-
-ifeq ($(GL_USING_STDCALL),1)
-  LDFLAGS += -Wl,--add-stdcall-alias
-else
-  CFLAGS += -DGL_NO_STDCALL
-endif
-
-CFLAGS += -DUSE_EXTERNAL_DXTN_LIB=1
-ifeq ($(FX),1)
-  CFLAGS += -I$(GLIDE)/include -DFX
-  LDLIBS += -L$(GLIDE)/lib -lglide3x
-  GL_DEF = drivers/windows/fx/fxopengl.def
-  GL_RES = drivers/windows/fx/fx.rc
-else
-  ifeq ($(ICD),1)
-    CFLAGS += -DUSE_MGL_NAMESPACE
-    GL_DEF = drivers/windows/icd/mesa.def
-  else    
-    GL_DEF = drivers/windows/gdi/mesa.def
-  endif
-endif
-
-AR = ar
-ARFLAGS = crus
-
-UNLINK = del $(subst /,\,$(1))
-ifneq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-ifneq ($(wildcard $(addsuffix /rm,$(subst :, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-
-include sources
-
-CFLAGS += $(INCLUDE_DIRS) 
-
-ifeq ($(X86),1)
-CFLAGS += -DUSE_X86_ASM
-CFLAGS += -DUSE_MMX_ASM
-CFLAGS += -DUSE_SSE_ASM
-CFLAGS += -DUSE_3DNOW_ASM
-X86_SOURCES += $(X86_API)
-else
-X86_SOURCES =
-endif
-
-ifeq ($(FX),1)
-DRIVER_SOURCES = \
-	$(GLIDE_DRIVER_SOURCES) \
-	drivers/windows/fx/fxwgl.c
-else
-ifeq ($(ICD),1)
-DRIVER_SOURCES = \
-	drivers/windows/gdi/wmesa.c \
-	drivers/windows/icd/icd.c
-else
-DRIVER_SOURCES = \
-	drivers/windows/gdi/wmesa.c \
-	drivers/windows/gdi/wgl.c
-endif
-endif
-
-SOURCES = $(CORE_SOURCES) $(X86_SOURCES) $(COMMON_DRIVER_SOURCES) $(DRIVER_SOURCES)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-X86_OBJECTS = $(addsuffix .o,$(basename $(X86_SOURCES)))
-
-RESOURCE = $(GL_RES:.rc=.res)
-
-.c.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-.s.o:
-	$(CC) -o $@ $(CFLAGS) -x assembler-with-cpp -c $<
-
-.rc.res:
-	windres -o $@ -Irc -Ocoff $<
-
-all: $(LIBDIR) $(LIBDIR)/$(GL_DLL) $(LIBDIR)/$(GL_IMP)
-
-$(LIBDIR):
-	mkdir -p $(LIBDIR)
-
-$(LIBDIR)/$(GL_DLL) $(LIBDIR)/$(GL_IMP): $(OBJECTS) $(RESOURCE)
-	$(CC) -shared -fPIC -o $(LIBDIR)/$(GL_DLL) $(LDFLAGS) \
-	$^ $(LDLIBS)
-
-$(X86_OBJECTS): x86/matypes.h
-
-x86/matypes.h: x86/gen_matypes.exe
-	$(subst /,\,$< > $@)
-
-x86/gen_matypes.exe: x86/gen_matypes.c
-	$(CC) -o $@ $(CFLAGS) -s $<
-
-# [dBorca]
-# glapi_x86.S needs some adjustments
-# in order to generate correct entrypoints
-# Trick: change the following condition to
-# be always false if you need C entrypoints
-# with USE_X86_ASM (useful for trace/debug)
-ifeq (1,1)
-x86/glapi_x86.o: x86/glapi_x86.S
-	$(CC) -o $@ $(CFLAGS) -DSTDCALL_API -c $<
-else
-main/dispatch.o: main/dispatch.c
-	$(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
-glapi/glapi.o: glapi/glapi.c
-	$(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
-endif
-
-# [dBorca]
-# if we want codegen, we have to stdcall
-tnl/t_vtx_x86_gcc.o: tnl/t_vtx_x86_gcc.S
-	$(CC) -o $@ $(CFLAGS) -DSTDCALL_API -c $<
-
-clean:
-	-$(call UNLINK,glapi/*.o)
-	-$(call UNLINK,main/*.o)
-	-$(call UNLINK,math/*.o)
-	-$(call UNLINK,vbo/*.o)
-	-$(call UNLINK,shader/*.o)
-	-$(call UNLINK,shader/slang/*.o)
-	-$(call UNLINK,shader/grammar/*.o)
-	-$(call UNLINK,sparc/*.o)
-	-$(call UNLINK,ppc/*.o)
-	-$(call UNLINK,swrast/*.o)
-	-$(call UNLINK,swrast_setup/*.o)
-	-$(call UNLINK,tnl/*.o)
-	-$(call UNLINK,x86/*.o)
-	-$(call UNLINK,x86/rtasm/*.o)
-	-$(call UNLINK,x86-64/*.o)
-	-$(call UNLINK,drivers/common/*.o)
-	-$(call UNLINK,drivers/glide/*.o)
-	-$(call UNLINK,drivers/windows/fx/*.o)
-	-$(call UNLINK,drivers/windows/fx/*.res)
-	-$(call UNLINK,drivers/windows/gdi/*.o)
-	-$(call UNLINK,drivers/windows/icd/*.o)
diff --git a/src/mesa/descrip.mms b/src/mesa/descrip.mms
deleted file mode 100644
index a12e3fc1b7..0000000000
--- a/src/mesa/descrip.mms
+++ /dev/null
@@ -1,26 +0,0 @@
-# Makefile for Mesa for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-all :
-	set default [.main]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.glapi]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.shader]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.drivers.common]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.x11]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.osmesa]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [--.math]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.tnl]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.swrast]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.swrast_setup]
-	$(MMS)$(MMSQUALIFIERS)
-	set default [-.array_cache]
-	$(MMS)$(MMSQUALIFIERS)
diff --git a/src/mesa/drivers/common/descrip.mms b/src/mesa/drivers/common/descrip.mms
deleted file mode 100644
index c2c119db7f..0000000000
--- a/src/mesa/drivers/common/descrip.mms
+++ /dev/null
@@ -1,38 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 2 November 2005
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define tnl [--.tnl]
-	define swrast [--.swrast]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi],[--.shader]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = driverfuncs.c
-
-OBJECTS =driverfuncs.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-driverfuncs.obj : driverfuncs.c
diff --git a/src/mesa/drivers/osmesa/descrip.mms b/src/mesa/drivers/osmesa/descrip.mms
deleted file mode 100644
index 5be194bcee..0000000000
--- a/src/mesa/drivers/osmesa/descrip.mms
+++ /dev/null
@@ -1,41 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define tnl [--.tnl]
-	define swrast [--.swrast]
-	define swrast_setup [--.swrast_setup]
-	define array_cache [--.array_cache]
-	define drivers [-]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = osmesa.c
-
-OBJECTS = osmesa.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-osmesa.obj : osmesa.c
diff --git a/src/mesa/drivers/x11/descrip.mms b/src/mesa/drivers/x11/descrip.mms
deleted file mode 100644
index f181707a14..0000000000
--- a/src/mesa/drivers/x11/descrip.mms
+++ /dev/null
@@ -1,51 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define tnl [--.tnl]
-	define swrast [--.swrast]
-	define swrast_setup [--.swrast_setup]
-	define array_cache [--.array_cache]
-	define drivers [-]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi]
-LIBDIR = [----.lib]
-CFLAGS =/include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = fakeglx.c glxapi.c xfonts.c xm_api.c xm_dd.c xm_line.c xm_span.c\
-	xm_tri.c xm_buffer.c
-
-OBJECTS =fakeglx.obj,glxapi.obj,xfonts.obj,xm_api.obj,xm_dd.obj,xm_line.obj,\
-	xm_span.obj,xm_tri.obj,xm_buffer.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-fakeglx.obj : fakeglx.c
-glxapi.obj : glxapi.c
-xfonts.obj : xfonts.c
-xm_api.obj : xm_api.c
-xm_buffer.obj : xm_buffer.c
-xm_dd.obj : xm_dd.c
-xm_line.obj : xm_line.c
-xm_span.obj : xm_span.c
-xm_tri.obj : xm_tri.c
diff --git a/src/mesa/glapi/descrip.mms b/src/mesa/glapi/descrip.mms
deleted file mode 100644
index 16bf6387e8..0000000000
--- a/src/mesa/glapi/descrip.mms
+++ /dev/null
@@ -1,37 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
-	define gl [---.include.gl]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = glapi.c glthread.c
-
-OBJECTS =  glapi.obj,glthread.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-glapi.obj : glapi.c
-
-glthread.obj : glthread.c
diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
deleted file mode 100644
index 2bd388be89..0000000000
--- a/src/mesa/main/descrip.mms
+++ /dev/null
@@ -1,221 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 10 May 2005
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define shader [-.shader]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.glapi],[-.shader]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES =accum.c \
-	api_arrayelt.c \
-	api_loopback.c \
-	api_noop.c \
-	api_validate.c \
- 	attrib.c \
-	arrayobj.c \
-	blend.c \
-	bufferobj.c \
-	buffers.c \
-	clip.c \
-	colortab.c \
-	context.c \
-	convolve.c \
-	debug.c \
-	depth.c \
-	depthstencil.c \
-	dispatch.c \
-	dlist.c \
-	drawpix.c \
-	enable.c \
-	enums.c \
-	eval.c \
-	execmem.c \
-	extensions.c \
-	fbobject.c \
-	feedback.c \
-	fog.c \
-	framebuffer.c \
-	get.c \
-	getstring.c \
-	hash.c \
-	hint.c \
-	histogram.c \
-	image.c \
-	imports.c \
-	light.c \
-	lines.c \
-	matrix.c \
-	mipmap.c \
-	mm.c \
-	occlude.c \
-	pixel.c \
-	points.c \
-	polygon.c \
-	rastpos.c \
-	rbadaptors.c \
-	renderbuffer.c \
-	state.c \
-	stencil.c \
-	texcompress.c \
-	texcompress_fxt1.c \
-	texcompress_s3tc.c \
-	texenvprogram.c \
-	texformat.c \
-	teximage.c \
-	texobj.c \
-	texrender.c \
-	texstate.c \
-	texstore.c \
-	varray.c \
-	vtxfmt.c
-
-OBJECTS=accum.obj,\
-api_arrayelt.obj,\
-api_loopback.obj,\
-api_noop.obj,\
-api_validate.obj,\
-arrayobj.obj,\
-attrib.obj,\
-blend.obj,\
-bufferobj.obj,\
-buffers.obj,\
-clip.obj,\
-colortab.obj,\
-context.obj,\
-convolve.obj,\
-debug.obj,\
-depth.obj,\
-depthstencil.obj,\
-dispatch.obj,\
-dlist.obj,\
-drawpix.obj,\
-enable.obj,\
-enums.obj,\
-eval.obj,\
-execmem.obj,\
-extensions.obj,\
-fbobject.obj,\
-feedback.obj,\
-fog.obj,\
-framebuffer.obj,\
-get.obj,\
-getstring.obj,\
-hash.obj,\
-hint.obj,\
-histogram.obj,\
-image.obj,\
-imports.obj,\
-light.obj,\
-lines.obj,\
-matrix.obj,\
-mipmap.obj,\
-mm.obj,\
-occlude.obj,\
-pixel.obj,\
-points.obj,\
-polygon.obj,\
-rastpos.obj,\
-renderbuffer.obj,\
-state.obj,\
-stencil.obj,\
-texcompress.obj,\
-texcompress_fxt1.obj,\
-texcompress_s3tc.obj,\
-texenvprogram.obj,\
-texformat.obj,\
-teximage.obj,\
-texobj.obj,\
-texrender.obj,\
-texstate.obj,\
-texstore.obj,\
-varray.obj,\
-vtxfmt.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ $(MAKELIB) $(GL_LIB) $(OBJECTS)
-  @ rename $(GL_LIB)* $(LIBDIR)
-
-clean :
-	purge
-	delete *.obj;*
-
-accum.obj : accum.c
-api_arrayelt.obj : api_arrayelt.c
-api_loopback.obj : api_loopback.c
-api_noop.obj : api_noop.c
-api_validate.obj : api_validate.c
-arrayobj.obj : arrayobj.c
-attrib.obj : attrib.c
-blend.obj : blend.c
-bufferobj.obj : bufferobj.c
-buffers.obj : buffers.c
-clip.obj : clip.c
-colortab.obj : colortab.c
-context.obj : context.c
-convolve.obj : convolve.c
-debug.obj : debug.c
-depth.obj : depth.c
-depthstencil.obj : depthstencil.c
-dispatch.obj : dispatch.c
-dlist.obj : dlist.c
-drawpix.obj : drawpix.c
-enable.obj : enable.c
-enums.obj : enums.c
-eval.obj : eval.c
-execmem.obj : execmem.c
-extensions.obj : extensions.c
-fbobject.obj : fbobject.c
-feedback.obj : feedback.c
-fog.obj : fog.c
-framebuffer.obj : framebuffer.c
-get.obj : get.c
-getstring.obj : getstring.c
-hash.obj : hash.c
-hint.obj : hint.c
-histogram.obj : histogram.c
-image.obj : image.c
-imports.obj : imports.c vsnprintf.c
-light.obj : light.c
-lines.obj : lines.c
-matrix.obj : matrix.c
-mipmap.obj : mipmap.c
-mm.obj : mm.c
-occlude.obj : occlude.c
-pixel.obj : pixel.c
-points.obj : points.c
-polygon.obj : polygon.c
-rastpos.obj : rastpos.c
-rbadaptors.obj : rbadaptors.c
-renderbuffer.obj : renderbuffer.c
-state.obj : state.c
-stencil.obj : stencil.c
-texcompress.obj : texcompress.c
-texcompress_fxt1.obj : texcompress_fxt1.c
-	cc$(CFLAGS)/warn=(disable=SHIFTCOUNT) texcompress_fxt1.c
-texcompress_s3tc.obj : texcompress_s3tc.c
-texenvprogram.obj : texenvprogram.c
-texformat.obj : texformat.c
-teximage.obj : teximage.c
-texobj.obj : texobj.c
-texrender.obj : texrender.c
-texstate.obj : texstate.c
-texstore.obj : texstore.c
-varray.obj : varray.c
-vtxfmt.obj : vtxfmt.c
diff --git a/src/mesa/math/descrip.mms b/src/mesa/math/descrip.mms
deleted file mode 100644
index 5b9e9915f8..0000000000
--- a/src/mesa/math/descrip.mms
+++ /dev/null
@@ -1,45 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c m_matrix.c\
-	m_translate.c m_vector.c m_xform.c
-
-OBJECTS = m_debug_clip.obj,m_debug_norm.obj,m_debug_xform.obj,m_eval.obj,\
-	m_matrix.obj,m_translate.obj,m_vector.obj,m_xform.obj
- 
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-m_debug_clip.obj : m_debug_clip.c
-m_debug_norm.obj : m_debug_norm.c
-m_debug_xform.obj : m_debug_xform.c
-m_eval.obj : m_eval.c
-m_matrix.obj : m_matrix.c
-m_translate.obj : m_translate.c
-m_vector.obj : m_vector.c
-m_xform.obj : m_xform.c
diff --git a/src/mesa/shader/descrip.mms b/src/mesa/shader/descrip.mms
deleted file mode 100644
index f5d04cfa78..0000000000
--- a/src/mesa/shader/descrip.mms
+++ /dev/null
@@ -1,76 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 20 November 2006
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define swrast [-.swrast]
-	define array_cache [-.array_cache]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[.grammar],[-.main],[-.glapi],[.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1,"__extension__=")/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = \
-	atifragshader.c \
-	arbprogparse.c \
-	arbprogram.c \
-	nvfragparse.c \
-	nvprogram.c \
-	nvvertexec.c \
-	nvvertparse.c \
-	program.c \
-	shaderobjects.c \
-	shaderobjects_3dlabs.c
-
-OBJECTS = \
-	atifragshader.obj,\
-	arbprogparse.obj,\
-	arbprogram.obj,\
-	nvfragparse.obj,\
-	nvprogram.obj,\
-	nvvertexec.obj,\
-	nvvertparse.obj,\
-	program.obj,\
-	shaderobjects.obj,\
-	shaderobjects_3dlabs.obj
-
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-all : 
-	$(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB)
-	set def [.slang]
-	$(MMS)$(MMSQUALIFIERS)
-	set def [-.grammar]
-	$(MMS)$(MMSQUALIFIERS)
-	set def [-]
-
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-atifragshader.obj : atifragshader.c
-arbprogparse.obj : arbprogparse.c
-arbprogram.obj : arbprogram.c
-nvfragparse.obj : nvfragparse.c
-nvprogram.obj : nvprogram.c
-nvvertexec.obj : nvvertexec.c
-nvvertparse.obj : nvvertparse.c
-program.obj : program.c
-shaderobjects.obj : shaderobjects.c
-	cc$(CFLAGS)/nowarn shaderobjects.c
-shaderobjects_3dlabs.obj : shaderobjects_3dlabs.c
diff --git a/src/mesa/shader/grammar/descrip.mms b/src/mesa/shader/grammar/descrip.mms
deleted file mode 100644
index cff53ee872..0000000000
--- a/src/mesa/shader/grammar/descrip.mms
+++ /dev/null
@@ -1,41 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 1 June 2005
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define swrast [--.swrast]
-	define array_cache [--.array_cache]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[],[--.main],[--.glapi],[-.slang]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = grammar_mesa.c
-
-OBJECTS = grammar_mesa.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-all : 
-	$(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB)
-
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-grammar_mesa.obj : grammar_mesa.c grammar.c
diff --git a/src/mesa/shader/slang/descrip.mms b/src/mesa/shader/slang/descrip.mms
deleted file mode 100644
index 8b9cd822b8..0000000000
--- a/src/mesa/shader/slang/descrip.mms
+++ /dev/null
@@ -1,65 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 17 March 2006
-
-.first
-	define gl [----.include.gl]
-	define math [--.math]
-	define swrast [--.swrast]
-	define array_cache [--.array_cache]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi],[-.slang],[-.grammar],[-]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = \
-	slang_compile.c,slang_preprocess.c
-
-OBJECTS = \
-	slang_compile.obj,slang_preprocess.obj,slang_utility.obj,\
-	slang_execute.obj,slang_assemble.obj,slang_assemble_conditional.obj,\
-	slang_assemble_constructor.obj,slang_assemble_typeinfo.obj,\
-	slang_storage.obj,slang_assemble_assignment.obj,\
-	slang_compile_function.obj,slang_compile_struct.obj,\
-	slang_compile_variable.obj,slang_compile_operation.obj,\
-	slang_library_noise.obj,slang_link.obj,slang_export.obj,\
-	slang_analyse.obj,slang_library_texsample.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-slang_compile.obj : slang_compile.c
-slang_preprocess.obj : slang_preprocess.c
-slang_utility.obj : slang_utility.c
-slang_execute.obj : slang_execute.c
-slang_assemble.obj : slang_assemble.c
-slang_assemble_conditional.obj : slang_assemble_conditional.c
-slang_assemble_constructor.obj : slang_assemble_constructor.c
-slang_assemble_typeinfo.obj : slang_assemble_typeinfo.c
-slang_storage.obj : slang_storage.c
-slang_assemble_assignment.obj : slang_assemble_assignment.c
-slang_compile_function.obj : slang_compile_function.c
-slang_compile_struct.obj : slang_compile_struct.c
-slang_compile_variable.obj : slang_compile_variable.c
-slang_compile_operation.obj : slang_compile_operation.c
-slang_library_noise.obj : slang_library_noise.c
-slang_link.obj : slang_link.c
-slang_export.obj : slang_export.c
-slang_analyse.obj : slang_analyse.c
-slang_library_texsample.obj : slang_library_texsample.c
diff --git a/src/mesa/state_tracker/st_atom_rasterizer.c b/src/mesa/state_tracker/st_atom_rasterizer.c
index 435d604af7..229839d8b2 100644
--- a/src/mesa/state_tracker/st_atom_rasterizer.c
+++ b/src/mesa/state_tracker/st_atom_rasterizer.c
@@ -30,7 +30,7 @@
   *   Keith Whitwell <keith@tungstengraphics.com>
   */
  
-
+#include "main/macros.h"
 #include "st_context.h"
 #include "st_cache.h"
 #include "pipe/p_context.h"
@@ -227,8 +227,18 @@ static void update_raster_state( struct st_context *st )
 
    /* _NEW_LINE
     */
-   raster.line_width = ctx->Line.Width;
    raster.line_smooth = ctx->Line.SmoothFlag;
+   if (ctx->Line.SmoothFlag) {
+      raster.line_width = CLAMP(ctx->Line.Width,
+                                ctx->Const.MinLineWidthAA,
+                                ctx->Const.MaxLineWidthAA);
+   }
+   else {
+      raster.line_width = CLAMP(ctx->Line.Width,
+                                ctx->Const.MinLineWidth,
+                                ctx->Const.MaxLineWidth);
+   }
+
    raster.line_stipple_enable = ctx->Line.StippleFlag;
    raster.line_stipple_pattern = ctx->Line.StipplePattern;
    /* GL stipple factor is in [1,256], remap to [0, 255] here */
diff --git a/src/mesa/state_tracker/st_cache.c b/src/mesa/state_tracker/st_cache.c
index 2979e7fae5..7ee4fadc37 100644
--- a/src/mesa/state_tracker/st_cache.c
+++ b/src/mesa/state_tracker/st_cache.c
@@ -63,6 +63,8 @@ const struct cso_blend * st_cached_blend_state(struct st_context *st,
       cso->data = st->pipe->create_blend_state(st->pipe, &cso->state);
       if (!cso->data)
          cso->data = &cso->state;
+      cso->delete_state = (cso_state_callback)st->pipe->delete_blend_state;
+      cso->context = st->pipe;
       iter = cso_insert_state(st->cache, hash_key, CSO_BLEND, cso);
    }
    return ((struct cso_blend *)cso_hash_iter_data(iter));
@@ -82,6 +84,8 @@ st_cached_sampler_state(struct st_context *st,
       cso->data = st->pipe->create_sampler_state(st->pipe, &cso->state);
       if (!cso->data)
          cso->data = &cso->state;
+      cso->delete_state = (cso_state_callback)st->pipe->delete_sampler_state;
+      cso->context = st->pipe;
       iter = cso_insert_state(st->cache, hash_key, CSO_SAMPLER, cso);
    }
    return (struct cso_sampler*)(cso_hash_iter_data(iter));
@@ -103,6 +107,8 @@ st_cached_depth_stencil_alpha_state(struct st_context *st,
       cso->data = st->pipe->create_depth_stencil_alpha_state(st->pipe, &cso->state);
       if (!cso->data)
          cso->data = &cso->state;
+      cso->delete_state = (cso_state_callback)st->pipe->delete_depth_stencil_alpha_state;
+      cso->context = st->pipe;
       iter = cso_insert_state(st->cache, hash_key, CSO_DEPTH_STENCIL_ALPHA, cso);
    }
    return (struct cso_depth_stencil_alpha*)(cso_hash_iter_data(iter));
@@ -123,6 +129,8 @@ const struct cso_rasterizer* st_cached_rasterizer_state(
       cso->data = st->pipe->create_rasterizer_state(st->pipe, &cso->state);
       if (!cso->data)
          cso->data = &cso->state;
+      cso->delete_state = (cso_state_callback)st->pipe->delete_rasterizer_state;
+      cso->context = st->pipe;
       iter = cso_insert_state(st->cache, hash_key, CSO_RASTERIZER, cso);
    }
    return (struct cso_rasterizer*)(cso_hash_iter_data(iter));
@@ -143,6 +151,8 @@ st_cached_fs_state(struct st_context *st,
       cso->data = st->pipe->create_fs_state(st->pipe, &cso->state);
       if (!cso->data)
          cso->data = &cso->state;
+      cso->delete_state = (cso_state_callback)st->pipe->delete_fs_state;
+      cso->context = st->pipe;
       iter = cso_insert_state(st->cache, hash_key, CSO_FRAGMENT_SHADER, cso);
    }
    return (struct cso_fragment_shader*)(cso_hash_iter_data(iter));
@@ -163,8 +173,9 @@ st_cached_vs_state(struct st_context *st,
       cso->data = st->pipe->create_vs_state(st->pipe, &cso->state);
       if (!cso->data)
          cso->data = &cso->state;
+      cso->delete_state = (cso_state_callback)st->pipe->delete_vs_state;
+      cso->context = st->pipe;
       iter = cso_insert_state(st->cache, hash_key, CSO_VERTEX_SHADER, cso);
    }
    return (struct cso_vertex_shader*)(cso_hash_iter_data(iter));
 }
-
diff --git a/src/mesa/swrast/descrip.mms b/src/mesa/swrast/descrip.mms
deleted file mode 100644
index 4d446600ba..0000000000
--- a/src/mesa/swrast/descrip.mms
+++ /dev/null
@@ -1,80 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 21 February 2006
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define swrast [-.swrast]
-	define array_cache [-.array_cache]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \
-	s_bitmap.c s_blend.c s_blit.c s_buffers.c s_context.c \
-	s_copypix.c s_depth.c \
-        s_drawpix.c s_feedback.c s_fog.c s_imaging.c s_lines.c s_logic.c \
-	s_masking.c s_nvfragprog.c s_points.c s_readpix.c \
-	s_span.c s_stencil.c s_texstore.c s_texcombine.c s_texfilter.c \
-	s_triangle.c s_zoom.c s_atifragshader.c s_arbshader.c
- 
-OBJECTS = s_aaline.obj,s_aatriangle.obj,s_accum.obj,s_alpha.obj,\
-	s_bitmap.obj,s_blend.obj,s_blit.obj,s_arbshader.obj,\
-	s_buffers.obj,s_context.obj,s_atifragshader.obj,\
-	s_copypix.obj,s_depth.obj,s_drawpix.obj,s_feedback.obj,s_fog.obj,\
-	s_imaging.obj,s_lines.obj,s_logic.obj,s_masking.obj,s_nvfragprog.obj,\
-	s_points.obj,s_readpix.obj,s_span.obj,s_stencil.obj,\
-	s_texstore.obj,s_texcombine.obj,s_texfilter.obj,s_triangle.obj,\
-	s_zoom.obj
- 
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-s_atifragshader.obj : s_atifragshader.c
-s_aaline.obj : s_aaline.c
-s_aatriangle.obj : s_aatriangle.c
-s_accum.obj : s_accum.c
-s_alpha.obj : s_alpha.c
-s_bitmap.obj : s_bitmap.c
-s_blend.obj : s_blend.c
-s_blit.obj : s_blit.c
-s_buffers.obj : s_buffers.c
-s_context.obj : s_context.c
-s_copypix.obj : s_copypix.c
-s_depth.obj : s_depth.c
-s_drawpix.obj : s_drawpix.c
-s_feedback.obj : s_feedback.c
-s_fog.obj : s_fog.c
-s_imaging.obj : s_imaging.c
-s_lines.obj : s_lines.c
-s_logic.obj : s_logic.c
-s_masking.obj : s_masking.c
-s_nvfragprog.obj : s_nvfragprog.c
-s_points.obj : s_points.c
-s_readpix.obj : s_readpix.c
-s_span.obj : s_span.c
-s_stencil.obj : s_stencil.c
-s_texstore.obj : s_texstore.c
-s_texcombine.obj : s_texcombine.c
-s_texfilter.obj : s_texfilter.c
-s_triangle.obj : s_triangle.c
-s_zoom.obj : s_zoom.c
-s_arbshader.obj : s_arbshader.c
diff --git a/src/mesa/swrast_setup/descrip.mms b/src/mesa/swrast_setup/descrip.mms
deleted file mode 100644
index 0ab81c07d3..0000000000
--- a/src/mesa/swrast_setup/descrip.mms
+++ /dev/null
@@ -1,39 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define tnl [-.tnl]
-	define swrast [-.swrast]
-	define array_cache [-.array_cache]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = ss_context.c ss_triangle.c
-
-OBJECTS =  ss_context.obj,ss_triangle.obj
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-ss_context.obj : ss_context.c
-ss_triangle.obj : ss_triangle.c
diff --git a/src/mesa/tnl/descrip.mms b/src/mesa/tnl/descrip.mms
deleted file mode 100644
index a9aed89f1d..0000000000
--- a/src/mesa/tnl/descrip.mms
+++ /dev/null
@@ -1,75 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 21 February 2006
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define shader [-.shader]
-	define array_cache [-.array_cache]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = t_array_api.c t_array_import.c t_context.c \
-	t_pipeline.c t_vb_fog.c t_save_api.c t_vtx_api.c \
-	t_vb_light.c t_vb_normals.c t_vb_points.c t_vb_program.c \
-	t_vb_render.c t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c \
-	t_vtx_eval.c t_vtx_exec.c t_save_playback.c t_save_loopback.c \
-	t_vertex.c t_vtx_generic.c t_vtx_x86.c t_vertex_generic.c \
-	t_vb_arbprogram.c t_vp_build.c t_vb_arbshader.c
-
-OBJECTS = t_array_api.obj,t_array_import.obj,t_context.obj,\
-	t_pipeline.obj,t_vb_fog.obj,t_vb_light.obj,t_vb_normals.obj,\
-	t_vb_points.obj,t_vb_program.obj,t_vb_render.obj,t_vb_texgen.obj,\
-	t_vb_texmat.obj,t_vb_vertex.obj,t_save_api.obj,t_vtx_api.obj,\
-	t_vtx_eval.obj,t_vtx_exec.obj,t_save_playback.obj,t_save_loopback.obj,\
-	t_vertex.obj,t_vtx_generic.obj,t_vtx_x86.obj,t_vertex_generic.obj,\
-	t_vb_arbprogram.obj,t_vp_build.obj,t_vb_arbshader.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-t_array_api.obj : t_array_api.c
-t_array_import.obj : t_array_import.c
-t_context.obj : t_context.c
-t_pipeline.obj : t_pipeline.c
-t_vb_fog.obj : t_vb_fog.c
-t_vb_light.obj : t_vb_light.c
-t_vb_normals.obj : t_vb_normals.c
-t_vb_points.obj : t_vb_points.c
-t_vb_program.obj : t_vb_program.c
-t_vb_render.obj : t_vb_render.c
-t_vb_texgen.obj : t_vb_texgen.c
-t_vb_texmat.obj : t_vb_texmat.c
-t_vb_vertex.obj : t_vb_vertex.c
-t_save_api.obj : t_save_api.c
-t_vtx_api.obj : t_vtx_api.c
-t_vtx_eval.obj : t_vtx_eval.c
-t_vtx_exec.obj : t_vtx_exec.c
-t_save_playback.obj : t_save_playback.c
-t_save_loopback.obj : t_save_loopback.c
-t_vertex.obj : t_vertex.c
-t_vtx_x86.obj : t_vtx_x86.c
-t_vtx_generic.obj : t_vtx_generic.c
-t_vertex_generic.obj : t_vertex_generic.c
-t_vb_arbprogram.obj : t_vb_arbprogram.c
-t_vp_build.obj : t_vp_build.c
-t_vb_arbshader.obj : t_vb_arbshader.c
diff --git a/src/mesa/vbo/descrip.mms b/src/mesa/vbo/descrip.mms
deleted file mode 100644
index e00b6703aa..0000000000
--- a/src/mesa/vbo/descrip.mms
+++ /dev/null
@@ -1,60 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.nano.tudelft.nl
-# Last revision : 7 March 2007
-
-.first
-	define gl [---.include.gl]
-	define math [-.math]
-	define vbo [-.vbo]
-	define tnl [-.tnl]
-	define shader [-.shader]
-	define swrast [-.swrast]
-	define swrast_setup [-.swrast_setup]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES =vbo_context.c,vbo_exec.c,vbo_exec_api.c,vbo_exec_array.c,\
-	vbo_exec_draw.c,vbo_exec_eval.c,vbo_rebase.c,vbo_save.c,\
-	vbo_save_api.c,vbo_save_draw.c,vbo_save_loopback.c,\
-	vbo_split.c,vbo_split_copy.c,vbo_split_inplace.c
-
-OBJECTS =vbo_context.obj,vbo_exec.obj,vbo_exec_api.obj,vbo_exec_array.obj,\
-	vbo_exec_draw.obj,vbo_exec_eval.obj,vbo_rebase.obj,vbo_save.obj,\
-	vbo_save_api.obj,vbo_save_draw.obj,vbo_save_loopback.obj,\
-	vbo_split.obj,vbo_split_copy.obj,vbo_split_inplace.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-	purge
-	delete *.obj;*
-
-vbo_context.obj : vbo_context.c
-vbo_exec.obj : vbo_exec.c
-vbo_exec_api.obj : vbo_exec_api.c
-vbo_exec_array.obj : vbo_exec_array.c
-vbo_exec_draw.obj : vbo_exec_draw.c
-vbo_exec_eval.obj : vbo_exec_eval.c
-vbo_rebase.obj : vbo_rebase.c
-vbo_save.obj : vbo_save.c
-vbo_save_api.obj : vbo_save_api.c
-vbo_save_draw.obj : vbo_save_draw.c
-vbo_save_loopback.obj : vbo_save_loopback.c
-vbo_split.obj : vbo_split.c
-vbo_split_copy.obj : vbo_split_copy.c
-vbo_split_inplace.obj : vbo_split_inplace.c