First batch of code for GL_NV_fragment_program.

Re-org of some GL_NV_vertex_program code.
Replace MAX_TEXTURE_UNITS with MAX_TEXTURE_COORD_UNITS and MAX_TEXTURE_IMAGE_UNITS.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/mesa/main/Makefile.DJ b/src/mesa/main/Makefile.DJ
index 5301eea352a..9bbbec6bb2a 100644
--- a/src/mesa/main/Makefile.DJ
+++ b/src/mesa/main/Makefile.DJ
@@ -1,7 +1,7 @@
 # Mesa 3-D graphics library

-# Version:  4.1

+# Version:  5.1

 # 

-# Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.

+# 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"),

@@ -20,7 +20,7 @@
 # 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.3 for Mesa 5.0

+# DOS/DJGPP core makefile v1.3 for Mesa 5.1

 #

 #  Copyright (C) 2002 - Borca Daniel

 #  Email : [email protected]

@@ -119,6 +119,10 @@ CORE_SOURCES = \
 	lines.c \

 	matrix.c \

 	mmath.c \

+	nvprogram.c \

+	nvfragparse.c \

+	nvvertexec.c \

+	nvvertparse.c \

 	pixel.c \

 	points.c \

 	polygon.c \

@@ -132,10 +136,6 @@ CORE_SOURCES = \
 	texstate.c \

 	texstore.c \

 	texutil.c \

-	varray.c \

-	vpexec.c \

-	vpparse.c \

-	vpstate.c \

 	vtxfmt.c \

 	math/m_debug_clip.c \

 	math/m_debug_norm.c \

@@ -166,6 +166,7 @@ CORE_SOURCES = \
 	swrast/s_lines.c \

 	swrast/s_logic.c \

 	swrast/s_masking.c \

+	swrast/s_nvfragprog.c \

 	swrast/s_pixeltex.c \

 	swrast/s_points.c \

 	swrast/s_readpix.c \