From: Eric Anholt <eric@anholt.net>
Date: Tue, 9 Aug 2011 22:08:47 +0000 (-0700)
Subject: i965/vs: Fix access of attribute arrays.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a55fbbc1a2b579aed1e80036367b521ef6928f66;p=mesa.git

i965/vs: Fix access of attribute arrays.

By leaving out the column index, we were reading an unallocated
attribute on glsl-mat-attribute.
---

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
index df9521cd04e..517a3e3c75b 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
@@ -52,8 +52,9 @@ vec4_visitor::setup_attributes(int payload_reg)
 	 if (inst->src[i].file != ATTR)
 	    continue;
 
+	 int grf = attribute_map[inst->src[i].reg + inst->src[i].reg_offset];
 	 inst->src[i].file = HW_REG;
-	 inst->src[i].fixed_hw_reg = brw_vec8_grf(attribute_map[inst->src[i].reg], 0);
+	 inst->src[i].fixed_hw_reg = brw_vec8_grf(grf, 0);
 	 inst->src[i].fixed_hw_reg.dw1.bits.swizzle = inst->src[i].swizzle;
       }
    }