Mesa (master): mesa: move shader/slang/* sources to main/slang/*

Brian Paul brianp at kemper.freedesktop.org
Wed Jun 23 21:31:06 PDT 2010


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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jun 10 22:48:16 2010 -0600

mesa: move shader/slang/* sources to main/slang/*

Reduce the source tree depth a bit.

---

 Makefile                                           |    8 ++--
 src/mesa/Makefile                                  |    4 +-
 src/mesa/SConscript                                |   38 ++++++++++----------
 src/mesa/main/shaderapi.c                          |    4 +-
 src/mesa/{shader => }/slang/descrip.mms            |    0 
 src/mesa/{shader => }/slang/library/.gitignore     |    0 
 src/mesa/{shader => }/slang/library/Makefile       |    2 +-
 src/mesa/{shader => }/slang/library/SConscript     |    0 
 .../{shader => }/slang/library/slang_120_core.gc   |    0 
 .../slang/library/slang_builtin_120_common.gc      |    0 
 .../slang/library/slang_builtin_120_fragment.gc    |    0 
 .../slang/library/slang_common_builtin.gc          |    0 
 src/mesa/{shader => }/slang/library/slang_core.gc  |    0 
 .../slang/library/slang_fragment_builtin.gc        |    0 
 .../slang/library/slang_vertex_builtin.gc          |    0 
 src/mesa/{shader => }/slang/slang_builtin.c        |    4 +-
 src/mesa/{shader => }/slang/slang_builtin.h        |    0 
 src/mesa/{shader => }/slang/slang_codegen.c        |    0 
 src/mesa/{shader => }/slang/slang_codegen.h        |    0 
 src/mesa/{shader => }/slang/slang_compile.c        |    0 
 src/mesa/{shader => }/slang/slang_compile.h        |    0 
 .../{shader => }/slang/slang_compile_function.c    |    0 
 .../{shader => }/slang/slang_compile_function.h    |    0 
 .../{shader => }/slang/slang_compile_operation.c   |    0 
 .../{shader => }/slang/slang_compile_operation.h   |    0 
 src/mesa/{shader => }/slang/slang_compile_struct.c |    0 
 src/mesa/{shader => }/slang/slang_compile_struct.h |    0 
 .../{shader => }/slang/slang_compile_variable.c    |    0 
 .../{shader => }/slang/slang_compile_variable.h    |    0 
 src/mesa/{shader => }/slang/slang_emit.c           |    0 
 src/mesa/{shader => }/slang/slang_emit.h           |    0 
 src/mesa/{shader => }/slang/slang_ir.c             |    0 
 src/mesa/{shader => }/slang/slang_ir.h             |    0 
 src/mesa/{shader => }/slang/slang_label.c          |    0 
 src/mesa/{shader => }/slang/slang_label.h          |    0 
 src/mesa/{shader => }/slang/slang_link.c           |    0 
 src/mesa/{shader => }/slang/slang_link.h           |    0 
 src/mesa/{shader => }/slang/slang_log.c            |    0 
 src/mesa/{shader => }/slang/slang_log.h            |    0 
 src/mesa/{shader => }/slang/slang_mem.c            |    0 
 src/mesa/{shader => }/slang/slang_mem.h            |    0 
 src/mesa/{shader => }/slang/slang_print.c          |    0 
 src/mesa/{shader => }/slang/slang_print.h          |    0 
 src/mesa/{shader => }/slang/slang_simplify.c       |    0 
 src/mesa/{shader => }/slang/slang_simplify.h       |    0 
 src/mesa/{shader => }/slang/slang_storage.c        |    0 
 src/mesa/{shader => }/slang/slang_storage.h        |    0 
 src/mesa/{shader => }/slang/slang_typeinfo.c       |    0 
 src/mesa/{shader => }/slang/slang_typeinfo.h       |    0 
 src/mesa/{shader => }/slang/slang_utility.c        |    0 
 src/mesa/{shader => }/slang/slang_utility.h        |    0 
 src/mesa/{shader => }/slang/slang_vartable.c       |    0 
 src/mesa/{shader => }/slang/slang_vartable.h       |    0 
 src/mesa/sources.mak                               |   38 ++++++++++----------
 54 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/Makefile b/Makefile
index 2f83ce9..bf4f2d5 100644
--- a/Makefile
+++ b/Makefile
@@ -246,10 +246,10 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/mesa/shader/*.[chly]				\
 	$(DIRECTORY)/src/mesa/shader/Makefile				\
 	$(DIRECTORY)/src/mesa/shader/descrip.mms			\
-	$(DIRECTORY)/src/mesa/shader/slang/*.[ch]			\
-	$(DIRECTORY)/src/mesa/shader/slang/descrip.mms			\
-	$(DIRECTORY)/src/mesa/shader/slang/library/*.gc			\
-	$(DIRECTORY)/src/mesa/shader/slang/library/Makefile		\
+	$(DIRECTORY)/src/mesa/slang/*.[ch]				\
+	$(DIRECTORY)/src/mesa/slang/descrip.mms				\
+	$(DIRECTORY)/src/mesa/slang/library/*.gc			\
+	$(DIRECTORY)/src/mesa/slang/library/Makefile			\
 	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\
 	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\
 	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 4f81768..3e0f010 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -116,7 +116,7 @@ asm_subdirs:
 ######################################################################
 # GLSL built-in library
 glsl_builtin:
-	(cd shader/slang/library && $(MAKE)) || exit 1 ;
+	(cd slang/library && $(MAKE)) || exit 1 ;
 
 
 ######################################################################
@@ -234,7 +234,7 @@ clean: clean-es1 clean-es2
 	-rm -f depend depend.bak libmesa.a libmesagallium.a
 	-rm -f drivers/*/*.o
 	-rm -f *.pc
-	-rm -f shader/slang/library/*_gc.h
+	-rm -f slang/library/*_gc.h
 	- at cd drivers/dri && $(MAKE) clean
 	- at cd drivers/x11 && $(MAKE) clean
 	- at cd drivers/osmesa && $(MAKE) clean
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index b65c86d..405b5c8 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -221,25 +221,25 @@ if env['platform'] != 'winddk':
 	]
 	
 	slang_sources = [
-		'shader/slang/slang_builtin.c',
-		'shader/slang/slang_codegen.c',
-		'shader/slang/slang_compile.c',
-		'shader/slang/slang_compile_function.c',
-		'shader/slang/slang_compile_operation.c',
-		'shader/slang/slang_compile_struct.c',
-		'shader/slang/slang_compile_variable.c',
-		'shader/slang/slang_emit.c',
-		'shader/slang/slang_ir.c',
-		'shader/slang/slang_label.c',
-		'shader/slang/slang_link.c',
-		'shader/slang/slang_log.c',
-		'shader/slang/slang_mem.c',
-		'shader/slang/slang_print.c',
-		'shader/slang/slang_simplify.c',
-		'shader/slang/slang_storage.c',
-		'shader/slang/slang_typeinfo.c',
-		'shader/slang/slang_vartable.c',
-		'shader/slang/slang_utility.c',
+		'slang/slang_builtin.c',
+		'slang/slang_codegen.c',
+		'slang/slang_compile.c',
+		'slang/slang_compile_function.c',
+		'slang/slang_compile_operation.c',
+		'slang/slang_compile_struct.c',
+		'slang/slang_compile_variable.c',
+		'slang/slang_emit.c',
+		'slang/slang_ir.c',
+		'slang/slang_label.c',
+		'slang/slang_link.c',
+		'slang/slang_log.c',
+		'slang/slang_mem.c',
+		'slang/slang_print.c',
+		'slang/slang_simplify.c',
+		'slang/slang_storage.c',
+		'slang/slang_typeinfo.c',
+		'slang/slang_vartable.c',
+		'slang/slang_utility.c',
 	]
 	
 	mesa_sources = (
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 88edb54..81c3964 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -45,8 +45,8 @@
 #include "shader/program.h"
 #include "shader/prog_parameter.h"
 #include "shader/prog_uniform.h"
-#include "shader/slang/slang_compile.h"
-#include "shader/slang/slang_link.h"
+#include "slang/slang_compile.h"
+#include "slang/slang_link.h"
 
 
 /** Define this to enable shader substitution (see below) */
