diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-05-27 12:45:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-05-27 12:45:15 +1000 |
| commit | 7b88f40116cc6ccff5c0f7c923a0dca31187480e (patch) | |
| tree | 8c48f41b79d7b0b525eaf228396fb352309b57f4 | |
| parent | 5a5ba350696e6b753a9e49da010513670b697db5 (diff) | |
r300/r500: fix r500 fragment program texture unit references
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 86607478a3..076d4f092f 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -2432,6 +2432,8 @@ static void r300SetupPixelShader(r300ContextPtr rmesa) return; } + r300SetupTextures(ctx); + R300_STATECHANGE(rmesa, fpi[0]); rmesa->hw.fpi[0].cmd[R300_FPI_CMD_0] = cmdpacket0(R300_US_ALU_RGB_INST_0, fp->alu_end + 1); for (i = 0; i <= fp->alu_end; i++) { @@ -2519,6 +2521,8 @@ static void r500SetupPixelShader(r300ContextPtr rmesa) return; } + r300SetupTextures(ctx); + R300_STATECHANGE(rmesa, fp); rmesa->hw.fp.cmd[R500_FP_PIXSIZE] = fp->max_temp_idx; @@ -2567,7 +2571,6 @@ void r300UpdateShaderStates(r300ContextPtr rmesa) r500SetupPixelShader(rmesa); else r300SetupPixelShader(rmesa); - r300SetupTextures(ctx); if (rmesa->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515) r500SetupRSUnit(ctx); |