Attached patch fixes a bug where a newer texture state is disabled
prior to FlushPrims being called.

(examples : ground texture in rollercoaster doesn't display, various
glitches on mp_beach (maybe others?) in rtcw)

-- 
Michael.
Index: radeon_texstate.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/radeon/radeon_texstate.c,v
retrieving revision 1.3.6.3
diff -u -3 -p -r1.3.6.3 radeon_texstate.c
--- radeon_texstate.c   2001/10/30 15:12:14     1.3.6.3
+++ radeon_texstate.c   2002/02/02 13:28:00
@@ -1135,9 +1138,9 @@ static void radeonUpdateTextureUnit( GLc
    }
    else {
       /* Texture unit disabled */
+      RADEON_STATECHANGE( rmesa, RADEON_UPLOAD_CONTEXT );
       rmesa->state.texture.unit[unit].texobj = 0;
       rmesa->state.hw.dirty &= ~(RADEON_UPLOAD_TEX0 << unit);
-      RADEON_STATECHANGE( rmesa, RADEON_UPLOAD_CONTEXT );
       rmesa->state.hw.context.pp_cntl &= ~((RADEON_TEX_0_ENABLE |
                                            RADEON_TEX_BLEND_0_ENABLE) << unit);
    }

Reply via email to