summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorMaciej Cencora <[email protected]>2009-12-12 02:02:53 +0100
committerMaciej Cencora <[email protected]>2009-12-12 02:02:53 +0100
commit8413a3aefaf4968f8b17263826b34baa99c2a907 (patch)
tree392a96dabc21d59641d1a15bde19ba12cb694500 /src/mesa/drivers/dri
parentf1900323ea1e387afc487737f9930ba0d014fd0d (diff)
radeon: fix #25463
This is just a workaroung until we properly fix texture mapping in radeonSpanRenderStart
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c5
1 files changed, 4 insertions, 1 deletions
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;