25 files changed, 47 insertions, 47 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 4cfecb130f2..62984f81c0a 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -30,55 +30,55 @@ CXX_SOURCES = \
 	glsl_types.cpp \
 	glsl_symbol_table.cpp \
 	hir_field_selection.cpp \
-	ir_algebraic.cpp \
 	ir_basic_block.cpp \
 	ir_clone.cpp \
 	ir_constant_expression.cpp \
-	ir_constant_folding.cpp \
-	ir_constant_propagation.cpp \
-	ir_constant_variable.cpp \
-	ir_copy_propagation.cpp \
 	ir.cpp \
-	ir_dead_code.cpp \
-	ir_dead_code_local.cpp \
-	ir_dead_functions.cpp \
-	ir_div_to_mul_rcp.cpp \
-	ir_explog_to_explog2.cpp \
 	ir_expression_flattening.cpp \
 	ir_function_can_inline.cpp \
 	ir_function.cpp \
-	ir_function_inlining.cpp \
 	ir_hierarchical_visitor.cpp \
 	ir_hv_accept.cpp \
-	ir_if_simplification.cpp \
-	ir_if_to_cond_assign.cpp \
 	ir_import_prototypes.cpp \
-	ir_lower_jumps.cpp \
-	ir_mat_op_to_vec.cpp \
-	ir_mod_to_fract.cpp \
-	ir_noop_swizzle.cpp \
 	ir_print_visitor.cpp \
 	ir_reader.cpp \
 	ir_rvalue_visitor.cpp \
 	ir_set_program_inouts.cpp \
-	ir_structure_splitting.cpp \
-	ir_sub_to_add_neg.cpp \
-	ir_swizzle_swizzle.cpp \
-	ir_tree_grafting.cpp \
 	ir_validate.cpp \
 	ir_variable.cpp \
 	ir_variable_refcount.cpp \
-	ir_vec_index_to_cond_assign.cpp \
-	ir_vec_index_to_swizzle.cpp \
 	linker.cpp \
 	link_functions.cpp \
 	loop_analysis.cpp \
 	loop_controls.cpp \
 	loop_unroll.cpp \
+	lower_div_to_mul_rcp.cpp \
+	lower_explog_to_explog2.cpp \
+	lower_if_to_cond_assign.cpp \
+	lower_jumps.cpp \
+	lower_mat_op_to_vec.cpp \
+	lower_mod_to_fract.cpp \
 	lower_noise.cpp \
+	lower_sub_to_add_neg.cpp \
 	lower_texture_projection.cpp \
 	lower_variable_index_to_cond_assign.cpp \
+	lower_vec_index_to_cond_assign.cpp \
+	lower_vec_index_to_swizzle.cpp \
+	opt_algebraic.cpp \
+	opt_constant_folding.cpp \
+	opt_constant_propagation.cpp \
+	opt_constant_variable.cpp \
+	opt_copy_propagation.cpp \
+	opt_dead_code.cpp \
+	opt_dead_code_local.cpp \
+	opt_dead_functions.cpp \
+	opt_function_inlining.cpp \
+	opt_if_simplification.cpp \
+	opt_noop_swizzle.cpp \
 	opt_redundant_jumps.cpp \
