From: Maciej Cencora <m.cencora@gmail.com>
Date: Sat, 12 Dec 2009 01:02:53 +0000 (+0100)
Subject: radeon: fix #25463
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8413a3aefaf4968f8b17263826b34baa99c2a907;p=mesa.git

radeon: fix #25463

This is just a workaroung until we properly fix texture mapping in radeonSpanRenderStart
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
index 91f0db958b9..d7b5d71d21f 100644
--- a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
+++ b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
@@ -436,7 +436,10 @@ static void migrate_image_to_miptree(radeon_mipmap_tree *mt,
 		radeon_bo_unmap(image->mt->bo);
 
 		radeon_miptree_unreference(&image->mt);
-	} else {
+	} else if (image->base.Data) {
+		/* This condition should be removed, it's here to workaround
+		 * a segfault when mapping textures during software fallbacks.
+		 */
 		const uint32_t srcrowstride = _mesa_format_row_stride(image->base.TexFormat, image->base.Width);
 		uint32_t rows = image->base.Height * image->base.Depth;