From a9cdc14f602144620c664f7f42ea2ba0eeb58720 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Sun, 13 Mar 2016 16:41:45 -0700 Subject: [PATCH] intel/compiler: Pass single backend_shader argument to the vec4_live_variables constructor The IR analysis framework requires the analysis result to be constructible with a single argument. Reviewed-by: Matt Turner Part-of: --- src/intel/compiler/brw_vec4_live_variables.cpp | 7 +++---- src/intel/compiler/brw_vec4_live_variables.h | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/intel/compiler/brw_vec4_live_variables.cpp b/src/intel/compiler/brw_vec4_live_variables.cpp index c2c66f7..200e41c 100644 --- a/src/intel/compiler/brw_vec4_live_variables.cpp +++ b/src/intel/compiler/brw_vec4_live_variables.cpp @@ -215,9 +215,8 @@ vec4_live_variables::compute_start_end() } } -vec4_live_variables::vec4_live_variables(const simple_allocator &alloc, - cfg_t *cfg) - : alloc(alloc), cfg(cfg) +vec4_live_variables::vec4_live_variables(const backend_shader *s) + : alloc(s->alloc), cfg(s->cfg) { mem_ctx = ralloc_context(NULL); @@ -282,7 +281,7 @@ vec4_visitor::calculate_live_intervals() * The control flow-aware analysis was done at a channel level, while at * this point we're distilling it down to vgrfs. */ - this->live_intervals = new(mem_ctx) vec4_live_variables(alloc, cfg); + this->live_intervals = new(mem_ctx) vec4_live_variables(this); } void diff --git a/src/intel/compiler/brw_vec4_live_variables.h b/src/intel/compiler/brw_vec4_live_variables.h index fab23ab..e2081e0 100644 --- a/src/intel/compiler/brw_vec4_live_variables.h +++ b/src/intel/compiler/brw_vec4_live_variables.h @@ -31,6 +31,8 @@ #include "brw_ir_vec4.h" #include "util/bitset.h" +struct backend_shader; + namespace brw { class vec4_live_variables { @@ -63,7 +65,7 @@ public: DECLARE_RALLOC_CXX_OPERATORS(vec4_live_variables) - vec4_live_variables(const simple_allocator &alloc, cfg_t *cfg); + vec4_live_variables(const backend_shader *s); ~vec4_live_variables(); int num_vars; -- 2.7.4