diff options
| author | Topi Pohjolainen <[email protected]> | 2014-02-15 10:26:09 +0200 |
|---|---|---|
| committer | Topi Pohjolainen <[email protected]> | 2014-03-05 10:13:57 +0200 |
| commit | 9b169a18939d1bde8db415a001b5c57259231546 (patch) | |
| tree | 771a74154686e5399af6bc8172108f171f10a308 /src/mesa/drivers | |
| parent | 8a9b4ade03095812d58f3053970d822941051b20 (diff) | |
i965/vec4: Mark invariant members as constants in vec4_visitor
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Signed-off-by: Topi Pohjolainen <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.h | 6 | ||||
| -rw-r--r-- | 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 d97c1039eb0..cb0586fdcbc 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 88ee929e27c..26122ccaa79 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -3363,7 +3363,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), @@ -3385,10 +3388,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, |