Mesa (master): radeon: Remove NULL check of bo_legacy->tobj.

Vinson Lee vlee at kemper.freedesktop.org
Sun Apr 25 06:45:16 UTC 2010


Module: Mesa
Branch: master
Commit: d69ed3a96eb4ed2630bee28f1937d376eee435e1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d69ed3a96eb4ed2630bee28f1937d376eee435e1

Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Apr 24 23:41:59 2010 -0700

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.

---

 src/mesa/drivers/dri/radeon/radeon_bo_legacy.c |    3 +--
 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 cf12664..78f73bf 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)) {




More information about the mesa-commit mailing list