From: Nicolai Haehnle <nhaehnle@gmail.com>
Date: Fri, 11 Jul 2008 23:19:19 +0000 (+0200)
Subject: r300: Explicitly set absolute value for the argument of RSQ
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=11d711df360265f25dc5a96cc3a4c5a2d34f5b64;p=mesa.git

r300: Explicitly set absolute value for the argument of RSQ

This fixes the last r500 bug related to glean/fragProg1.
---

diff --git a/src/mesa/drivers/dri/r300/radeon_program_alu.c b/src/mesa/drivers/dri/r300/radeon_program_alu.c
index 8daa94c7268..f06ebfcdbf9 100644
--- a/src/mesa/drivers/dri/r300/radeon_program_alu.c
+++ b/src/mesa/drivers/dri/r300/radeon_program_alu.c
@@ -153,6 +153,7 @@ static struct prog_src_register absolute(struct prog_src_register reg)
 {
 	struct prog_src_register newreg = reg;
 	newreg.Abs = 1;
+	newreg.NegateBase = 0;
 	newreg.NegateAbs = 0;
 	return newreg;
 }
@@ -343,6 +344,12 @@ static void transform_POW(struct radeon_transform_context* t,
 	emit1(t->Program, OPCODE_EX2, inst->DstReg, tempsrc);
 }
 
+static void transform_RSQ(struct radeon_transform_context* t,
+	struct prog_instruction* inst)
+{
+	emit1(t->Program, OPCODE_RSQ, inst->DstReg, absolute(inst->SrcReg[0]));
+}
+
 static void transform_SGE(struct radeon_transform_context* t,
 	struct prog_instruction* inst)
 {
@@ -397,6 +404,9 @@ static void transform_XPD(struct radeon_transform_context* t,
  * using:
  *  MOV, ADD, MUL, MAD, FRC, DP3, LG2, EX2, CMP
  *
+ * Transforms RSQ to Radeon's native RSQ by explicitly setting
+ * absolute value.
+ *
  * @note should be applicable to R300 and R500 fragment programs.
  */
 GLboolean radeonTransformALU(struct radeon_transform_context* t,
@@ -411,6 +421,7 @@ GLboolean radeonTransformALU(struct radeon_transform_context* t,
 	case OPCODE_LIT: transform_LIT(t, inst); return GL_TRUE;
 	case OPCODE_LRP: transform_LRP(t, inst); return GL_TRUE;
 	case OPCODE_POW: transform_POW(t, inst); return GL_TRUE;
+	case OPCODE_RSQ: transform_RSQ(t, inst); return GL_TRUE;
 	case OPCODE_SGE: transform_SGE(t, inst); return GL_TRUE;
 	case OPCODE_SLT: transform_SLT(t, inst); return GL_TRUE;
 	case OPCODE_SUB: transform_SUB(t, inst); return GL_TRUE;