Mesa (7.9): radeon: avoid segfault on 3D textures.

Alex Deucher agd5f at kemper.freedesktop.org
Tue Feb 22 20:15:05 UTC 2011


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jan 19 16:27:13 2011 +1000

radeon: avoid segfault on 3D textures.

This is a candidate for 7.9 and 7.10

---

 src/mesa/drivers/dri/radeon/radeon_state.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
index 539b067..8e62290 100644
--- a/src/mesa/drivers/dri/radeon/radeon_state.c
+++ b/src/mesa/drivers/dri/radeon/radeon_state.c
@@ -2091,6 +2091,9 @@ static GLboolean r100ValidateBuffers(GLcontext *ctx)
 	 continue;
 
       t = rmesa->state.texture.unit[i].texobj;
+
+      if (!t)
+	 continue;
       if (t->image_override && t->bo)
 	radeon_cs_space_add_persistent_bo(rmesa->radeon.cmdbuf.cs, t->bo,
 			   RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);




More information about the mesa-commit mailing list