mesa: move uniforms.c to main/

src/mesa/SConscript

@@ -105,6 +105,7 @@ if env['platform'] != 'winddk':
 		'main/texstate.c',
 		'main/texstore.c',
 		'main/transformfeedback.c',
+		'main/uniforms.c',
 		'main/varray.c',
 		'main/version.c',
 		'main/viewport.c',
@@ -217,7 +218,6 @@ if env['platform'] != 'winddk':
 		'shader/prog_uniform.c',
 		'shader/programopt.c',
 		'shader/symbol_table.c',
-		'shader/uniforms.c',
 	]
 	
 	slang_sources = [

src/mesa/main/api_exec.c

@@ -99,7 +99,7 @@
 #endif
 #if FEATURE_ARB_shader_objects
 #include "shaderapi.h"
-#include "shader/uniforms.h"
+#include "uniforms.h"
 #endif
 #if FEATURE_ARB_sync
 #include "syncobj.h"

src/mesa/main/uniforms.c

@@ -40,7 +40,7 @@
 #include "main/dispatch.h"
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
-#include "uniforms.h"
+#include "main/uniforms.h"
 #include "shader/prog_parameter.h"
 #include "shader/prog_statevars.h"
 #include "shader/prog_uniform.h"

src/mesa/shader/slang/slang_link.c

@@ -34,13 +34,13 @@
 #include "main/macros.h"
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
+#include "main/uniforms.h"
 #include "shader/program.h"
 #include "shader/prog_instruction.h"
 #include "shader/prog_parameter.h"
 #include "shader/prog_print.h"
 #include "shader/prog_statevars.h"
 #include "shader/prog_uniform.h"
-#include "shader/uniforms.h"
 #include "slang_builtin.h"
 #include "slang_link.h"
 

src/mesa/sources.mak

@@ -89,6 +89,7 @@ MAIN_SOURCES = \
 	main/texstate.c \
 	main/texstore.c \
 	main/transformfeedback.c \
+	main/uniforms.c \
 	main/varray.c \
 	main/version.c \
 	main/viewport.c \
@@ -247,8 +248,7 @@ SHADER_SOURCES = \
 	shader/prog_statevars.c \
 	shader/prog_uniform.c \
 	shader/programopt.c \
-	shader/symbol_table.c \
-	shader/uniforms.c
+	shader/symbol_table.c
 
 SLANG_SOURCES =	\
 	shader/slang/slang_builtin.c	\