Bug 7861: mach64 with render acceleration should restore texture state

RENDER acceleration uses texturing, thus when RENDER acceleration is enabled,
the mach64 DRI driver should restore texture state when acquiring the DRI lock.

diff --git a/src/mesa/drivers/dri/mach64/mach64_lock.c b/src/mesa/drivers/dri/mach64/mach64_lock.c
index b214495d9a6f36992512167c45c75f041cfce129..26f66f0230961047f042f8c7c72fe23c3b610494 100644 (file)
--- a/src/mesa/drivers/dri/mach64/mach64_lock.c
+++ b/src/mesa/drivers/dri/mach64/mach64_lock.c
@@ -82,6 +82,9 @@ void mach64GetLock( mach64ContextPtr mmesa, GLuint flags )
                    | MACH64_UPLOAD_MISC
                    | MACH64_UPLOAD_CLIPRECTS);
 
+   /* EXA render acceleration uses the texture engine, so restore it */
+   mmesa->dirty |= (MACH64_UPLOAD_TEXTURE);
+
    if ( sarea->ctx_owner != mmesa->hHWContext ) {
       sarea->ctx_owner = mmesa->hHWContext;
       mmesa->dirty = MACH64_UPLOAD_ALL;