From ba6e1514f590320e60962e34d45df83488e9d463 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Mon, 22 Jun 2020 08:46:35 -0700 Subject: [PATCH] freedreno/a4xx: use point-coord helper Signed-off-by: Rob Clark Part-of: --- .../drivers/freedreno/a4xx/fd4_program.c | 58 ++++++++----------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_program.c b/src/gallium/drivers/freedreno/a4xx/fd4_program.c index c4c5b03e7a0..29d4dad70ed 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_program.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_program.c @@ -463,40 +463,32 @@ fd4_program_emit(struct fd_ringbuffer *ring, struct fd4_emit *emit, } } - gl_varying_slot slot = s[FS].v->inputs[j].slot; - - /* since we don't enable PIPE_CAP_TGSI_TEXCOORD: */ - if (slot >= VARYING_SLOT_VAR0) { - unsigned texmask = 1 << (slot - VARYING_SLOT_VAR0); - /* Replace the .xy coordinates with S/T from the point sprite. Set - * interpolation bits for .zw such that they become .01 + bool coord_mode = emit->sprite_coord_mode; + if (ir3_point_sprite(s[FS].v, j, emit->sprite_coord_enable, &coord_mode)) { + /* mask is two 2-bit fields, where: + * '01' -> S + * '10' -> T + * '11' -> 1 - T (flip mode) */ - if (emit->sprite_coord_enable & texmask) { - /* mask is two 2-bit fields, where: - * '01' -> S - * '10' -> T - * '11' -> 1 - T (flip mode) - */ - unsigned mask = emit->sprite_coord_mode ? 0b1101 : 0b1001; - uint32_t loc = inloc; - if (compmask & 0x1) { - vpsrepl[loc / 16] |= ((mask >> 0) & 0x3) << ((loc % 16) * 2); - loc++; - } - if (compmask & 0x2) { - vpsrepl[loc / 16] |= ((mask >> 2) & 0x3) << ((loc % 16) * 2); - loc++; - } - if (compmask & 0x4) { - /* .z <- 0.0f */ - vinterp[loc / 16] |= 0b10 << ((loc % 16) * 2); - loc++; - } - if (compmask & 0x8) { - /* .w <- 1.0f */ - vinterp[loc / 16] |= 0b11 << ((loc % 16) * 2); - loc++; - } + unsigned mask = coord_mode ? 0b1101 : 0b1001; + uint32_t loc = inloc; + if (compmask & 0x1) { + vpsrepl[loc / 16] |= ((mask >> 0) & 0x3) << ((loc % 16) * 2); + loc++; + } + if (compmask & 0x2) { + vpsrepl[loc / 16] |= ((mask >> 2) & 0x3) << ((loc % 16) * 2); + loc++; + } + if (compmask & 0x4) { + /* .z <- 0.0f */ + vinterp[loc / 16] |= 0b10 << ((loc % 16) * 2); + loc++; + } + if (compmask & 0x8) { + /* .w <- 1.0f */ + vinterp[loc / 16] |= 0b11 << ((loc % 16) * 2); + loc++; } } } -- 2.30.2