From 1c0646a826cb19d3c3eaa84591930590db6e8af8 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 23 Sep 2010 16:13:50 -0700 Subject: [PATCH] radeon: Remove copied minimum pitch alignment code. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 file changed, 12 deletions(-) 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); -- 2.30.2