gallium: fix glCopyPixels(GL_DEPTH) when Z format conversion is needed

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 6c0d75cc550214c13c206f30abd58ffef61869b4..de99882ab789a1c4a528f48ad7e5da435ab5262e 100644 (file)
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -1299,7 +1299,7 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
                         psRead,
                         srcx, srcy, width, height);
    }
-   else {
+   else if (type == GL_COLOR) {
       /* alternate path using get/put_tile() */
       GLfloat *buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
 
@@ -1308,6 +1308,13 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
 
       free(buf);
    }
+   else {
+      /* GL_DEPTH */
+      GLuint *buf = (GLuint *) malloc(width * height * sizeof(GLuint));
+      pipe_get_tile_z(pipe, psRead, srcx, srcy, width, height, buf);
+      pipe_put_tile_z(pipe, psTex, 0, 0, width, height, buf);
+      free(buf);
+   }
 
    /* draw textured quad */
    draw_textured_quad(ctx, dstx, dsty, ctx->Current.RasterPos[2],