Mesa (master): mesa: move uniforms.c to main/

[Brian Paul]

Module: Mesa
Branch: master
Commit: 936605fc8a69f67de323e5ede60c2f1373bfcafe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=936605fc8a69f67de323e5ede60c2f1373bfcafe

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jun 10 20:31:29 2010 -0600

mesa: move uniforms.c to main/

---

 src/mesa/SConscript                  |    2 +-
 src/mesa/main/api_exec.c             |    2 +-
 src/mesa/{shader => main}/uniforms.c |    2 +-
 src/mesa/{shader => main}/uniforms.h |    0 
 src/mesa/shader/slang/slang_link.c   |    2 +-
 src/mesa/sources.mak                 |    4 ++--
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 1f83195..0c3c2b3 100644
--- a/src/mesa/SConscript
+++ b/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 = [
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index fd0c6c9..137223a 100644
--- a/src/mesa/main/api_exec.c
+++ b/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"
diff --git a/src/mesa/shader/uniforms.c b/src/mesa/main/uniforms.c
similarity index 99%
rename from src/mesa/shader/uniforms.c
rename to src/mesa/main/uniforms.c
index ed1efe5..6452980 100644
--- a/src/mesa/shader/uniforms.c
+++ b/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"
diff --git a/src/mesa/shader/uniforms.h b/src/mesa/main/uniforms.h
similarity index 100%
rename from src/mesa/shader/uniforms.h
rename to src/mesa/main/uniforms.h
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 6b1c153..56d42ca 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/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"
 
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 85471dd..4ad9dbf 100644
--- a/src/mesa/sources.mak
+++ b/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	\