diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index bdd20b1..192dc04 100644
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -250,7 +250,7 @@ static void compute_tex_image_offset(
 			texImage->Depth;
 		blitWidth = MAX2(texImage->Width, 64 / texelBytes);
 	} else {
-		int w = (texImage->Width * texelBytes + 31) & ~31;
+		int w = (texImage->Width * texelBytes + 63) & ~63;
 		size = w * texImage->Height * texImage->Depth;
 		blitWidth = MAX2(texImage->Width, 64 / texelBytes);
 	}
@@ -264,7 +264,7 @@ static void compute_tex_image_offset(
 			texImage->InternalFormat);
 
 	/* All images are aligned to a 32-byte offset */
-	*curOffset = (*curOffset + 0x1f) & ~0x1f;
+	*curOffset = (*curOffset + 0x3f) & ~0x3f;
 
 	if (texelBytes) {
 		/* fix x and y coords up later together with offset */