From: Dave Airlie <airlied@redhat.com>
Date: Wed, 19 Jan 2011 06:27:13 +0000 (+1000)
Subject: radeon: avoid segfault on 3D textures.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a5da4acb9583db5289fcad410513d0fedcf9bab2;p=mesa.git

radeon: avoid segfault on 3D textures.

This is a candidate for 7.9 and 7.10
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
index ca42aa39474..e88e984354f 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(struct gl_context *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);