Mesa (master): freedreno/a6xx: use point-coord helper

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a474d48e1764a5251e1a47e1a34424c28d8ecfa0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a474d48e1764a5251e1a47e1a34424c28d8ecfa0

Author: Rob Clark <robdclark at chromium.org>
Date:   Mon Jun 22 08:43:17 2020 -0700

freedreno/a6xx: use point-coord helper

Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5595>

---

 src/gallium/drivers/freedreno/a6xx/fd6_program.c | 58 ++++++++++--------------
 1 file changed, 25 insertions(+), 33 deletions(-)

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.c b/src/gallium/drivers/freedreno/a6xx/fd6_program.c
index 7b2ec2388c7..90bca744cc3 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_program.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.c
@@ -923,40 +923,32 @@ emit_interp_state(struct fd_ringbuffer *ring, struct ir3_shader_variant *fs,
 			}
 		}
 
-		gl_varying_slot slot = fs->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 = sprite_coord_mode;
+		if (ir3_point_sprite(fs, j, sprite_coord_enable, &coord_mode)) {
+			/* mask is two 2-bit fields, where:
+			 *   '01' -> S
+			 *   '10' -> T
+			 *   '11' -> 1 - T  (flip mode)
 			 */
-			if (sprite_coord_enable & texmask) {
-				/* mask is two 2-bit fields, where:
-				 *   '01' -> S
-				 *   '10' -> T
-				 *   '11' -> 1 - T  (flip mode)
-				 */
-				unsigned mask = 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++;
 			}
 		}
 	}