diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-01-19 16:27:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-01-19 16:27:13 +1000 |
| commit | a5da4acb9583db5289fcad410513d0fedcf9bab2 (patch) | |
| tree | 2c4f35596ab90bc875c0cbd6035787f72d36af9b /src/mesa/drivers/dri/radeon | |
| parent | 4832403c38183380f98713bddb077b5179ae073f (diff) | |
radeon: avoid segfault on 3D textures.
This is a candidate for 7.9 and 7.10
Diffstat (limited to 'src/mesa/drivers/dri/radeon')
| -rw-r--r-- | 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 ca42aa3947..e88e984354 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); |