Mesa (master): r600: fix textures

[Alex Deucher]

Module: Mesa
Branch: master
Commit: 7d3190a85b17e747981d0aafe13d1ab1946f1649
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d3190a85b17e747981d0aafe13d1ab1946f1649

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Jul 27 03:52:37 2009 -0400

r600: fix textures

We weren't allocating enough gprs for the fragment shader
in some cases.  There are likely other issues that still need
to be sorted out for textures, but at least they now work.

---

 src/mesa/drivers/dri/r600/r700_fragprog.c |    2 +-
 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 44de2ae..3afd0b0 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 ? ui : unNumOfReg;
+    ui = (unNumOfReg < ui) ? ui : unNumOfReg;
 
     SETfield(r700->ps.SQ_PGM_RESOURCES_PS.u32All, ui, NUM_GPRS_shift, NUM_GPRS_mask);