From: Chris Forbes <chrisf@ijw.co.nz>
Date: Fri, 14 Mar 2014 19:49:35 +0000 (+1300)
Subject: i965: Account for view parameters in blit CTSI path
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ea477817d773b24dbb29b392e3d4bc53f9dd3e90;p=mesa.git

i965: Account for view parameters in blit CTSI path

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/mesa/drivers/dri/i965/intel_tex_copy.c b/src/mesa/drivers/dri/i965/intel_tex_copy.c
index ca0b5b976c6..c2b6c350c1b 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_copy.c
@@ -74,12 +74,17 @@ intel_copy_texsubimage(struct brw_context *brw,
       return false;
    }
 
+   /* account for view parameters and face index */
+   int dst_level = intelImage->base.Base.Level +
+                   intelImage->base.Base.TexObject->MinLevel;
+   int dst_slice = slice + intelImage->base.Base.Face +
+                   intelImage->base.Base.TexObject->MinLayer;
+
    /* blit from src buffer to texture */
    if (!intel_miptree_blit(brw,
                            irb->mt, irb->mt_level, irb->mt_layer,
                            x, y, irb->Base.Base.Name == 0,
-                           intelImage->mt, intelImage->base.Base.Level,
-                           intelImage->base.Base.Face + slice,
+                           intelImage->mt, dst_level, dst_slice,
                            dstx, dsty, false,
                            width, height, GL_COPY)) {
       return false;