Module: Mesa Branch: mesa_7_7_branch Commit: 8413a3aefaf4968f8b17263826b34baa99c2a907 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8413a3aefaf4968f8b17263826b34baa99c2a907
Author: Maciej Cencora <m.cenc...@gmail.com> Date: Sat Dec 12 02:02:53 2009 +0100 radeon: fix #25463 This is just a workaroung until we properly fix texture mapping in radeonSpanRenderStart --- src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c | 5 ++++- 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 91f0db9..d7b5d71 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; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit