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 716ce29fe8ea684910413ff309472831f3136fe3..ec6323741e875725c6a6caeda4b10679afef475d 100644 (file)
--- 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: