Mesa (i965g-restart): i965g: make the load-before-use vs immediate path work

[Keith Whitwell]

Module: Mesa
Branch: i965g-restart
Commit: 9e4f3eaf6630e0d3a9b05da90e4879a94516b974
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e4f3eaf6630e0d3a9b05da90e4879a94516b974

Author: Keith Whitwell <keithw at vmware.com>
Date:   Thu Nov 19 15:04:00 2009 -0800

i965g: make the load-before-use vs immediate path work

---

 src/gallium/drivers/i965/brw_vs_emit.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/i965/brw_vs_emit.c b/src/gallium/drivers/i965/brw_vs_emit.c
index bcaeaca..52d4731 100644
--- a/src/gallium/drivers/i965/brw_vs_emit.c
+++ b/src/gallium/drivers/i965/brw_vs_emit.c
@@ -202,7 +202,8 @@ static void brw_vs_alloc_regs( struct brw_vs_compile *c )
       struct brw_reg r;
       int j;
 
-      r = brw_vec8_grf(reg, 0);
+      c->regs[TGSI_FILE_IMMEDIATE][i] = 
+         r = brw_vec8_grf(reg, 0);
 
       for (j = 0; j < 4; j++) {
 	 brw_MOV(&c->func, 
@@ -1628,7 +1629,7 @@ void brw_vs_emit(struct brw_vs_compile *c)
 
       case TGSI_TOKEN_TYPE_IMMEDIATE: {
 	 static const float id[4] = {0,0,0,1};
-	 const float *imm = &parse.FullToken.FullImmediate.u[i].Float;
+	 const float *imm = &parse.FullToken.FullImmediate.u[0].Float;
 	 unsigned size = parse.FullToken.FullImmediate.Immediate.NrTokens - 1;
 
 	 for (i = 0; i < size; i++)