[Mesa-dev] [PATCH 11/14] i965/fs: Reduce scope for the visitor

[Topi Pohjolainen]

Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
---
 src/mesa/drivers/dri/i965/brw_fs.cpp | 4 ++--
 src/mesa/drivers/dri/i965/brw_fs.h   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 90aca4f..c971480 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -823,12 +823,12 @@ fs_reg::fs_reg(enum register_file file, int reg, uint32_t type)
 }
 
 /** Automatic reg constructor. */
-fs_reg::fs_reg(class fs_visitor *v, const struct glsl_type *type)
+fs_reg::fs_reg(backend_emitter *e, const struct glsl_type *type)
 {
    init();
 
    this->file = GRF;
-   this->reg = v->virtual_grf_alloc(v->type_size(type));
+   this->reg = e->virtual_grf_alloc(e->type_size(type));
    this->reg_offset = 0;
    this->type = brw_type_for_base_type(type);
 }
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index 36bb7bf..67dce1e 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -76,7 +76,7 @@ public:
    fs_reg(struct brw_reg fixed_hw_reg);
    fs_reg(enum register_file file, int reg);
    fs_reg(enum register_file file, int reg, uint32_t type);
-   fs_reg(class fs_visitor *v, const struct glsl_type *type);
+   fs_reg(backend_emitter *e, const struct glsl_type *type);
 
    bool equals(const fs_reg &r) const;
    bool is_zero() const;
@@ -184,6 +184,8 @@ public:
    int ip;
 };
 
+class fs_visitor;
+
 class fs_inst : public backend_instruction {
 public:
    DECLARE_RALLOC_CXX_OPERATORS(fs_inst)
-- 
1.8.3.1