From c7ed5d1d1ca5d0e537cd5eb2cc8d4cae7ae73564 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 24 Oct 2015 14:32:03 -0700 Subject: [PATCH] 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 Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_shader.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; -- 2.7.4