+	opt_structure_splitting.cpp \
+	opt_swizzle_swizzle.cpp \
+	opt_tree_grafting.cpp \
 	s_expression.cpp
 
 LIBS = \
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index c183e208d63..f9cc823a2d5 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -27,54 +27,54 @@ sources = [
     'glsl_types.cpp',
     'glsl_symbol_table.cpp',
     'hir_field_selection.cpp',
-    'ir_algebraic.cpp',
     'ir_basic_block.cpp',
     'ir_clone.cpp',
-    'ir_constant_expression.cpp',
-    'ir_constant_folding.cpp',
-    'ir_constant_propagation.cpp',
-    'ir_constant_variable.cpp',
-    'ir_copy_propagation.cpp',
     'ir.cpp',
-    'ir_dead_code.cpp',
-    'ir_dead_code_local.cpp',
-    'ir_dead_functions.cpp',
-    'ir_div_to_mul_rcp.cpp',
-    'ir_explog_to_explog2.cpp',
     'ir_expression_flattening.cpp',
     'ir_function_can_inline.cpp',
     'ir_function.cpp',
-    'ir_function_inlining.cpp',
     'ir_hierarchical_visitor.cpp',
     'ir_hv_accept.cpp',
-    'ir_if_simplification.cpp',
-    'ir_if_to_cond_assign.cpp',
     'ir_import_prototypes.cpp',
-    'ir_lower_jumps.cpp',
-    'ir_mat_op_to_vec.cpp',
-    'ir_mod_to_fract.cpp',
-    'ir_noop_swizzle.cpp',
     'ir_print_visitor.cpp',
     'ir_reader.cpp',
     'ir_rvalue_visitor.cpp',
     'ir_set_program_inouts.cpp',
-    'ir_structure_splitting.cpp',
-    'ir_sub_to_add_neg.cpp',
-    'ir_swizzle_swizzle.cpp',
-    'ir_tree_grafting.cpp',
     'ir_validate.cpp',
     'ir_variable.cpp',
     'ir_variable_refcount.cpp',
-    'ir_vec_index_to_cond_assign.cpp',
-    'ir_vec_index_to_swizzle.cpp',
     'linker.cpp',
     'link_functions.cpp',
     'loop_analysis.cpp',
     'loop_controls.cpp',
     'loop_unroll.cpp',
+    'lower_div_to_mul_rcp.cpp',
+    'lower_explog_to_explog2.cpp',
+    'lower_if_to_cond_assign.cpp',
+    'lower_jumps.cpp',
+    'lower_mat_op_to_vec.cpp',
+    'lower_mod_to_fract.cpp',
     'lower_noise.cpp',
+    'lower_sub_to_add_neg.cpp',
     'lower_variable_index_to_cond_assign.cpp',
+    'lower_vec_index_to_cond_assign.cpp',
+    'lower_vec_index_to_swizzle.cpp',
+    'opt_algebraic.cpp',
+    'opt_constant_folding.cpp',
+    'opt_noop_swizzle.cpp',
     'opt_redundant_jumps.cpp',
+    'opt_constant_expression.cpp',
+    'opt_constant_propagation.cpp',
+    'opt_constant_variable.cpp',
+    'opt_copy_propagation.cpp',
+    'opt_dead_code.cpp',
+    'opt_dead_code_local.cpp',
+    'opt_dead_functions.cpp',
+    'opt_function_inlining.cpp',
+    'opt_if_simplification.cpp',
+    'opt_structure_splitting.cpp',
+    'opt_swizzle_swizzle.cpp',
+    'opt_tree_grafting.cpp',
     's_expression.cpp',
 ]
 