diff --git a/src/mesa/shader/slang/descrip.mms b/src/mesa/slang/descrip.mms
similarity index 100%
rename from src/mesa/shader/slang/descrip.mms
rename to src/mesa/slang/descrip.mms
diff --git a/src/mesa/shader/slang/library/.gitignore b/src/mesa/slang/library/.gitignore
similarity index 100%
rename from src/mesa/shader/slang/library/.gitignore
rename to src/mesa/slang/library/.gitignore
diff --git a/src/mesa/shader/slang/library/Makefile b/src/mesa/slang/library/Makefile
similarity index 98%
rename from src/mesa/shader/slang/library/Makefile
rename to src/mesa/slang/library/Makefile
index c696451..75c91e7 100644
--- a/src/mesa/shader/slang/library/Makefile
+++ b/src/mesa/slang/library/Makefile
@@ -1,6 +1,6 @@
 # src/mesa/shader/slang/library/Makefile
 
-TOP = ../../../../..
+TOP = ../../../..
 
 include $(TOP)/configs/current
 
diff --git a/src/mesa/shader/slang/library/SConscript b/src/mesa/slang/library/SConscript
similarity index 100%
rename from src/mesa/shader/slang/library/SConscript
rename to src/mesa/slang/library/SConscript
diff --git a/src/mesa/shader/slang/library/slang_120_core.gc b/src/mesa/slang/library/slang_120_core.gc
similarity index 100%
rename from src/mesa/shader/slang/library/slang_120_core.gc
rename to src/mesa/slang/library/slang_120_core.gc
diff --git a/src/mesa/shader/slang/library/slang_builtin_120_common.gc b/src/mesa/slang/library/slang_builtin_120_common.gc
similarity index 100%
rename from src/mesa/shader/slang/library/slang_builtin_120_common.gc
rename to src/mesa/slang/library/slang_builtin_120_common.gc
diff --git a/src/mesa/shader/slang/library/slang_builtin_120_fragment.gc b/src/mesa/slang/library/slang_builtin_120_fragment.gc
similarity index 100%
rename from src/mesa/shader/slang/library/slang_builtin_120_fragment.gc
rename to src/mesa/slang/library/slang_builtin_120_fragment.gc
diff --git a/src/mesa/shader/slang/library/slang_common_builtin.gc b/src/mesa/slang/library/slang_common_builtin.gc
similarity index 100%
rename from src/mesa/shader/slang/library/slang_common_builtin.gc
rename to src/mesa/slang/library/slang_common_builtin.gc
diff --git a/src/mesa/shader/slang/library/slang_core.gc b/src/mesa/slang/library/slang_core.gc
similarity index 100%
rename from src/mesa/shader/slang/library/slang_core.gc
rename to src/mesa/slang/library/slang_core.gc
diff --git a/src/mesa/shader/slang/library/slang_fragment_builtin.gc b/src/mesa/slang/library/slang_fragment_builtin.gc
similarity index 100%
rename from src/mesa/shader/slang/library/slang_fragment_builtin.gc
rename to src/mesa/slang/library/slang_fragment_builtin.gc
diff --git a/src/mesa/shader/slang/library/slang_vertex_builtin.gc b/src/mesa/slang/library/slang_vertex_builtin.gc
similarity index 100%
rename from src/mesa/shader/slang/library/slang_vertex_builtin.gc
rename to src/mesa/slang/library/slang_vertex_builtin.gc
diff --git a/src/mesa/shader/slang/slang_builtin.c b/src/mesa/slang/slang_builtin.c
similarity index 99%
rename from src/mesa/shader/slang/slang_builtin.c
rename to src/mesa/slang/slang_builtin.c
index b7bf4e0..edb6052 100644
--- a/src/mesa/shader/slang/slang_builtin.c
+++ b/src/mesa/slang/slang_builtin.c
@@ -35,8 +35,8 @@
 #include "shader/prog_instruction.h"
 #include "shader/prog_parameter.h"
 #include "shader/prog_statevars.h"
