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, 31 insertions, 29 deletions

diff --git a/src/mesa/main/Makefile.win b/src/mesa/main/Makefile.win
index 24c41d21a49..ebb59e76cdd 100644
--- a/src/mesa/main/Makefile.win
+++ b/src/mesa/main/Makefile.win
@@ -12,31 +12,6 @@ TOP = ..
 SUBDIRS = osmesa.dir
 
 CORE_SRCS = \
-	tnl\t_array_api.c \
-	tnl\t_array_import.c \
-	tnl\t_context.c \
-	tnl\t_eval_api.c \
-	tnl\t_imm_alloc.c \
-	tnl\t_imm_api.c \
-	tnl\t_imm_debug.c \
-	tnl\t_imm_dlist.c \
-	tnl\t_imm_elt.c \
-	tnl\t_imm_eval.c \
-	tnl\t_imm_exec.c \
-	tnl\t_imm_fixup.c \
-	tnl\t_pipeline.c \
-	tnl\t_vb_fog.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 \
-	tnl\t_vb_vertex.c \
-	swrast_setup\ss_context.c \
-	swrast_setup\ss_triangle.c \
-	swrast_setup\ss_vb.c \
 	api_loopback.c \
 	api_noop.c \
 	api_validate.c \
@@ -71,6 +46,10 @@ CORE_SRCS = \
 	lines.c \
 	matrix.c \
 	mmath.c \
+	nvprogram.c \
+	nvfragparse.c \
+	nvvertexec.c \
+	nvvertparse.c \
 	pixel.c \
 	points.c \
 	polygon.c \
@@ -85,9 +64,6 @@ CORE_SRCS = \
 	texstore.c \
 	texutil.c \
 	varray.c \
-	vpexec.c \
-	vpparse.c \
-	vpstate.c \
 	vtxfmt.c \
 #	X86\x86.c \
 #	X86\common_x86.c \
@@ -121,6 +97,7 @@ CORE_SRCS = \
 	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 \
@@ -129,7 +106,32 @@ CORE_SRCS = \
 	swrast\s_texstore.c \
 	swrast\s_texture.c \
 	swrast\s_triangle.c \
-	swrast\s_zoom.c
+	swrast\s_zoom.c \
+	swrast_setup\ss_context.c \
+	swrast_setup\ss_triangle.c \
+	swrast_setup\ss_vb.c \
+	tnl\t_array_api.c \
+	tnl\t_array_import.c \
+	tnl\t_context.c \
+	tnl\t_eval_api.c \
+	tnl\t_imm_alloc.c \
+	tnl\t_imm_api.c \
+	tnl\t_imm_debug.c \
+	tnl\t_imm_dlist.c \
+	tnl\t_imm_elt.c \
+	tnl\t_imm_eval.c \
+	tnl\t_imm_exec.c \
+	tnl\t_imm_fixup.c \
+	tnl\t_pipeline.c \
+	tnl\t_vb_fog.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 \
+	tnl\t_vb_vertex.c
 
 DRIVER_SRCS = \
 	Trace\tr_context.c \