Mesa (master): radeon: Remove copied minimum pitch alignment code.

Eric Anholt anholt at kemper.freedesktop.org
Thu Sep 23 23:21:20 UTC 2010


Module: Mesa
Branch: master
Commit: 1c0646a826cb19d3c3eaa84591930590db6e8af8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c0646a826cb19d3c3eaa84591930590db6e8af8

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Sep 23 16:13:50 2010 -0700

radeon: Remove copied minimum pitch alignment code.

This is already covered by radeon_mipmap_tree.c, and my convolution
cleanups broke in the presence of this code.  Thanks to Marek Olšák
for tracking down the relevant miptree code for me.

---

 src/mesa/drivers/dri/radeon/radeon_texture.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
index bf30e0c..d1ebd83 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
@@ -792,18 +792,6 @@ static void radeon_teximage(
 
 	t->validated = GL_FALSE;
 
-	if (!_mesa_is_format_compressed(texImage->TexFormat)) {
-		GLuint texelBytes = _mesa_get_format_bytes(texImage->TexFormat);
-		/* Minimum pitch of 32 bytes */
-		if (width * texelBytes < 32) {
-			width = 32 / texelBytes;
-			texImage->RowStride = width;
-		}
-		if (!image->mt) {
-			assert(texImage->RowStride == width);
-		}
-	}
-
 	/* Mesa core only clears texImage->Data but not image->mt */
 	radeonFreeTexImageData(ctx, texImage);
 




More information about the mesa-commit mailing list