From: Alex Deucher <alexdeucher@gmail.com>
Date: Wed, 1 Jul 2009 15:10:10 +0000 (-0400)
Subject: R6xx/R7xx: Fix number of temps used in fragment program
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=65cdf9c561c518a7e2c6b6584382fb2fb902ea40;p=mesa.git

R6xx/R7xx: Fix number of temps used in fragment program

Spotted by Cooper.  This gets hello, aargb, smooth, etc.
working.
---

diff --git a/src/mesa/drivers/dri/r600/r700_fragprog.c b/src/mesa/drivers/dri/r600/r700_fragprog.c
index 0eea2567d56..66070a7eec8 100644
--- a/src/mesa/drivers/dri/r600/r700_fragprog.c
+++ b/src/mesa/drivers/dri/r600/r700_fragprog.c
@@ -299,7 +299,7 @@ GLboolean r700SetupFragmentProgram(GLcontext * ctx)
 
     ui = (r700->SPI_PS_IN_CONTROL_0.u32All & NUM_INTERP_mask) / (1 << NUM_INTERP_shift);
 
-    ui = ui ? unNumOfReg : ui;
+    ui = (ui < unNumOfReg) ? unNumOfReg : ui;
 
     SETfield(r700->ps.SQ_PGM_RESOURCES_PS.u32All, ui, NUM_GPRS_shift, NUM_GPRS_mask);