Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/glapi/descrip.mms
	src/mesa/shader/grammar/descrip.mms

1 files changed, 31 insertions, 1 deletions

diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index 3ef215f47fa..e49ec65d42d 100644
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -1,6 +1,6 @@
 # Makefile for core library for VMS
 # contributed by Jouk Jansen  [email protected]
-# Last revision : 2 October 2007
+# Last revision : 29 September 2008
 
 .first
 	define gl [---.include.gl]
@@ -21,6 +21,7 @@ CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ie
 
 SOURCES =accum.c \
 	api_arrayelt.c \
+	api_exec.c \
 	api_loopback.c \
 	api_noop.c \
 	api_validate.c \
@@ -29,6 +30,7 @@ SOURCES =accum.c \
 	blend.c \
 	bufferobj.c \
 	buffers.c \
+	clear.c \
 	clip.c \
 	colortab.c \
 	context.c \
@@ -46,6 +48,7 @@ SOURCES =accum.c \
 	extensions.c \
 	fbobject.c \
 	feedback.c \
+	ffvertex_prog.c \
 	fog.c \
 	framebuffer.c \
 	get.c \
@@ -60,22 +63,29 @@ SOURCES =accum.c \
 	matrix.c \
 	mipmap.c \
 	mm.c \
+	multisample.c \
 	pixel.c \
+	pixelstore.c \
 	points.c \
 	polygon.c \
 	rastpos.c \
 	rbadaptors.c \
+	readpix.c \
 	renderbuffer.c \
+	scissor.c \
 	shaders.c \
 	state.c \
 	stencil.c \
 	texcompress.c \
 	texcompress_fxt1.c \
 	texcompress_s3tc.c \
+	texenv.c \
 	texenvprogram.c \
 	texformat.c \
+	texgen.c \
 	teximage.c \
 	texobj.c \
+	texparam.c \
 	texrender.c \
 	texstate.c \
 	texstore.c \
@@ -86,6 +96,7 @@ SOURCES =accum.c \
 
 OBJECTS=accum.obj,\
 api_arrayelt.obj,\
+api_exec.obj,\
 api_loopback.obj,\
 api_noop.obj,\
 api_validate.obj,\
@@ -94,6 +105,7 @@ attrib.obj,\
 blend.obj,\
 bufferobj.obj,\
 buffers.obj,\
+clear.obj,\
 clip.obj,\
 colortab.obj,\
 context.obj,\
@@ -111,6 +123,7 @@ execmem.obj,\
 extensions.obj,\
 fbobject.obj,\
 feedback.obj,\
+ffvertex_prog.obj,\
 fog.obj,\
 framebuffer.obj,\
 get.obj,\
@@ -125,21 +138,28 @@ lines.obj,\
 matrix.obj,\
 mipmap.obj,\
 mm.obj,\
+multisample.obj,\
 pixel.obj,\
+pixelstore.obj,\
 points.obj,\
 polygon.obj,\
 rastpos.obj,\
+readpix.obj,\
 renderbuffer.obj,\
+scissor.obj,\
 shaders.obj,\
 state.obj,\
 stencil.obj,\
 texcompress.obj,\
 texcompress_fxt1.obj,\
 texcompress_s3tc.obj,\
+texenv.obj,\
 texenvprogram.obj,\
 texformat.obj,\
+texgen.obj,\
 teximage.obj,\
 texobj.obj,\
+texparam.obj,\
 texrender.obj,\
 texstate.obj,\
 texstore.obj,\
@@ -226,3 +246,13 @@ vtxfmt.obj : vtxfmt.c
 shaders.obj : shaders.c
 queryobj.obj : queryobj.c
 rbadaptors.obj : rbadaptors.c
+clear.obj : clear.c
+multisample.obj : multisample.c
+scissor.obj : scissor.c
+texenv.obj : texenv.c
+texgen.obj : texgen.c
+texparam.obj : texparam.c
+readpix.obj : readpix.c
+ffvertex_prog.obj : ffvertex_prog.c
+api_exec.obj : api_exec.c
+pixelstore.obj : pixelstore.c