From: Nanley Chery <nanley.g.chery@intel.com>
Date: Wed, 27 Jan 2016 06:56:21 +0000 (-0800)
Subject: isl: Add logical z offset to GEN4_2D surfaces
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=02629a16d1bb1f065a65ca7eb01b150339de6cd4;p=mesa.git

isl: Add logical z offset to GEN4_2D surfaces

3D surfaces in Skylake are stored with ISL_DIM_LAYOUT_GEN4_2D. Any
delta in the logical z offset causes an equivalent delta in the
surface's array layer.
---

diff --git a/src/isl/isl.c b/src/isl/isl.c
index 716ce29fe8e..ec6323741e8 100644
--- a/src/isl/isl.c
+++ b/src/isl/isl.c
@@ -1309,7 +1309,8 @@ get_image_offset_sa(const struct isl_surf *surf,
                                   x_offset_sa, y_offset_sa);
       break;
    case ISL_DIM_LAYOUT_GEN4_2D:
-      get_image_offset_sa_gen4_2d(surf, level, logical_array_layer,
+      get_image_offset_sa_gen4_2d(surf, level, logical_array_layer
+                                  + logical_z_offset_px,
                                   x_offset_sa, y_offset_sa);
       break;
    case ISL_DIM_LAYOUT_GEN4_3D: