From 3da9a24f35a80e4aa7df85530127d7a813daa5ea Mon Sep 17 00:00:00 2001 From: "Kristian H. Kristensen" Date: Mon, 3 Jun 2019 14:25:39 -0700 Subject: [PATCH] freedreno/a6xx: Use VALIDREG in next_regid() helper Reviewed-by: Rob Clark --- src/gallium/drivers/freedreno/a6xx/fd6_program.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.c b/src/gallium/drivers/freedreno/a6xx/fd6_program.c index c3345dc1636..2c982cc1afc 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_program.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.c @@ -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 next_regid(uint32_t reg, uint32_t increment) { - if (reg == regid(63,0)) - return regid(63,0); - else + if (VALIDREG(reg)) 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 setup_stateobj(struct fd_ringbuffer *ring, struct fd6_program_state *state, const struct ir3_shader_key *key, bool binning_pass) -- 2.30.2