summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-01-19 16:27:13 +1000
committerAlex Deucher <alexdeucher@gmail.com>2011-02-22 15:11:09 -0500
commitb093c9939e31c673d787f0c4215089c9295e50bf (patch)
tree1c1f4b226f64703fbce02c5ee692491cb41b4fdb
parent87a02b952be752cb8473066b0f1e3c01b7bc1850 (diff)
radeon: avoid segfault on 3D textures.
This is a candidate for 7.9 and 7.10
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_state.c3
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 539b067742f..8e622906a68 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);