From: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Date: Thu, 24 Sep 2009 15:24:48 +0000 (+0200)
Subject: nv50: RCP and RSQ cannot load from VP inputs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=001daf78c87b2d194b51bc650bf9f917d4224e31;p=mesa.git

nv50: RCP and RSQ cannot load from VP inputs
---

diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c
index 2ad8cdf65c3..272fd8d90ba 100644
--- a/src/gallium/drivers/nv50/nv50_program.c
+++ b/src/gallium/drivers/nv50/nv50_program.c
@@ -573,6 +573,22 @@ check_swap_src_0_1(struct nv50_pc *pc,
 	return FALSE;
 }
 
+static void
+set_src_0_restricted(struct nv50_pc *pc, struct nv50_reg *src,
+		     struct nv50_program_exec *e)
+{
+	struct nv50_reg *temp;
+
+	if (src->type != P_TEMP) {
+		temp = temp_temp(pc);
+		emit_mov(pc, temp, src);
+		src = temp;
+	}
+
+	alloc_reg(pc, src);
+	e->inst[0] |= (src->hw << 9);
+}
+
 static void
 set_src_0(struct nv50_pc *pc, struct nv50_reg *src, struct nv50_program_exec *e)
 {
@@ -775,7 +791,11 @@ emit_flop(struct nv50_pc *pc, unsigned sub,
 	}
 
 	set_dst(pc, dst, e);
-	set_src_0(pc, src, e);
+
+	if (sub == 0 || sub == 2)
+		set_src_0_restricted(pc, src, e);
+	else
+		set_src_0(pc, src, e);
 
 	emit(pc, e);
 }