From c3ca94bc9115f0f328327f1e96fac84b87d5efd5 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 10 Feb 2009 23:36:28 +1000 Subject: [PATCH] radeon: fix fallback case where t->mt is valid NULL --- src/mesa/drivers/dri/radeon/common_misc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/common_misc.c b/src/mesa/drivers/dri/radeon/common_misc.c index 82cead1a25a..4770c987c87 100644 --- a/src/mesa/drivers/dri/radeon/common_misc.c +++ b/src/mesa/drivers/dri/radeon/common_misc.c @@ -1469,8 +1469,9 @@ void radeonMapTexture(GLcontext *ctx, struct gl_texture_object *texObj) radeonTexObj* t = radeon_tex_obj(texObj); int face, level; - // assert(texObj->_Complete); - assert(t->mt); + /* for r100 3D sw fallbacks don't have mt */ + if (!t->mt) + return; radeon_bo_map(t->mt->bo, GL_FALSE); for(face = 0; face < t->mt->faces; ++face) { @@ -1484,8 +1485,9 @@ void radeonUnmapTexture(GLcontext *ctx, struct gl_texture_object *texObj) radeonTexObj* t = radeon_tex_obj(texObj); int face, level; - // assert(texObj->_Complete); - assert(t->mt); + /* for r100 3D sw fallbacks don't have mt */ + if (!t->mt) + return; for(face = 0; face < t->mt->faces; ++face) { for(level = t->mt->firstLevel; level <= t->mt->lastLevel; ++level) -- 2.30.2