summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-09-23 16:13:50 -0700
committerEric Anholt <eric@anholt.net>2010-09-23 16:20:25 -0700
commit1c0646a826cb19d3c3eaa84591930590db6e8af8 (patch)
treea318a2ffd64daf96c91501eec77a78e1f87000a8
parentfae18559461e62af623be77787ecba4c7013a8b4 (diff)
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.
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_texture.c12
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 bf30e0cab8..d1ebd83550 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);