Fix cube maps.

diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index 1bbe2486d913978a245e8f42bf0af572a67ae8ff..bce350cba4ee6b51217e84a1de0a13e7adfd8f27 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -300,25 +300,17 @@ static void r300SetTexImages(r300ContextPtr rmesa,
 
        /* Setup remaining cube face blits, if needed */
        if (tObj->Target == GL_TEXTURE_CUBE_MAP) {
-               WARN_ONCE("Cube map faces arent currently correctly positioned.\n");
-               /* Round totalSize up to multiple of BLIT_WIDTH_BYTES */
-               const GLuint faceSize =
-                   (t->base.totalSize + BLIT_WIDTH_BYTES - 1)
-                   & ~(BLIT_WIDTH_BYTES - 1);
-               const GLuint lines = faceSize / BLIT_WIDTH_BYTES;
                GLuint face;
-               /* reuse face 0 x/y/width/height - just adjust y */
                for (face = 1; face < 6; face++) {
                        for (i = 0; i < numLevels; i++) {
                                t->image[face][i].x = t->image[0][i].x;
-                               t->image[face][i].y =
-                                   t->image[0][i].y + face * lines;
+                               t->image[face][i].y = t->image[0][i].y;
                                t->image[face][i].width = t->image[0][i].width;
                                t->image[face][i].height =
                                    t->image[0][i].height;
                        }
                }
-               t->base.totalSize = 6 * faceSize;       /* total texmem needed */
+               t->base.totalSize *= 6; /* total texmem needed */
        }
 
        /* Hardware state: