Mesa (radeon-rewrite): radeon/r200: fixup texturing aging calls

[Dave Airlie]

Module: Mesa
Branch: radeon-rewrite
Commit: 48e7b940ebc2cb3594074ca35fad9c63f6568582
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=48e7b940ebc2cb3594074ca35fad9c63f6568582

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Feb 17 13:39:38 2009 +1000

radeon/r200: fixup texturing aging calls

---

 src/mesa/drivers/dri/r200/r200_context.c     |    5 ++---
 src/mesa/drivers/dri/radeon/radeon_context.c |    5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index d567bb7..a9cb2e2 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -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)
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 7db62be..f562876 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -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);
    }
 }