From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 25 Apr 2008 16:33:48 +0000 (-0600)
Subject: gallium: fix the compressed texture hack in st_texture_image_copy()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3faea292e537b8fe8f86b03ae9147c73f17efc3b;p=mesa.git

gallium: fix the compressed texture hack in st_texture_image_copy()

Actually, the hack is still there and needs to be revisited, but I get a bit
further with compressed textures now.
---

diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index 8e3235cc99d..66d81e2b959 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -290,8 +290,7 @@ st_texture_image_copy(struct pipe_context *pipe,
    GLuint i;
 
    /* XXX this is a hack */
-   if (dst->compressed)
-      height /= 4;
+   const GLuint copyHeight = dst->compressed ? height / 4 : height;
 
    for (i = 0; i < depth; i++) {
       GLuint srcLevel;
@@ -315,7 +314,7 @@ st_texture_image_copy(struct pipe_context *pipe,
 			 0, 0, /* destX, Y */
 			 src_surface,
 			 0, 0, /* srcX, Y */
-			 width, height);
+			 width, copyHeight);
 
       pipe_surface_reference(&dst_surface, NULL);
       pipe_surface_reference(&src_surface, NULL);