From: Dave Airlie <airlied@redhat.com>
Date: Tue, 17 Feb 2009 00:26:58 +0000 (+1000)
Subject: radeon: steal miptree optimisation from intel codebase
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0a8cba9a65e6ec1159a08725d2101e7eabb4526b;p=mesa.git

radeon: steal miptree optimisation from intel codebase

This replaces a miptree if it won't distrub anything else.
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
index 4aa081ca347..6949ee4502c 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
@@ -517,6 +517,16 @@ static void radeon_teximage(
 	/* Allocate memory for image */
 	radeonFreeTexImageData(ctx, texImage); /* Mesa core only clears texImage->Data but not image->mt */
 
+	if (t->mt &&
+	    t->mt->firstLevel == level &&
+	    t->mt->lastLevel == level &&
+	    t->mt->target != GL_TEXTURE_CUBE_MAP_ARB &&
+	    !radeon_miptree_matches_image(t->mt, texImage, face, level)) {
+	  fprintf(stderr,"freeing old miptree\n");
+	  radeon_miptree_unreference(t->mt);
+	  t->mt = NULL;
+	}
+
 	if (!t->mt)
 		radeon_try_alloc_miptree(rmesa, t, texImage, face, level);
 	if (t->mt && radeon_miptree_matches_image(t->mt, texImage, face, level)) {