-#include "shader/slang/slang_ir.h"
-#include "shader/slang/slang_builtin.h"
+#include "slang/slang_ir.h"
+#include "slang/slang_builtin.h"
 
 
 /** special state token (see below) */
diff --git a/src/mesa/shader/slang/slang_builtin.h b/src/mesa/slang/slang_builtin.h
similarity index 100%
rename from src/mesa/shader/slang/slang_builtin.h
rename to src/mesa/slang/slang_builtin.h
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/slang/slang_codegen.c
similarity index 100%
rename from src/mesa/shader/slang/slang_codegen.c
rename to src/mesa/slang/slang_codegen.c
diff --git a/src/mesa/shader/slang/slang_codegen.h b/src/mesa/slang/slang_codegen.h
similarity index 100%
rename from src/mesa/shader/slang/slang_codegen.h
rename to src/mesa/slang/slang_codegen.h
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/slang/slang_compile.c
similarity index 100%
rename from src/mesa/shader/slang/slang_compile.c
rename to src/mesa/slang/slang_compile.c
diff --git a/src/mesa/shader/slang/slang_compile.h b/src/mesa/slang/slang_compile.h
similarity index 100%
rename from src/mesa/shader/slang/slang_compile.h
rename to src/mesa/slang/slang_compile.h
diff --git a/src/mesa/shader/slang/slang_compile_function.c b/src/mesa/slang/slang_compile_function.c
similarity index 100%
rename from src/mesa/shader/slang/slang_compile_function.c
rename to src/mesa/slang/slang_compile_function.c
diff --git a/src/mesa/shader/slang/slang_compile_function.h b/src/mesa/slang/slang_compile_function.h
similarity index 100%
rename from src/mesa/shader/slang/slang_compile_function.h
rename to src/mesa/slang/slang_compile_function.h
diff --git a/src/mesa/shader/slang/slang_compile_operation.c b/src/mesa/slang/slang_compile_operation.c
similarity index 100%
rename from src/mesa/shader/slang/slang_compile_operation.c
rename to src/mesa/slang/slang_compile_operation.c
diff --git a/src/mesa/shader/slang/slang_compile_operation.h b/src/mesa/slang/slang_compile_operation.h
similarity index 100%
rename from src/mesa/shader/slang/slang_compile_operation.h
rename to src/mesa/slang/slang_compile_operation.h
diff --git a/src/mesa/shader/slang/slang_compile_struct.c b/src/mesa/slang/slang_compile_struct.c
similarity index 100%
rename from src/mesa/shader/slang/slang_compile_struct.c
rename to src/mesa/slang/slang_compile_struct.c
diff --git a/src/mesa/shader/slang/slang_compile_struct.h b/src/mesa/slang/slang_compile_struct.h
similarity index 100%
rename from src/mesa/shader/slang/slang_compile_struct.h
rename to src/mesa/slang/slang_compile_struct.h
diff --git a/src/mesa/shader/slang/slang_compile_variable.c b/src/mesa/slang/slang_compile_variable.c
similarity index 100%
rename from src/mesa/shader/slang/slang_compile_variable.c
rename to src/mesa/slang/slang_compile_variable.c
diff --git a/src/mesa/shader/slang/slang_compile_variable.h b/src/mesa/slang/slang_compile_variable.h
similarity index 100%
rename from src/mesa/shader/slang/slang_compile_variable.h
rename to src/mesa/slang/slang_compile_variable.h
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/slang/slang_emit.c
similarity index 100%
rename from src/mesa/shader/slang/slang_emit.c
rename to src/mesa/slang/slang_emit.c
diff --git a/src/mesa/shader/slang/slang_emit.h b/src/mesa/slang/slang_emit.h
similarity index 100%
rename from src/mesa/shader/slang/slang_emit.h
rename to src/mesa/slang/slang_emit.h
diff --git a/src/mesa/shader/slang/slang_ir.c b/src/mesa/slang/slang_ir.c
similarity index 100%
rename from src/mesa/shader/slang/slang_ir.c
rename to src/mesa/slang/slang_ir.c
diff --git a/src/mesa/shader/slang/slang_ir.h b/src/mesa/slang/slang_ir.h
similarity index 100%
rename from src/mesa/shader/slang/slang_ir.h
rename to src/mesa/slang/slang_ir.h
diff --git a/src/mesa/shader/slang/slang_label.c b/src/mesa/slang/slang_label.c
similarity index 100%
rename from src/mesa/shader/slang/slang_label.c
rename to src/mesa/slang/slang_label.c
diff --git a/src/mesa/shader/slang/slang_label.h b/src/mesa/slang/slang_label.h
similarity index 100%
rename from src/mesa/shader/slang/slang_label.h
rename to src/mesa/slang/slang_label.h
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/slang/slang_link.c
similarity index 100%
rename from src/mesa/shader/slang/slang_link.c
rename to src/mesa/slang/slang_link.c
diff --git a/src/mesa/shader/slang/slang_link.h b/src/mesa/slang/slang_link.h
similarity index 100%
rename from src/mesa/shader/slang/slang_link.h
rename to src/mesa/slang/slang_link.h
diff --git a/src/mesa/shader/slang/slang_log.c b/src/mesa/slang/slang_log.c
similarity index 100%
rename from src/mesa/shader/slang/slang_log.c
rename to src/mesa/slang/slang_log.c
diff --git a/src/mesa/shader/slang/slang_log.h b/src/mesa/slang/slang_log.h
similarity index 100%
rename from src/mesa/shader/slang/slang_log.h
rename to src/mesa/slang/slang_log.h
diff --git a/src/mesa/shader/slang/slang_mem.c b/src/mesa/slang/slang_mem.c
similarity index 100%
rename from src/mesa/shader/slang/slang_mem.c
rename to src/mesa/slang/slang_mem.c
diff --git a/src/mesa/shader/slang/slang_mem.h b/src/mesa/slang/slang_mem.h
similarity index 100%
rename from src/mesa/shader/slang/slang_mem.h
rename to src/mesa/slang/slang_mem.h
diff --git a/src/mesa/shader/slang/slang_print.c b/src/mesa/slang/slang_print.c
similarity index 100%
rename from src/mesa/shader/slang/slang_print.c
rename to src/mesa/slang/slang_print.c
diff --git a/src/mesa/shader/slang/slang_print.h b/src/mesa/slang/slang_print.h
similarity index 100%
rename from src/mesa/shader/slang/slang_print.h
rename to src/mesa/slang/slang_print.h
diff --git a/src/mesa/shader/slang/slang_simplify.c b/src/mesa/slang/slang_simplify.c
similarity index 100%
rename from src/mesa/shader/slang/slang_simplify.c
rename to src/mesa/slang/slang_simplify.c
diff --git a/src/mesa/shader/slang/slang_simplify.h b/src/mesa/slang/slang_simplify.h
similarity index 100%
rename from src/mesa/shader/slang/slang_simplify.h
rename to src/mesa/slang/slang_simplify.h
diff --git a/src/mesa/shader/slang/slang_storage.c b/src/mesa/slang/slang_storage.c
similarity index 100%
rename from src/mesa/shader/slang/slang_storage.c
rename to src/mesa/slang/slang_storage.c
diff --git a/src/mesa/shader/slang/slang_storage.h b/src/mesa/slang/slang_storage.h
similarity index 100%
rename from src/mesa/shader/slang/slang_storage.h
rename to src/mesa/slang/slang_storage.h
diff --git a/src/mesa/shader/slang/slang_typeinfo.c b/src/mesa/slang/slang_typeinfo.c
similarity index 100%
rename from src/mesa/shader/slang/slang_typeinfo.c
rename to src/mesa/slang/slang_typeinfo.c
diff --git a/src/mesa/shader/slang/slang_typeinfo.h b/src/mesa/slang/slang_typeinfo.h
similarity index 100%
rename from src/mesa/shader/slang/slang_typeinfo.h
rename to src/mesa/slang/slang_typeinfo.h
diff --git a/src/mesa/shader/slang/slang_utility.c b/src/mesa/slang/slang_utility.c
similarity index 100%
rename from src/mesa/shader/slang/slang_utility.c
rename to src/mesa/slang/slang_utility.c
diff --git a/src/mesa/shader/slang/slang_utility.h b/src/mesa/slang/slang_utility.h
similarity index 100%
rename from src/mesa/shader/slang/slang_utility.h
rename to src/mesa/slang/slang_utility.h
diff --git a/src/mesa/shader/slang/slang_vartable.c b/src/mesa/slang/slang_vartable.c
similarity index 100%
rename from src/mesa/shader/slang/slang_vartable.c
rename to src/mesa/slang/slang_vartable.c
diff --git a/src/mesa/shader/slang/slang_vartable.h b/src/mesa/slang/slang_vartable.h
similarity index 100%
rename from src/mesa/shader/slang/slang_vartable.h
rename to src/mesa/slang/slang_vartable.h
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 38b781c..236baf5 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -251,25 +251,25 @@ SHADER_SOURCES = \
 	shader/symbol_table.c
 
 SLANG_SOURCES =	\
