[Mesa-dev] [RFC 03/27] i965/vec4: Mark invariant members as constants in vec4_visitor

[Ian Romanick]

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

On 02/22/2014 01:05 AM, Topi Pohjolainen wrote:
> Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
> ---
>   src/mesa/drivers/dri/i965/brw_vec4.h           | 6 +++---
>   src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 8 ++++----
>   2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h
> index 1e0d882..a79a289 100644
> --- a/src/mesa/drivers/dri/i965/brw_vec4.h
> +++ b/src/mesa/drivers/dri/i965/brw_vec4.h
> @@ -311,9 +311,9 @@ public:
>         return dst_reg(retype(brw_null_reg(), BRW_REGISTER_TYPE_UD));
>      }
>
> -   struct brw_vec4_compile *c;
> -   const struct brw_vec4_prog_key *key;
> -   struct brw_vec4_prog_data *prog_data;
> +   struct brw_vec4_compile * const c;
> +   const struct brw_vec4_prog_key * const key;
> +   struct brw_vec4_prog_data * const prog_data;
>      unsigned int sanity_param_count;
>
>      char *fail_msg;
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
> index ba299be..c11c514 100644
> --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
> @@ -3315,7 +3315,10 @@ vec4_visitor::vec4_visitor(struct brw_context *brw,
>                              shader_time_shader_type st_base,
>                              shader_time_shader_type st_written,
>                              shader_time_shader_type st_reset)
> -   : sanity_param_count(0),
> +   : c(c),
> +     key(key),
> +     prog_data(prog_data),
> +     sanity_param_count(0),
>        fail_msg(NULL),
>        first_non_payload_grf(0),
>        need_all_constants_in_pull_buffer(false),
> @@ -3337,10 +3340,7 @@ vec4_visitor::vec4_visitor(struct brw_context *brw,
>      this->current_annotation = NULL;
>      memset(this->output_reg_annotation, 0, sizeof(this->output_reg_annotation));
>
> -   this->c = c;
>      this->prog = prog;
> -   this->key = key;
> -   this->prog_data = prog_data;
>      this->stage_prog_data = &prog_data->base;
>
>      this->variable_ht = hash_table_ctor(0,
>