From: Jordan Justen <jordan.l.justen@intel.com>
Date: Tue, 15 Nov 2016 10:18:25 +0000 (-0800)
Subject: isl: Fix height calculation in isl_msaa_interleaved_scale_px_to_sa
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0ac57afa6fbe59e9fd8eef38365cb3da8ec67f95;p=mesa.git

isl: Fix height calculation in isl_msaa_interleaved_scale_px_to_sa

No known fixed tests, but it looks like a typo from:

commit 8ac99eabb6570f0f3c5f7d7da1332a99ce636362

    intel/isl: Add a helper for getting the size of an interleaved pixel

Cc: "13.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 7831c5e5be2..32463b12982 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -339,7 +339,7 @@ isl_msaa_interleaved_scale_px_to_sa(uint32_t samples,
    if (width)
       *width = isl_align(*width, 2) * px_size_sa.width;
    if (height)
-      *height = isl_align(*height, 2) * px_size_sa.width;
+      *height = isl_align(*height, 2) * px_size_sa.height;
 }
 
 static enum isl_array_pitch_span