[Mesa-dev] [PATCH 20/30] i965/vec4: Pass single backend_shader argument to the vec4_live_variables constructor.

[Francisco Jerez]

The IR analysis framework requires the analysis result to be
constructible with a single argument.
---
 src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp | 7 +++----
 src/mesa/drivers/dri/i965/brw_vec4_live_variables.h   | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp b/src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp
index 7042371..297d027 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp
@@ -217,9 +217,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);
 
@@ -285,7 +284,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/mesa/drivers/dri/i965/brw_vec4_live_variables.h b/src/mesa/drivers/dri/i965/brw_vec4_live_variables.h
index f7a6932..7384f04 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_live_variables.h
+++ b/src/mesa/drivers/dri/i965/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.0