Attachment 25673 Details for Bug 21648 – radeon: Don't crash generating mipmaps when pixels=NULL

[patch] radeon: Don't crash generating mipmaps when pixels=NULL

0001-radeon-Don-t-crash-generating-mipmaps-when-pixels-N.patch (text/plain), 1.81 KB, created by Owen Taylor on 2009-05-09 12:26:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Taylor

Created: 2009-05-09 12:26:40 UTC

Size: 1.81 KB

patch

obsolete

>From f2422f1ffb94b28a8de5bef5288a273f66d4a8b5 Mon Sep 17 00:00:00 2001
>From: Owen W. Taylor <otaylor@fishsoup.net>
>Date: Sat, 9 May 2009 15:23:34 -0400
>Subject: [PATCH] radeon: Don't crash generating mipmaps when pixels=NULL
>
>When a NULL value of pixels is passed to TexImage2D and
>SGIS_generate_mipmap is enabled, don't try to generate the
>mipmap tree: we don't have data yet for the texture and will
>crash.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=21648
>---
> src/mesa/drivers/dri/radeon/radeon_texture.c |   17 ++++++++---------
> 1 files changed, 8 insertions(+), 9 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
>index 35ed542..df0b3f8 100644
>--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
>+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
>@@ -611,11 +611,10 @@ static void radeon_teximage(
> 				_mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");
> 		}
> 
>-	}
>-
>-	/* SGIS_generate_mipmap */
>-	if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
>-		radeon_generate_mipmap(ctx, texObj->Target, texObj);
>+		/* SGIS_generate_mipmap */
>+		if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
>+			radeon_generate_mipmap(ctx, texObj->Target, texObj);
>+		}
> 	}
> 
> 	_mesa_unmap_teximage_pbo(ctx, packing);
>@@ -740,12 +739,12 @@ static void radeon_texsubimage(GLcontext* ctx, int dims, int level,
> 				_mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage");
> 		}
> 
>+		/* GL_SGIS_generate_mipmap */
>+		if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
>+			radeon_generate_mipmap(ctx, texObj->Target, texObj);
>+		}
> 	}
> 
>-	/* GL_SGIS_generate_mipmap */
>-	if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
>-		radeon_generate_mipmap(ctx, texObj->Target, texObj);
>-	}
> 	radeon_teximage_unmap(image);
> 
> 	_mesa_unmap_teximage_pbo(ctx, packing);
>-- 
>1.6.2.2
>

Actions: View | Splinter Review

Attachments on bug 21648: 25673

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.