diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-07-27 03:52:37 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-07-27 03:52:37 -0400 |
| commit | 7d3190a85b17e747981d0aafe13d1ab1946f1649 (patch) | |
| tree | 68a806a290152843f071be062301015023f0ccef /src/mesa/drivers/dri/r600/r700_fragprog.c | |
| parent | 7e6819f8430e77012d6cd9278cabaf1d4238117a (diff) | |
| download | external_mesa3d-7d3190a85b17e747981d0aafe13d1ab1946f1649.zip external_mesa3d-7d3190a85b17e747981d0aafe13d1ab1946f1649.tar.gz external_mesa3d-7d3190a85b17e747981d0aafe13d1ab1946f1649.tar.bz2 | |
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.
Diffstat (limited to 'src/mesa/drivers/dri/r600/r700_fragprog.c')
| -rw-r--r-- | 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); |