freedreno/a6xx: Use VALIDREG in next_regid() helper

Reviewed-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Kristian H. Kristensen 2019-06-03 14:25:39 -07:00
parent 6fffc091e2
commit 3da9a24f35

View file

@ -300,18 +300,18 @@ setup_stages(struct fd6_program_state *state, struct stage *s, bool binning_pass
} }
} }
#define VALIDREG(r) ((r) != regid(63,0))
#define CONDREG(r, val) COND(VALIDREG(r), (val))
static inline uint32_t static inline uint32_t
next_regid(uint32_t reg, uint32_t increment) next_regid(uint32_t reg, uint32_t increment)
{ {
if (reg == regid(63,0)) if (VALIDREG(reg))
return regid(63,0);
else
return reg + increment; return reg + increment;
else
return regid(63,0);
} }
#define VALIDREG(r) ((r) != regid(63,0))
#define CONDREG(r, val) COND(VALIDREG(r), (val))
static void static void
setup_stateobj(struct fd_ringbuffer *ring, struct fd6_program_state *state, setup_stateobj(struct fd_ringbuffer *ring, struct fd6_program_state *state,
const struct ir3_shader_key *key, bool binning_pass) const struct ir3_shader_key *key, bool binning_pass)