From: Matt Turner <mattst88@gmail.com>
Date: Sat, 24 Oct 2015 21:32:03 +0000 (-0700)
Subject: i965: Make backend_reg inherit from brw_reg.
X-Git-Tag: upstream/17.1.0~14628
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7ed5d1d1ca5d0e537cd5eb2cc8d4cae7ae73564;p=platform%2Fupstream%2Fmesa.git

i965: Make backend_reg inherit from brw_reg.

Some fields (file, type, abs, negate) in brw_reg are shadowed by
backend_reg.

Reviewed-by: Emil Velikov <emil.velikov@collabora.co.uk>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h
index 29baebf..e1e89dd 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.h
+++ b/src/mesa/drivers/dri/i965/brw_shader.h
@@ -48,16 +48,15 @@ enum PACKED register_file {
    UNIFORM, /* prog_data->params[reg] */
 };
 
-struct backend_reg
-{
 #ifdef __cplusplus
+struct backend_reg : public brw_reg
+{
    bool is_zero() const;
    bool is_one() const;
    bool is_negative_one() const;
    bool is_null() const;
    bool is_accumulator() const;
    bool in_range(const backend_reg &r, unsigned n) const;
-#endif
 
    enum register_file file; /**< Register file: GRF, MRF, IMM. */
    enum brw_reg_type type;  /**< Register type: BRW_REGISTER_TYPE_* */
@@ -87,6 +86,7 @@ struct backend_reg
    bool negate;
    bool abs;
 };
+#endif
 
 struct cfg_t;
 struct bblock_t;