summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-07-01 11:10:10 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-07-01 11:10:10 -0400
commit65cdf9c561c518a7e2c6b6584382fb2fb902ea40 (patch)
tree755513c173a85b36c7cfa8dc3563323b2761e16f /src
parentd10006e67fb070f846213ef38e07df21699df5a1 (diff)
R6xx/R7xx: Fix number of temps used in fragment program
Spotted by Cooper. This gets hello, aargb, smooth, etc. working.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/r600/r700_fragprog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_fragprog.c b/src/mesa/drivers/dri/r600/r700_fragprog.c
index 0eea2567d5..66070a7eec 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);