From: Dave Airlie <airlied@redhat.com>
Date: Tue, 10 Feb 2009 13:36:28 +0000 (+1000)
Subject: radeon: fix fallback case where t->mt is valid NULL
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c3ca94bc9115f0f328327f1e96fac84b87d5efd5;p=mesa.git

radeon: fix fallback case where t->mt is valid NULL
---

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)