[Mesa-dev] [PATCH 15/30] i965/ir: Mark virtual_grf_interferes and vars_interfere as const.

[Francisco Jerez]

---
 src/mesa/drivers/dri/i965/brw_fs.h                    | 2 +-
 src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp   | 4 ++--
 src/mesa/drivers/dri/i965/brw_fs_live_variables.h     | 2 +-
 src/mesa/drivers/dri/i965/brw_vec4.h                  | 2 +-
 src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index e47a8e5..4f5d085 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -162,7 +162,7 @@ public:
    bool remove_duplicate_mrf_writes();
 
    bool opt_sampler_eot();
-   bool virtual_grf_interferes(int a, int b);
+   bool virtual_grf_interferes(int a, int b) const;
    void schedule_instructions(instruction_scheduler_mode mode);
    void insert_gen4_send_dependency_workarounds();
    void insert_gen4_pre_send_dependency_workarounds(bblock_t *block,
diff --git a/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp b/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
index 4ebefe4..676619a 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
@@ -333,14 +333,14 @@ fs_visitor::calculate_live_intervals()
 }
 
 bool
-fs_live_variables::vars_interfere(int a, int b)
+fs_live_variables::vars_interfere(int a, int b) const
 {
    return !(end[b] <= start[a] ||
             end[a] <= start[b]);
 }
 
 bool
-fs_visitor::virtual_grf_interferes(int a, int b)
+fs_visitor::virtual_grf_interferes(int a, int b) const
 {
    return !(virtual_grf_end[a] <= virtual_grf_start[b] ||
             virtual_grf_end[b] <= virtual_grf_start[a]);
diff --git a/src/mesa/drivers/dri/i965/brw_fs_live_variables.h b/src/mesa/drivers/dri/i965/brw_fs_live_variables.h
index 6b49cfc..fb5aee7 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_live_variables.h
+++ b/src/mesa/drivers/dri/i965/brw_fs_live_variables.h
@@ -69,7 +69,7 @@ public:
    fs_live_variables(fs_visitor *v, const cfg_t *cfg);
    ~fs_live_variables();
 
-   bool vars_interfere(int a, int b);
+   bool vars_interfere(int a, int b) const;
    int var_from_reg(const fs_reg &reg) const
    {
       return var_from_vgrf[reg.nr] + reg.reg_offset;
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h
index c3f9ca5..bb0329f0 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4.h
@@ -143,7 +143,7 @@ public:
    bool dead_code_eliminate();
    int var_range_start(unsigned v, unsigned n) const;
    int var_range_end(unsigned v, unsigned n) const;
-   bool virtual_grf_interferes(int a, int b);
+   bool virtual_grf_interferes(int a, int b) const;
    bool opt_cmod_propagation();
    bool opt_copy_propagation(bool do_constant_prop = true);
    bool opt_cse_local(bblock_t *block);
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 8e1efa4..ecf5dee 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp
@@ -339,7 +339,7 @@ vec4_visitor::var_range_end(unsigned v, unsigned n) const
 }
 
 bool
-vec4_visitor::virtual_grf_interferes(int a, int b)
+vec4_visitor::virtual_grf_interferes(int a, int b) const
 {
    return !((var_range_end(4 * alloc.offsets[a], 4 * alloc.sizes[a]) <=
              var_range_start(4 * alloc.offsets[b], 4 * alloc.sizes[b])) ||
-- 
2.7.0