mesa: move nvprogram.[ch] to main/

src/mesa/SConscript

@@ -75,6 +75,7 @@ if env['platform'] != 'winddk':
 		'main/mipmap.c',
 		'main/mm.c',
 		'main/multisample.c',
+		'main/nvprogram.c',
 		'main/pixel.c',
 		'main/pixelstore.c',
 		'main/points.c',
@@ -201,7 +202,6 @@ if env['platform'] != 'winddk':
 		'shader/hash_table.c',
 		'shader/lex.yy.c',
 		'shader/nvfragparse.c',
-		'shader/nvprogram.c',
 		'shader/nvvertparse.c',
 		'shader/program.c',
 		'shader/program_parse.tab.c',

src/mesa/main/api_exec.c

@@ -92,10 +92,10 @@
 #include "varray.h"
 #include "viewport.h"
 #if FEATURE_NV_vertex_program
-#include "shader/nvprogram.h"
+#include "nvprogram.h"
 #endif
 #if FEATURE_NV_fragment_program
-#include "shader/nvprogram.h"
+#include "nvprogram.h"
 #endif
 #if FEATURE_ARB_shader_objects
 #include "shaderapi.h"

src/mesa/main/dlist.c

@@ -62,7 +62,7 @@
 #include "arbprogram.h"
 #endif
 #if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
-#include "shader/nvprogram.h"
+#include "nvprogram.h"
 #endif
 
 #include "math/m_matrix.h"

src/mesa/main/nvprogram.c

@@ -42,13 +42,13 @@
 #include "main/hash.h"
 #include "main/imports.h"
 #include "main/macros.h"
-#include "program.h"
-#include "prog_parameter.h"
-#include "prog_instruction.h"
-#include "nvfragparse.h"
-#include "nvvertparse.h"
-#include "arbprogparse.h"
-#include "nvprogram.h"
+#include "main/nvprogram.h"
+#include "shader/arbprogparse.h"
+#include "shader/nvfragparse.h"
+#include "shader/nvvertparse.h"
+#include "shader/program.h"
+#include "shader/prog_instruction.h"
+#include "shader/prog_parameter.h"
 
 
 

src/mesa/shader/nvvertparse.c

@@ -40,7 +40,7 @@
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/imports.h"
-#include "nvprogram.h"
+#include "main/nvprogram.h"
 #include "nvvertparse.h"
 #include "prog_instruction.h"
 #include "prog_parameter.h"

src/mesa/sources.mak

@@ -57,6 +57,7 @@ MAIN_SOURCES = \
 	main/mipmap.c \
 	main/mm.c \
 	main/multisample.c \
+	main/nvprogram.c \
 	main/pixel.c \
 	main/pixelstore.c \
 	main/points.c \
@@ -232,7 +233,6 @@ SHADER_SOURCES = \
 	shader/hash_table.c \
 	shader/lex.yy.c \
 	shader/nvfragparse.c \
-	shader/nvprogram.c \
 	shader/nvvertparse.c \
 	shader/program.c \
 	shader/program_parse.tab.c \