Attachment 35898 Details for Bug 28284 – Alternate patch for mipmap HW generation

[patch] Alternate patch for mipmap HW generation

mipmapfix.patch (text/plain), 2.41 KB, created by Will Dyson on 2010-05-27 21:56:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Dyson

Created: 2010-05-27 21:56:22 UTC

Size: 2.41 KB

patch

obsolete

>commit 50c4ade155304dc4372c47561a109c1f3fb60975
>Author: Will Dyson <will.dyson@gmail.com>
>Date:   Thu May 27 21:09:45 2010 -0400
>
>    Revert "Fix image_matches_texture_obj() MaxLevel check"
>    
>    This reverts commit a9ee95651131e27d5acf3d10909b5b7e5c8d3e92.
>    It was based on a failure to understand how ther driver allocates
>    memory, and causes a regression with Celestia.
>    
>    Set MaxLevel to dstLevel before allocating new mipmap level.
>    
>    The radeon driver will fail to allocate space for a new level that
>    is outside of BaseLevel..MaxLevel. Set MaxLevel before allocating.
>
>diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
>index fc28685..3525583 100644
>--- a/src/mesa/drivers/common/meta.c
>+++ b/src/mesa/drivers/common/meta.c
>@@ -2400,6 +2400,9 @@ _mesa_meta_GenerateMipmap(GLcontext *ctx, GLenum target,
>          break;
>       }
> 
>+      /* Set MaxLevel large enough to hold the new level when we allocate it  */
>+      _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, dstLevel);
>+
>       /* Create empty dest image */
>       if (target == GL_TEXTURE_1D) {
>          _mesa_TexImage1D(target, dstLevel, srcImage->InternalFormat,
>diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
>index bcac125..d2b190e 100644
>--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
>+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
>@@ -593,12 +593,7 @@ static int image_matches_texture_obj(struct gl_texture_object *texObj,
> 	if (!baseImage)
> 		return 0;
> 
>-	/* Check image level against object BaseLevel, but not MaxLevel. MaxLevel is not
>-	 * the highest level that can be assigned to the miptree.
>-	 */
>-	const unsigned maxLevel = texObj->BaseLevel + baseImage->MaxLog2;
>-	if (level < texObj->BaseLevel || level > maxLevel
>-			|| level > RADEON_MIPTREE_MAX_TEXTURE_LEVELS)
>+	if (level < texObj->BaseLevel || level > texObj->MaxLevel)
> 		return 0;
> 
> 	const unsigned levelDiff = level - texObj->BaseLevel;
>@@ -620,7 +615,9 @@ static void teximage_assign_miptree(radeonContextPtr rmesa,
> 	radeonTexObj *t = radeon_tex_obj(texObj);
> 	radeon_texture_image* image = get_radeon_texture_image(texImage);
> 
>-	/* check image for dimension and level compatibility with texture */
>+	/* Since miptree holds only images for levels <BaseLevel..MaxLevel>
>+	 * don't allocate the miptree if the teximage won't fit.
>+	 */
> 	if (!image_matches_texture_obj(texObj, texImage, level))
> 		return;
>

Actions: View | Splinter Review

Attachments on bug 28284: 35898

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.