From: Eric Anholt <eric@anholt.net>
Date: Thu, 23 Sep 2010 23:13:50 +0000 (-0700)
Subject: radeon: Remove copied minimum pitch alignment code.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1c0646a826cb19d3c3eaa84591930590db6e8af8;p=mesa.git

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.
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
index bf30e0cab8b..d1ebd83550d 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);