From 84e7d04e1d2ac9621c5fbb0f878164e7c16d2cf7 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Wed, 24 Aug 2011 15:48:55 -0700 Subject: [PATCH] i965: SF: Change calculate_masks to use the VUE map. Previously, SF code used the idx_to_attr[] array to compute the location of entries in the VUE map. This array didn't properly account for gl_PointSize. Now we use the VUE map directly. Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_sf_emit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_sf_emit.c b/src/mesa/drivers/dri/i965/brw_sf_emit.c index 28448fb4c05..0532d4ee468 100644 --- a/src/mesa/drivers/dri/i965/brw_sf_emit.c +++ b/src/mesa/drivers/dri/i965/brw_sf_emit.c @@ -350,10 +350,10 @@ static GLboolean calculate_masks( struct brw_sf_compile *c, *pc_linear = 0; *pc = 0xf; - if (persp_mask & BITFIELD64_BIT(c->idx_to_attr[reg*2])) + if (persp_mask & BITFIELD64_BIT(vert_reg_to_vert_result(c, reg, 0))) *pc_persp = 0xf; - if (linear_mask & BITFIELD64_BIT(c->idx_to_attr[reg*2])) + if (linear_mask & BITFIELD64_BIT(vert_reg_to_vert_result(c, reg, 0))) *pc_linear = 0xf; /* Maybe only processs one attribute on the final round: @@ -361,10 +361,10 @@ static GLboolean calculate_masks( struct brw_sf_compile *c, if (reg*2+1 < c->nr_setup_attrs) { *pc |= 0xf0; - if (persp_mask & BITFIELD64_BIT(c->idx_to_attr[reg*2+1])) + if (persp_mask & BITFIELD64_BIT(vert_reg_to_vert_result(c, reg, 1))) *pc_persp |= 0xf0; - if (linear_mask & BITFIELD64_BIT(c->idx_to_attr[reg*2+1])) + if (linear_mask & BITFIELD64_BIT(vert_reg_to_vert_result(c, reg, 1))) *pc_linear |= 0xf0; } -- 2.30.2