mesa: rename src/mesa/shader/ to src/mesa/program/

1 files changed, 23 insertions, 23 deletions

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 405b5c8830c..79e9b4553b7 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -197,27 +197,27 @@ if env['platform'] != 'winddk':
 		'state_tracker/st_texture.c',
 	]
 	
-	shader_sources = [
-		'shader/arbprogparse.c',
-		'shader/hash_table.c',
-		'shader/lex.yy.c',
-		'shader/nvfragparse.c',
-		'shader/nvvertparse.c',
-		'shader/program.c',
-		'shader/program_parse.tab.c',
-		'shader/program_parse_extra.c',
-		'shader/prog_cache.c',
-		'shader/prog_execute.c',
-		'shader/prog_instruction.c',
-		'shader/prog_noise.c',
-		'shader/prog_optimize.c',
-		'shader/prog_parameter.c',
-		'shader/prog_parameter_layout.c',
-		'shader/prog_print.c',
-		'shader/prog_statevars.c',
-		'shader/prog_uniform.c',
-		'shader/programopt.c',
-		'shader/symbol_table.c',
+	program_sources = [
+		'program/arbprogparse.c',
+		'program/hash_table.c',
+		'program/lex.yy.c',
+		'program/nvfragparse.c',
+		'program/nvvertparse.c',
+		'program/program.c',
+		'program/program_parse.tab.c',
+		'program/program_parse_extra.c',
+		'program/prog_cache.c',
+		'program/prog_execute.c',
+		'program/prog_instruction.c',
+		'program/prog_noise.c',
+		'program/prog_optimize.c',
+		'program/prog_parameter.c',
+		'program/prog_parameter_layout.c',
+		'program/prog_print.c',
+		'program/prog_statevars.c',
+		'program/prog_uniform.c',
+		'program/programopt.c',
+		'program/symbol_table.c',
 	]
 	
 	slang_sources = [
@@ -245,10 +245,10 @@ if env['platform'] != 'winddk':
 	mesa_sources = (
 		main_sources +
 		math_sources +
+		program_sources +
 		vbo_sources +
 		vf_sources +
 		statetracker_sources +
-		shader_sources +
 		slang_sources
 	)
 
@@ -327,7 +327,7 @@ if env['platform'] != 'winddk':
 		# build dir) to the include path  
 		env.Append(CPPPATH = [matypes[0].dir])
 
-	SConscript('shader/slang/library/SConscript')
+	SConscript('slang/library/SConscript')
 
 	#
 	# Libraries