Merge Mesa 23.1.9

1 files changed, 3 insertions, 16 deletions

diff --git a/lib/mesa/src/compiler/glsl/ir_optimization.h b/lib/mesa/src/compiler/glsl/ir_optimization.h
index e4b5e3911..8e56a84b8 100644
--- a/lib/mesa/src/compiler/glsl/ir_optimization.h
+++ b/lib/mesa/src/compiler/glsl/ir_optimization.h
@@ -41,16 +41,9 @@ bool do_common_optimization(exec_list *ir, bool linked,
                             const struct gl_shader_compiler_options *options,
                             bool native_integers);
 
-bool ir_constant_fold(ir_rvalue **rvalue);
-
 bool do_rebalance_tree(exec_list *instructions);
 bool do_algebraic(exec_list *instructions, bool native_integers,
                   const struct gl_shader_compiler_options *options);
-bool do_constant_folding(exec_list *instructions);
-bool do_constant_variable(exec_list *instructions);
-bool do_constant_variable_unlinked(exec_list *instructions);
-bool do_copy_propagation_elements(exec_list *instructions);
-bool do_constant_propagation(exec_list *instructions);
 bool do_dead_code(exec_list *instructions);
 bool do_dead_code_local(exec_list *instructions);
 bool do_dead_code_unlinked(exec_list *instructions);
@@ -66,21 +59,19 @@ bool do_tree_grafting(exec_list *instructions);
 bool do_vec_index_to_cond_assign(exec_list *instructions);
 bool lower_discard(exec_list *instructions);
 void lower_discard_flow(exec_list *instructions);
-bool lower_instructions(exec_list *instructions, bool have_ldexp,
-                        bool have_dfrexp, bool have_dround,
-                        bool force_abs_sqrt, bool have_gpu_shader5);
+bool lower_instructions(exec_list *instructions,
+                        bool have_dround,
+                        bool have_gpu_shader5);
 bool lower_clip_cull_distance(struct gl_shader_program *prog,
                               gl_linked_shader *shader);
 bool lower_packing_builtins(exec_list *instructions,
                             bool has_shading_language_packing,
                             bool has_gpu_shader5,
                             bool has_half_float_packing);
-bool lower_vector_insert(exec_list *instructions, bool lower_nonconstant_index);
 bool lower_vector_derefs(gl_linked_shader *shader);
 void lower_named_interface_blocks(void *mem_ctx, gl_linked_shader *shader);
 void optimize_dead_builtin_variables(exec_list *instructions,
                                      enum ir_variable_mode other);
-bool lower_tess_level(gl_linked_shader *shader);
 
 bool lower_blend_equation_advanced(gl_linked_shader *shader, bool coherent);
 
@@ -90,10 +81,6 @@ bool propagate_invariance(exec_list *instructions);
 
 namespace ir_builder { class ir_factory; };
 
-ir_variable *compare_index_block(ir_builder::ir_factory &body,
-                                 ir_variable *index,
-                                 unsigned base, unsigned components);
-
 bool lower_64bit_integer_instructions(exec_list *instructions,
                                       unsigned what_to_lower);