diff options
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 1e06992394..48e86b8d10 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -1316,8 +1316,6 @@ void r300_setup_rs_unit(GLcontext *ctx) R300_STATECHANGE(r300, rr); fp_reg = in_texcoords = col_interp_nr = high_rr = 0; - r300->hw.rr.cmd[R300_RR_ROUTE_0] = 0; - r300->hw.rr.cmd[R300_RR_ROUTE_1] = 0; for (i=0;i<ctx->Const.MaxTextureUnits;i++) { r300->hw.ri.cmd[R300_RI_INTERP_0+i] = 0 @@ -1325,10 +1323,11 @@ void r300_setup_rs_unit(GLcontext *ctx) | (in_texcoords << R300_RS_INTERP_SRC_SHIFT) | interp_magic[i]; + r300->hw.rr.cmd[R300_RR_ROUTE_0 + fp_reg] = 0; if (InputsRead & (FRAG_BIT_TEX0<<i)) { //assert(r300->state.texture.tc_count != 0); - r300->hw.rr.cmd[R300_RR_ROUTE_0 + fp_reg] = 0 - | R300_RS_ROUTE_ENABLE + r300->hw.rr.cmd[R300_RR_ROUTE_0 + fp_reg] |= + R300_RS_ROUTE_ENABLE | i /* source INTERP */ | (fp_reg << R300_RS_ROUTE_DEST_SHIFT); high_rr = fp_reg; |