53 files changed, 45 insertions, 45 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 4f81768924a..3e0f010671c 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
 	-@cd drivers/dri && $(MAKE) clean
 	-@cd drivers/x11 && $(MAKE) clean
 	-@cd drivers/osmesa && $(MAKE) clean
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index b65c86da820..405b5c8830c 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 88edb541ac6..81c3964f931 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
index 674b786ac08..674b786ac08 100644
--- a/src/mesa/shader/slang/descrip.mms
+++ b/src/mesa/slang/descrip.mms
diff --git a/src/mesa/shader/slang/library/.gitignore b/src/mesa/slang/library/.gitignore
index 02a89fc7df7..02a89fc7df7 100644
--- a/src/mesa/shader/slang/library/.gitignore
+++ b/src/mesa/slang/library/.gitignore
diff --git a/src/mesa/shader/slang/library/Makefile b/src/mesa/slang/library/Makefile
index c6964512bfe..75c91e7db73 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
index 0b25467a4e8..0b25467a4e8 100644
--- a/src/mesa/shader/slang/library/SConscript
+++ b/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
index 04c5ec2ec5c..04c5ec2ec5c 100644
--- a/src/mesa/shader/slang/library/slang_120_core.gc
+++ b/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
index c6264c3b471..c6264c3b471 100644
--- a/src/mesa/shader/slang/library/slang_builtin_120_common.gc
+++ b/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
index 7d516046a18..7d516046a18 100644
--- a/src/mesa/shader/slang/library/slang_builtin_120_fragment.gc
+++ b/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
index d75354deffe..d75354deffe 100644
--- a/src/mesa/shader/slang/library/slang_common_builtin.gc
+++ b/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
index 0a0d15903bc..0a0d15903bc 100644
--- a/src/mesa/shader/slang/library/slang_core.gc
+++ b/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
index 54a80ea0e06..54a80ea0e06 100644
--- a/src/mesa/shader/slang/library/slang_fragment_builtin.gc
+++ b/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
index 0c67c2ef20d..0c67c2ef20d 100644
--- a/src/mesa/shader/slang/library/slang_vertex_builtin.gc
+++ b/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
index b7bf4e06dc8..edb6052cb57 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
index c3021ca33c7..c3021ca33c7 100644
--- a/src/mesa/shader/slang/slang_builtin.h
+++ b/src/mesa/slang/slang_builtin.h
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/slang/slang_codegen.c
index 0504d47765f..0504d47765f 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/slang/slang_codegen.c
diff --git a/src/mesa/shader/slang/slang_codegen.h b/src/mesa/slang/slang_codegen.h
index 461633fe346..461633fe346 100644
--- a/src/mesa/shader/slang/slang_codegen.h
+++ b/src/mesa/slang/slang_codegen.h
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/slang/slang_compile.c
index b6b1f3c9906..b6b1f3c9906 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/slang/slang_compile.c
diff --git a/src/mesa/shader/slang/slang_compile.h b/src/mesa/slang/slang_compile.h
index 7fb549d33d2..7fb549d33d2 100644
--- a/src/mesa/shader/slang/slang_compile.h
+++ b/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
index 4dd885176d4..4dd885176d4 100644
--- a/src/mesa/shader/slang/slang_compile_function.c
+++ b/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
index a5445ec2537..a5445ec2537 100644
--- a/src/mesa/shader/slang/slang_compile_function.h
+++ b/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
index 5441d60df59..5441d60df59 100644
--- a/src/mesa/shader/slang/slang_compile_operation.c
+++ b/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
index 1f15c198963..1f15c198963 100644
--- a/src/mesa/shader/slang/slang_compile_operation.h
+++ b/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
index e6c38730d7d..e6c38730d7d 100644
--- a/src/mesa/shader/slang/slang_compile_struct.c
+++ b/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
index 90c5512f4d3..90c5512f4d3 100644
--- a/src/mesa/shader/slang/slang_compile_struct.h
+++ b/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
index 23c08a9039d..23c08a9039d 100644
--- a/src/mesa/shader/slang/slang_compile_variable.c
+++ b/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
index 5c9d248b354..5c9d248b354 100644
--- a/src/mesa/shader/slang/slang_compile_variable.h
+++ b/src/mesa/slang/slang_compile_variable.h
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/slang/slang_emit.c
index 4d4c611dfe4..4d4c611dfe4 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/slang/slang_emit.c
diff --git a/src/mesa/shader/slang/slang_emit.h b/src/mesa/slang/slang_emit.h
index ab4c202d673..ab4c202d673 100644
--- a/src/mesa/shader/slang/slang_emit.h
+++ b/src/mesa/slang/slang_emit.h
diff --git a/src/mesa/shader/slang/slang_ir.c b/src/mesa/slang/slang_ir.c
index c223004b22b..c223004b22b 100644
--- a/src/mesa/shader/slang/slang_ir.c
+++ b/src/mesa/slang/slang_ir.c
diff --git a/src/mesa/shader/slang/slang_ir.h b/src/mesa/slang/slang_ir.h
index 166b4e80436..166b4e80436 100644
--- a/src/mesa/shader/slang/slang_ir.h
+++ b/src/mesa/slang/slang_ir.h
diff --git a/src/mesa/shader/slang/slang_label.c b/src/mesa/slang/slang_label.c
index 8e3a8ebc1aa..8e3a8ebc1aa 100644
--- a/src/mesa/shader/slang/slang_label.c
+++ b/src/mesa/slang/slang_label.c
diff --git a/src/mesa/shader/slang/slang_label.h b/src/mesa/slang/slang_label.h
index 87068ae7a7f..87068ae7a7f 100644
--- a/src/mesa/shader/slang/slang_label.h
+++ b/src/mesa/slang/slang_label.h
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/slang/slang_link.c
index 56d42ca0a79..56d42ca0a79 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/slang/slang_link.c
diff --git a/src/mesa/shader/slang/slang_link.h b/src/mesa/slang/slang_link.h
index 2b44d20787a..2b44d20787a 100644
--- a/src/mesa/shader/slang/slang_link.h
+++ b/src/mesa/slang/slang_link.h
diff --git a/src/mesa/shader/slang/slang_log.c b/src/mesa/slang/slang_log.c
index 9ff21417bc5..9ff21417bc5 100644
--- a/src/mesa/shader/slang/slang_log.c
+++ b/src/mesa/slang/slang_log.c
diff --git a/src/mesa/shader/slang/slang_log.h b/src/mesa/slang/slang_log.h
index dcaba0285a7..dcaba0285a7 100644
--- a/src/mesa/shader/slang/slang_log.h
+++ b/src/mesa/slang/slang_log.h
diff --git a/src/mesa/shader/slang/slang_mem.c b/src/mesa/slang/slang_mem.c
index 5eaa7c44272..5eaa7c44272 100644
--- a/src/mesa/shader/slang/slang_mem.c
+++ b/src/mesa/slang/slang_mem.c
diff --git a/src/mesa/shader/slang/slang_mem.h b/src/mesa/slang/slang_mem.h
index b5bfae24791..b5bfae24791 100644
--- a/src/mesa/shader/slang/slang_mem.h
+++ b/src/mesa/slang/slang_mem.h
diff --git a/src/mesa/shader/slang/slang_print.c b/src/mesa/slang/slang_print.c
index 6b34f395fdf..6b34f395fdf 100644
--- a/src/mesa/shader/slang/slang_print.c
+++ b/src/mesa/slang/slang_print.c
diff --git a/src/mesa/shader/slang/slang_print.h b/src/mesa/slang/slang_print.h
index 46605c80610..46605c80610 100644
--- a/src/mesa/shader/slang/slang_print.h
+++ b/src/mesa/slang/slang_print.h
diff --git a/src/mesa/shader/slang/slang_simplify.c b/src/mesa/slang/slang_simplify.c
index 13b9ca3c877..13b9ca3c877 100644
--- a/src/mesa/shader/slang/slang_simplify.c
+++ b/src/mesa/slang/slang_simplify.c
diff --git a/src/mesa/shader/slang/slang_simplify.h b/src/mesa/slang/slang_simplify.h
index 8689c23b1a0..8689c23b1a0 100644
--- a/src/mesa/shader/slang/slang_simplify.h
+++ b/src/mesa/slang/slang_simplify.h
diff --git a/src/mesa/shader/slang/slang_storage.c b/src/mesa/slang/slang_storage.c
index 656e15670d3..656e15670d3 100644
--- a/src/mesa/shader/slang/slang_storage.c
+++ b/src/mesa/slang/slang_storage.c
diff --git a/src/mesa/shader/slang/slang_storage.h b/src/mesa/slang/slang_storage.h
index 1876a36dd63..1876a36dd63 100644
--- a/src/mesa/shader/slang/slang_storage.h
+++ b/src/mesa/slang/slang_storage.h
diff --git a/src/mesa/shader/slang/slang_typeinfo.c b/src/mesa/slang/slang_typeinfo.c
index 0f96768b02e..0f96768b02e 100644
--- a/src/mesa/shader/slang/slang_typeinfo.c
+++ b/src/mesa/slang/slang_typeinfo.c
diff --git a/src/mesa/shader/slang/slang_typeinfo.h b/src/mesa/slang/slang_typeinfo.h
index 9a6407a31bf..9a6407a31bf 100644
--- a/src/mesa/shader/slang/slang_typeinfo.h
+++ b/src/mesa/slang/slang_typeinfo.h
diff --git a/src/mesa/shader/slang/slang_utility.c b/src/mesa/slang/slang_utility.c
index c1d57409a43..c1d57409a43 100644
--- a/src/mesa/shader/slang/slang_utility.c
+++ b/src/mesa/slang/slang_utility.c
diff --git a/src/mesa/shader/slang/slang_utility.h b/src/mesa/slang/slang_utility.h
index 2c0d0bcbb2a..2c0d0bcbb2a 100644
--- a/src/mesa/shader/slang/slang_utility.h
+++ b/src/mesa/slang/slang_utility.h
diff --git a/src/mesa/shader/slang/slang_vartable.c b/src/mesa/slang/slang_vartable.c
index e07e3a226a5..e07e3a226a5 100644
--- a/src/mesa/shader/slang/slang_vartable.c
+++ b/src/mesa/slang/slang_vartable.c
diff --git a/src/mesa/shader/slang/slang_vartable.h b/src/mesa/slang/slang_vartable.h
index 94bcd63f45a..94bcd63f45a 100644
--- a/src/mesa/shader/slang/slang_vartable.h
+++ b/src/mesa/slang/slang_vartable.h
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 38b781cb4ce..236baf5e2f8 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 \