diff --git a/src/glsl/ir_div_to_mul_rcp.cpp b/src/glsl/lower_div_to_mul_rcp.cpp
index 640d5d64f98..640d5d64f98 100644
--- a/src/glsl/ir_div_to_mul_rcp.cpp
+++ b/src/glsl/lower_div_to_mul_rcp.cpp
diff --git a/src/glsl/ir_explog_to_explog2.cpp b/src/glsl/lower_explog_to_explog2.cpp
index 78694a2029d..78694a2029d 100644
--- a/src/glsl/ir_explog_to_explog2.cpp
+++ b/src/glsl/lower_explog_to_explog2.cpp
diff --git a/src/glsl/ir_if_to_cond_assign.cpp b/src/glsl/lower_if_to_cond_assign.cpp
index 0b87413941a..0b87413941a 100644
--- a/src/glsl/ir_if_to_cond_assign.cpp
+++ b/src/glsl/lower_if_to_cond_assign.cpp
diff --git a/src/glsl/ir_lower_jumps.cpp b/src/glsl/lower_jumps.cpp
index b69cc1ec315..b69cc1ec315 100644
--- a/src/glsl/ir_lower_jumps.cpp
+++ b/src/glsl/lower_jumps.cpp
diff --git a/src/glsl/ir_mat_op_to_vec.cpp b/src/glsl/lower_mat_op_to_vec.cpp
index 244fe489280..244fe489280 100644
--- a/src/glsl/ir_mat_op_to_vec.cpp
+++ b/src/glsl/lower_mat_op_to_vec.cpp
diff --git a/src/glsl/ir_mod_to_fract.cpp b/src/glsl/lower_mod_to_fract.cpp
index c82a1f64fdd..c82a1f64fdd 100644
--- a/src/glsl/ir_mod_to_fract.cpp
+++ b/src/glsl/lower_mod_to_fract.cpp
diff --git a/src/glsl/ir_sub_to_add_neg.cpp b/src/glsl/lower_sub_to_add_neg.cpp
index 7ed8c1495e3..7ed8c1495e3 100644
--- a/src/glsl/ir_sub_to_add_neg.cpp
+++ b/src/glsl/lower_sub_to_add_neg.cpp
diff --git a/src/glsl/ir_vec_index_to_cond_assign.cpp b/src/glsl/lower_vec_index_to_cond_assign.cpp
index cd8dedf2fe1..cd8dedf2fe1 100644
--- a/src/glsl/ir_vec_index_to_cond_assign.cpp
+++ b/src/glsl/lower_vec_index_to_cond_assign.cpp
diff --git a/src/glsl/ir_vec_index_to_swizzle.cpp b/src/glsl/lower_vec_index_to_swizzle.cpp
index 969dc8f94a2..969dc8f94a2 100644
--- a/src/glsl/ir_vec_index_to_swizzle.cpp
+++ b/src/glsl/lower_vec_index_to_swizzle.cpp
diff --git a/src/glsl/ir_algebraic.cpp b/src/glsl/opt_algebraic.cpp
index 2ed66db4765..2ed66db4765 100644
--- a/src/glsl/ir_algebraic.cpp
+++ b/src/glsl/opt_algebraic.cpp
diff --git a/src/glsl/ir_constant_folding.cpp b/src/glsl/opt_constant_folding.cpp
index 554c54fae3a..554c54fae3a 100644
--- a/src/glsl/ir_constant_folding.cpp
+++ b/src/glsl/opt_constant_folding.cpp
diff --git a/src/glsl/ir_constant_propagation.cpp b/src/glsl/opt_constant_propagation.cpp
index 5d875b7be00..5d875b7be00 100644
--- a/src/glsl/ir_constant_propagation.cpp
+++ b/src/glsl/opt_constant_propagation.cpp
diff --git a/src/glsl/ir_constant_variable.cpp b/src/glsl/opt_constant_variable.cpp
index 1fb73e765e1..1fb73e765e1 100644
--- a/src/glsl/ir_constant_variable.cpp
+++ b/src/glsl/opt_constant_variable.cpp
diff --git a/src/glsl/ir_copy_propagation.cpp b/src/glsl/opt_copy_propagation.cpp
index 0fe8fa6c419..0fe8fa6c419 100644
--- a/src/glsl/ir_copy_propagation.cpp
+++ b/src/glsl/opt_copy_propagation.cpp
diff --git a/src/glsl/ir_dead_code.cpp b/src/glsl/opt_dead_code.cpp
index 5cf5e99add4..5cf5e99add4 100644
--- a/src/glsl/ir_dead_code.cpp
+++ b/src/glsl/opt_dead_code.cpp
diff --git a/src/glsl/ir_dead_code_local.cpp b/src/glsl/opt_dead_code_local.cpp
index 4bbedf0ff94..4bbedf0ff94 100644
--- a/src/glsl/ir_dead_code_local.cpp
+++ b/src/glsl/opt_dead_code_local.cpp
diff --git a/src/glsl/ir_dead_functions.cpp b/src/glsl/opt_dead_functions.cpp
index 16037a2632d..16037a2632d 100644
--- a/src/glsl/ir_dead_functions.cpp
+++ b/src/glsl/opt_dead_functions.cpp
diff --git a/src/glsl/ir_function_inlining.cpp b/src/glsl/opt_function_inlining.cpp
index 147c1824c1a..147c1824c1a 100644
--- a/src/glsl/ir_function_inlining.cpp
+++ b/src/glsl/opt_function_inlining.cpp
diff --git a/src/glsl/ir_if_simplification.cpp b/src/glsl/opt_if_simplification.cpp
index 021615ebd12..021615ebd12 100644
--- a/src/glsl/ir_if_simplification.cpp
+++ b/src/glsl/opt_if_simplification.cpp
diff --git a/src/glsl/ir_noop_swizzle.cpp b/src/glsl/opt_noop_swizzle.cpp
index 0403dfa4e93..0403dfa4e93 100644
--- a/src/glsl/ir_noop_swizzle.cpp
+++ b/src/glsl/opt_noop_swizzle.cpp
diff --git a/src/glsl/ir_structure_splitting.cpp b/src/glsl/opt_structure_splitting.cpp
index ff3ec936eb8..ff3ec936eb8 100644
--- a/src/glsl/ir_structure_splitting.cpp
+++ b/src/glsl/opt_structure_splitting.cpp
diff --git a/src/glsl/ir_swizzle_swizzle.cpp b/src/glsl/opt_swizzle_swizzle.cpp
index 0ffb4fa3133..0ffb4fa3133 100644
--- a/src/glsl/ir_swizzle_swizzle.cpp
+++ b/src/glsl/opt_swizzle_swizzle.cpp
diff --git a/src/glsl/ir_tree_grafting.cpp b/src/glsl/opt_tree_grafting.cpp
index 9b569b8284f..9b569b8284f 100644
--- a/src/glsl/ir_tree_grafting.cpp
+++ b/src/glsl/opt_tree_grafting.cpp