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 0eea2567d56942685dbe4ec6dc04f806724151b3..66070a7eec818e3381a553e2adb4db72d3a637a7 100644 (file)
--- 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);