-	shader/slang/slang_builtin.c	\
-	shader/slang/slang_codegen.c	\
-	shader/slang/slang_compile.c	\
-	shader/slang/slang_compile_function.c	\
-	shader/slang/slang_compile_operation.c	\
-	shader/slang/slang_compile_struct.c	\
-	shader/slang/slang_compile_variable.c	\
-	shader/slang/slang_emit.c	\
-	shader/slang/slang_ir.c	\
-	shader/slang/slang_label.c	\
-	shader/slang/slang_link.c	\
-	shader/slang/slang_log.c	\
-	shader/slang/slang_mem.c	\
-	shader/slang/slang_print.c	\
-	shader/slang/slang_simplify.c	\
-	shader/slang/slang_storage.c	\
-	shader/slang/slang_typeinfo.c	\
-	shader/slang/slang_vartable.c	\
-	shader/slang/slang_utility.c
+	slang/slang_builtin.c	\
+	slang/slang_codegen.c	\
+	slang/slang_compile.c	\
+	slang/slang_compile_function.c	\
+	slang/slang_compile_operation.c	\
+	slang/slang_compile_struct.c	\
+	slang/slang_compile_variable.c	\
+	slang/slang_emit.c	\
+	slang/slang_ir.c	\
+	slang/slang_label.c	\
+	slang/slang_link.c	\
+	slang/slang_log.c	\
+	slang/slang_mem.c	\
+	slang/slang_print.c	\
+	slang/slang_simplify.c	\
+	slang/slang_storage.c	\
+	slang/slang_typeinfo.c	\
+	slang/slang_vartable.c	\
+	slang/slang_utility.c
 
 ASM_C_SOURCES =	\
 	x86/common_x86.c \



More information about the mesa-commit mailing list