Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	apps/xwininfo/xwininfo.c
	fontconfig/src/fcmatch.c
	mesalib/include/GL/internal/dri_interface.h
	mesalib/src/glsl/main.cpp
	mesalib/src/mesa/main/pack.c
	mesalib/src/mesa/main/renderbuffer.c
	mesalib/src/mesa/main/renderbuffer.h
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_draw.c
	mesalib/src/mesa/state_tracker/st_format.c
	pixman/configure.ac
	pixman/pixman/pixman-arm-neon-asm.S
	pixman/test/blitters-test.c

1 files changed, 2 insertions, 1 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index 2def3d138..ce289fc6b 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -1241,7 +1241,8 @@ fallback_copy_texsubimage(struct gl_context *ctx, GLenum target, GLint level,
 

    src_trans = pipe_get_transfer(pipe,

                                  strb->texture,

-                                 0, 0,

+                                 strb->rtt_level,

+                                 strb->rtt_face + strb->rtt_slice,

                                  PIPE_TRANSFER_READ,

                                  srcX, srcY,

                                  width, height);