From: Ben Skeggs <skeggsb@gmail.com>
Date: Mon, 16 Jun 2008 02:55:53 +0000 (+1000)
Subject: nv50: a couple more bits'n'pieces
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fea0b1651677444fc6c135e1a4b8ab6463a9fdf9;p=mesa.git

nv50: a couple more bits'n'pieces
---

diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c
index 845fc611905..2fe60ad51ff 100644
--- a/src/gallium/drivers/nv50/nv50_program.c
+++ b/src/gallium/drivers/nv50/nv50_program.c
@@ -93,6 +93,11 @@ alloc_reg(struct nv50_pc *pc, struct nv50_reg *reg)
 {
 	int i;
 
+	if (reg->type == P_RESULT) {
+		if (pc->p->cfg.high_result < (reg->hw + 1))
+			pc->p->cfg.high_result = reg->hw + 1;
+	}
+
 	if (reg->type != P_TEMP)
 		return;
 
@@ -1558,6 +1563,8 @@ nv50_vertprog_validate(struct nv50_context *nv50)
 	so_method(so, tesla, 0x1650, 2);
 	so_data  (so, p->cfg.vp.attr[0]);
 	so_data  (so, p->cfg.vp.attr[1]);
+	so_method(so, tesla, 0x16b8, 1);
+	so_data  (so, p->cfg.high_result);
 	so_method(so, tesla, 0x16ac, 2);
 	so_data  (so, 8);
 	so_data  (so, p->cfg.high_temp);
@@ -1594,9 +1601,10 @@ nv50_fragprog_validate(struct nv50_context *nv50)
 	so_data  (so, 0x00000004);
 	so_data  (so, 0x00000000);
 	so_data  (so, 0x00000000);
-	so_method(so, tesla, 0x16bc, 2); /*XXX: fixme */
+	so_method(so, tesla, 0x16bc, 3); /*XXX: fixme */
 	so_data  (so, 0x03020100);
 	so_data  (so, 0x07060504);
+	so_data  (so, 0x0b0a0908);
 	so_method(so, tesla, 0x1988, 2);
 	so_data  (so, 0x08040404); /* p: 0x0f000401 */
 	so_data  (so, p->cfg.high_temp);
diff --git a/src/gallium/drivers/nv50/nv50_program.h b/src/gallium/drivers/nv50/nv50_program.h
index d143ae97979..d643e8db218 100644
--- a/src/gallium/drivers/nv50/nv50_program.h
+++ b/src/gallium/drivers/nv50/nv50_program.h
@@ -35,6 +35,7 @@ struct nv50_program {
 
 	struct {
 		unsigned high_temp;
+		unsigned high_result;
 		struct {
 			unsigned attr[2];
 		} vp;