From: Haixia Shi <hshi@chromium.org>
Date: Wed, 3 Aug 2016 00:03:32 +0000 (-0700)
Subject: i965: use mt->offset in intel_miptree_map_movntdqa()
X-Git-Tag: upstream/17.1.0~7617
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c4bfed6709c7c35de4b2268ca2e73ed75c30f50;p=platform%2Fupstream%2Fmesa.git

i965: use mt->offset in intel_miptree_map_movntdqa()

We need to include mt->offset in the calculation of src pointer because its
value may be non-zero, for example in a cubemap texture.

Signed-off-by: Haixia Shi <hshi@chromium.org>
Cc: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Chad Versace <chad@kiwitree.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Change-Id: I461ad5b204626d5a1c45611fc6b63735dcf29f63
---

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index a988221..8e7c44c 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -2462,6 +2462,9 @@ intel_miptree_map_movntdqa(struct brw_context *brw,
    void *src = intel_miptree_map_raw(brw, mt);
    if (!src)
       return;
+
+   src += mt->offset;
+
    src += image_y * mt->pitch;
    src += image_x * mt->cpp;