diff options
| author | Corbin Simpson <[email protected]> | 2008-05-26 22:12:24 -0700 |
|---|---|---|
| committer | Corbin Simpson <[email protected]> | 2008-05-26 22:12:24 -0700 |
| commit | b5372746ffcaab4ce158c1ca205e039a561ca01f (patch) | |
| tree | 805a8683db74066eed33d9ccec83efabd423e296 /src/mesa | |
| parent | 9f03e93de9a0b75485d1de8a990513b0c2582385 (diff) | |
r5xx: Fix FP temp counting.
One of the ref counters wasn't being added to the temp counter.
Yet another product of late-night coding...
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r500_fragprog.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/r300/r500_fragprog.c b/src/mesa/drivers/dri/r300/r500_fragprog.c index d331ac10361..f76a3d9560b 100644 --- a/src/mesa/drivers/dri/r300/r500_fragprog.c +++ b/src/mesa/drivers/dri/r300/r500_fragprog.c @@ -170,7 +170,7 @@ static int get_temp(struct r500_fragment_program *fp, int slot) { COMPILE_STATE; - int r = cs->temp_in_use + 1 + slot; + int r = fp->temp_reg_offset + cs->temp_in_use + slot; if (r > R500_US_NUM_TEMP_REGS) { ERROR("Too many temporary registers requested, can't compile!\n"); @@ -1272,15 +1272,18 @@ static void init_program(r300ContextPtr r300, struct r500_fragment_program *fp) for (fpi = mp->Base.Instructions; fpi->Opcode != OPCODE_END; fpi++) { for (i = 0; i < 3; i++) { if (fpi->SrcReg[i].File == PROGRAM_TEMPORARY) { - if (fpi->SrcReg[i].Index > temps_used) - temps_used = fpi->SrcReg[i].Index; + if (fpi->SrcReg[i].Index >= temps_used) + temps_used = fpi->SrcReg[i].Index + 1; } } } - cs->temp_in_use = temps_used; + cs->temp_in_use = temps_used + 1; - fp->max_temp_idx = fp->temp_reg_offset + cs->temp_in_use + 1; + fp->max_temp_idx = fp->temp_reg_offset + cs->temp_in_use; + + if (RADEON_DEBUG & DEBUG_PIXEL) + fprintf(stderr, "FP temp indices: fp->max_temp_idx: %d cs->temp_in_use: %d\n", fp->max_temp_idx, cs->temp_in_use); } static void update_params(struct r500_fragment_program *fp) |