OSDN Git Service

radeon/r200: fixup texturing aging calls
authorDave Airlie <airlied@redhat.com>
Tue, 17 Feb 2009 03:39:38 +0000 (13:39 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 17 Feb 2009 03:39:38 +0000 (13:39 +1000)
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/radeon/radeon_context.c

index d567bb7..a9cb2e2 100644 (file)
@@ -246,11 +246,10 @@ static void r200_get_lock(radeonContextPtr radeon)
 
    if ( sarea->ctx_owner != rmesa->radeon.dri.hwContext ) {
       sarea->ctx_owner = rmesa->radeon.dri.hwContext;
+      if (!radeon->radeonScreen->kernel_mm)
+         radeon_bo_legacy_texture_age(radeon->radeonScreen->bom);
    }
 
-   for ( i = 0 ; i < rmesa->radeon.nr_heaps ; i++ ) {
-      DRI_AGE_TEXTURES( rmesa->radeon.texture_heaps[ i ] );
-   }
 }
 
 static void r200_vtbl_emit_cs_header(struct radeon_cs *cs, radeonContextPtr rmesa)
index 7db62be..f562876 100644 (file)
@@ -164,9 +164,8 @@ static void r100_get_lock(radeonContextPtr radeon)
       int i;
       sarea->ctx_owner = rmesa->radeon.dri.hwContext;
       
-      for (i = 0; i < rmesa->radeon.nr_heaps; i++) {
-        DRI_AGE_TEXTURES(rmesa->radeon.texture_heaps[i]);
-      }
+      if (!radeon->radeonScreen->kernel_mm)
+         radeon_bo_legacy_texture_age(radeon->radeonScreen->bom);
    }
 }