summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2015-08-15 21:42:02 -0400
committerIlia Mirkin <[email protected]>2015-08-17 01:00:43 -0400
commitbb9881fccf4c3606e66ec607dfb0387c9e068e3d (patch)
tree3e2bc553548a6b52854004adc10583d51efb0a70
parentafccbd725655e6e607029a8b359886f62e4aa807 (diff)
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 <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 715d69c0c68..4f2ef6b0137 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;
}