Committing in .

 Update OpenVMS makefile for vertex-routines
 #ifndef __VMS added for one print statement containing __FUNCTION__

 Modified Files:
 	Mesa/src/descrip.mms Mesa/src/tnl/t_imm_api.c
 ----------------------------------------------------------------------

diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index 2b662b0b65b0572fb29323ea61cf1747a03fde38..447c97134a6d85e2cc2d48221366e592fce7dade 100644 (file)
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -67,6 +67,9 @@ CORE_SOURCES =accum.c \
        texutil.c \
        varray.c \
        vtxfmt.c \
+       vpstate.c \
+       vpexec.c \
+       vtparse.c \
        [.x86]x86.c
 
 DRIVER_SOURCES = [.x]glxapi.c [.x]fakeglx.c [.x]xfonts.c \
@@ -134,6 +137,7 @@ TNL_SOURCES=[.tnl]t_array_api.c \
 [.tnl]t_vb_light.c \
 [.tnl]t_vb_normals.c \
 [.tnl]t_vb_points.c \
+[.tnl]t_vb_program.c \
 [.tnl]t_vb_render.c \
 [.tnl]t_vb_texgen.c \
 [.tnl]t_vb_texmat.c \
@@ -209,6 +213,9 @@ texstore.obj,\
 texutil.obj,\
 varray.obj,\
 vtxfmt.obj,\
+vpstate.obj,\
+vpexec.obj,\
+vpparse.obj,\
 [.x86]x86.obj
 
 OBJECTS4=[.x]glxapi.obj,[.x]fakeglx.obj,[.x]xfonts.obj,\
@@ -280,6 +287,7 @@ OBJECTS12=[.tnl]t_imm_fixup.obj,\
 [.tnl]t_vb_light.obj,\
 [.tnl]t_vb_normals.obj,\
 [.tnl]t_vb_points.obj,\
+[.tnl]t_vb_program.obj,\
 [.tnl]t_vb_render.obj,\
 [.tnl]t_vb_texgen.obj,\
 [.tnl]t_vb_texmat.obj,\
@@ -505,6 +513,8 @@ imports.obj : imports.c
        $(CC) $(CFLAGS) /obj=[.tnl]t_vb_normals.obj [.tnl]t_vb_normals.c
 [.tnl]t_vb_points.obj : [.tnl]t_vb_points.c
        $(CC) $(CFLAGS) /obj=[.tnl]t_vb_points.obj [.tnl]t_vb_points.c
+[.tnl]t_vb_program.obj : [.tnl]t_vb_program.c
+       $(CC) $(CFLAGS) /obj=[.tnl]t_vb_program.obj [.tnl]t_vb_program.c
 [.tnl]t_vb_render.obj : [.tnl]t_vb_render.c
        $(CC) $(CFLAGS) /obj=[.tnl]t_vb_render.obj [.tnl]t_vb_render.c
 [.tnl]t_vb_texgen.obj : [.tnl]t_vb_texgen.c

diff --git a/src/mesa/tnl/t_imm_api.c b/src/mesa/tnl/t_imm_api.c
index d79f962269587f0263c7a7d30f5d6f18fef354e6..94dab9acb13e49aa1b5c5eed66b89cc29674da78 100644 (file)
--- a/src/mesa/tnl/t_imm_api.c
+++ b/src/mesa/tnl/t_imm_api.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_api.c,v 1.21 2001/12/15 02:13:32 brianp Exp $ */
+/* $Id: t_imm_api.c,v 1.22 2001/12/17 09:02:55 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1121,7 +1121,9 @@ static void
 _tnl_VertexAttrib4fNV(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    /* no-op? */
+#ifndef __VMS
    printf("%s(%d, %f, %f, %f, %f)\n", __FUNCTION__, index, x, y, z, w);
+#endif
    (void) index;
    (void) x;
    (void) y;