summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-02-17 13:39:38 +1000
committerDave Airlie <airlied@redhat.com>2009-02-17 13:39:38 +1000
commit48e7b940ebc2cb3594074ca35fad9c63f6568582 (patch)
tree8a630221e30cda0cb9d8e34d467542f14f9fc6ae
parent7c7ff659ce7684f44b064c09cdca6436d2c2bf64 (diff)
radeon/r200: fixup texturing aging calls
-rw-r--r--src/mesa/drivers/dri/r200/r200_context.c5
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_context.c5
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 d567bb77df..a9cb2e2fe9 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 7db62be7af..f562876db4 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);
}
}