summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorVinson Lee <vlee@vmware.com>2010-04-24 23:41:59 -0700
committerVinson Lee <vlee@vmware.com>2010-04-24 23:44:56 -0700
commitd69ed3a96eb4ed2630bee28f1937d376eee435e1 (patch)
treee9888b5df46fe22ca6a69cfdfd353854233ac937 /src/mesa
parenta1a7738223b754044213b969371823ec52b0a9e2 (diff)
radeon: Remove NULL check of bo_legacy->tobj.
bo_legacy->tobj cannot be NULL before the call to driUpdateTextureLRU. There is a NULL check earlier in the routine, and if bo_legacy->tobj is NULL, memory is allocated.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_bo_legacy.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
index cf12664bac..78f73bf99c 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
+++ b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
@@ -618,8 +618,7 @@ static int bo_vram_validate(struct radeon_bo_int *bo,
assert(bo_legacy->tobj->base.memBlock);
- if (bo_legacy->tobj)
- driUpdateTextureLRU(&bo_legacy->tobj->base);
+ driUpdateTextureLRU(&bo_legacy->tobj->base);
if (bo_legacy->dirty || bo_legacy->tobj->base.dirty_images[0]) {
if (IS_R600_CLASS(boml->screen)) {