Reviewed-by: Iago Toral Quiroga <ito...@igalia.com>
On Wed, 2015-11-04 at 15:33 -0800, Kristian Høgsberg Kristensen wrote:
> We always pass in shader->ir and we already pass in the shader, so just
> drop the exec_list. Most passes either take just a exec_list or a
> shader, so this seems more consistent.
>
> Signed-off-by: Kristian Høgsberg Kristensen <k...@bitplanet.net>
> ---
> src/glsl/ir_optimization.h | 2 +-
> src/glsl/lower_ubo_reference.cpp | 4 ++--
> src/mesa/drivers/dri/i965/brw_link.cpp | 2 +-
> src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/glsl/ir_optimization.h b/src/glsl/ir_optimization.h
> index ce5c492..6d19a6c 100644
> --- a/src/glsl/ir_optimization.h
> +++ b/src/glsl/ir_optimization.h
> @@ -124,7 +124,7 @@ bool lower_const_arrays_to_uniforms(exec_list
> *instructions);
> bool lower_clip_distance(gl_shader *shader);
> void lower_output_reads(unsigned stage, exec_list *instructions);
> bool lower_packing_builtins(exec_list *instructions, int op_mask);
> -void lower_ubo_reference(struct gl_shader *shader, exec_list *instructions);
> +void lower_ubo_reference(struct gl_shader *shader);
> void lower_packed_varyings(void *mem_ctx,
> unsigned locations_used, ir_variable_mode mode,
> unsigned gs_input_vertices, gl_shader *shader);
> diff --git a/src/glsl/lower_ubo_reference.cpp
> b/src/glsl/lower_ubo_reference.cpp
> index 57a242b..24806ac 100644
> --- a/src/glsl/lower_ubo_reference.cpp
> +++ b/src/glsl/lower_ubo_reference.cpp
> @@ -1270,7 +1270,7 @@ lower_ubo_reference_visitor::visit_enter(ir_call *ir)
> } /* unnamed namespace */
>
> void
> -lower_ubo_reference(struct gl_shader *shader, exec_list *instructions)
> +lower_ubo_reference(struct gl_shader *shader)
> {
> lower_ubo_reference_visitor v(shader);
>
> @@ -1281,6 +1281,6 @@ lower_ubo_reference(struct gl_shader *shader, exec_list
> *instructions)
> */
> do {
> v.progress = false;
> - visit_list_elements(&v, instructions);
> + visit_list_elements(&v, shader->ir);
> } while (v.progress);
> }
> diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp
> b/src/mesa/drivers/dri/i965/brw_link.cpp
> index fc9bee4..f1e3860 100644
> --- a/src/mesa/drivers/dri/i965/brw_link.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_link.cpp
> @@ -157,7 +157,7 @@ process_glsl_ir(gl_shader_stage stage,
> _mesa_shader_stage_to_abbrev(shader->Stage));
> }
>
> - lower_ubo_reference(shader, shader->ir);
> + lower_ubo_reference(shader);
>
> bool progress;
> do {
> diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> index f481e89..ca00930 100644
> --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> @@ -5822,7 +5822,7 @@ st_link_shader(struct gl_context *ctx, struct
> gl_shader_program *prog)
> (!ctx->Const.NativeIntegers ? INT_DIV_TO_MUL_RCP :
> 0) |
> (options->EmitNoSat ? SAT_TO_CLAMP : 0));
>
> - lower_ubo_reference(prog->_LinkedShaders[i], ir);
> + lower_ubo_reference(prog->_LinkedShaders[i]);
> do_vec_index_to_cond_assign(ir);
> lower_vector_insert(ir, true);
> lower_quadop_vector(ir, false);
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
