summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-06-10 20:31:29 -0600
committerBrian Paul <brianp@vmware.com>2010-06-10 22:24:37 -0600
commit936605fc8a69f67de323e5ede60c2f1373bfcafe (patch)
treeacd8eb29174b28c299f52a8cd17a4479a7e6e325 /src/mesa
parenta37b2219d6e3f299379c6434d65f300660d12c3e (diff)
mesa: move uniforms.c to main/
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/SConscript2
-rw-r--r--src/mesa/main/api_exec.c2
-rw-r--r--src/mesa/main/uniforms.c (renamed from src/mesa/shader/uniforms.c)2
-rw-r--r--src/mesa/main/uniforms.h (renamed from src/mesa/shader/uniforms.h)0
-rw-r--r--src/mesa/shader/slang/slang_link.c2
-rw-r--r--src/mesa/sources.mak4
6 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 1f831956e1..0c3c2b30c0 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 fd0c6c96a3..137223acc8 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
index ed1efe5c29..6452980e9c 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
index 29f77cb35a..29f77cb35a 100644
--- a/src/mesa/shader/uniforms.h
+++ b/src/mesa/main/uniforms.h
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 6b1c153245..56d42ca0a7 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 85471dd817..4ad9dbfe55 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 \