From: Chad Versace <chad.versace@intel.com>
Date: Mon, 14 Dec 2015 20:31:55 +0000 (-0800)
Subject: isl: Fix calculation of array pitch for layout GEN4_2D
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=53504b884e58af6bcf92e3fd258c7d9d3332c1fc;p=mesa.git

isl: Fix calculation of array pitch for layout GEN4_2D

The height of the miptree's right half was not large enough.

Found by `make check` in test_isl_surf_get_offset, which is added in the
next commit.
---

diff --git a/src/isl/isl.c b/src/isl/isl.c
index d858ea74745..333a517f274 100644
--- a/src/isl/isl.c
+++ b/src/isl/isl.c
@@ -570,6 +570,7 @@ isl_calc_phys_slice0_extent_sa_gen4_2d(
          slice_left_h += h;
       } else if (l == 2) {
          slice_bottom_w += w;
+         slice_right_h += h;
       } else {
          slice_right_h += h;
       }