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

Reduce the source tree depth a bit.

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]			\

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

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 = (

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) */

src/mesa/shader/slang/library/Makefile → src/mesa/slang/library/Makefile

@@ -1,6 +1,6 @@
 # src/mesa/shader/slang/library/Makefile
 
-TOP = ../../../../..
+TOP = ../../../..
 
 include $(TOP)/configs/current
 

src/mesa/shader/slang/slang_builtin.c → 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) */

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 \