Mesa (master): st/mesa: also move yoffset to zoffset for 1d array textures

[Ilia Mirkin]

Module: Mesa
Branch: master
Commit: bb9881fccf4c3606e66ec607dfb0387c9e068e3d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb9881fccf4c3606e66ec607dfb0387c9e068e3d

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sat Aug 15 21:42:02 2015 -0400

st/mesa: also move yoffset to zoffset for 1d array textures

Do the same as in st_TexSubImage. This fixes
arb_get_texture_sub_image-get on llvmpipe when it is set to prefer
blits, and nouveau when it uses the 3d engine for blits.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/state_tracker/st_cb_texture.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 715d69c..4f2ef6b 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1071,6 +1071,8 @@ st_GetTexSubImage(struct gl_context * ctx,
 
    /* From now on, we need the gallium representation of dimensions. */
    if (gl_target == GL_TEXTURE_1D_ARRAY) {
+      zoffset = yoffset;
+      yoffset = 0;
       depth = height;
       height = 1;
    }