From: Paul Berry <stereotype441@gmail.com>
Date: Thu, 25 Aug 2011 01:57:32 +0000 (-0700)
Subject: i965: SF: Stop using nr_setup_attrs in compute_masks.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=58d9c95b3cb54383d07ca5560a1685fbe8588860;p=mesa.git

i965: SF: Stop using nr_setup_attrs in compute_masks.

Previously, the SF used nr_setup_attrs to determine whether it was
looking at the last element of the VUE.  Changed this code to use the
VUE map.

Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/mesa/drivers/dri/i965/brw_sf_emit.c b/src/mesa/drivers/dri/i965/brw_sf_emit.c
index 0532d4ee468..532d3272934 100644
--- a/src/mesa/drivers/dri/i965/brw_sf_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_sf_emit.c
@@ -358,7 +358,7 @@ static GLboolean calculate_masks( struct brw_sf_compile *c,
 
    /* Maybe only processs one attribute on the final round:
     */
-   if (reg*2+1 < c->nr_setup_attrs) {
+   if (vert_reg_to_vert_result(c, reg, 1) != BRW_VERT_RESULT_MAX) {
       *pc |= 0xf0;
 
       if (persp_mask & BITFIELD64_BIT(vert_reg_to_vert_result(c, reg, 1)))