radeon: avoid segfault on 3D textures.
authorDave Airlie <airlied@redhat.com>
Wed, 19 Jan 2011 06:27:13 +0000 (16:27 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 19 Jan 2011 06:27:13 +0000 (16:27 +1000)
This is a candidate for 7.9 and 7.10

src/mesa/drivers/dri/radeon/radeon_state.c

index ca42aa3947464cc6c41cb499b568f9746a761956..e88e984354f2be9afbc8403f33809156f65c6575 100644 (file)
@@ -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);