isl: Fix height calculation in isl_msaa_interleaved_scale_px_to_sa
authorJordan Justen <jordan.l.justen@intel.com>
Tue, 15 Nov 2016 10:18:25 +0000 (02:18 -0800)
committerJordan Justen <jordan.l.justen@intel.com>
Tue, 15 Nov 2016 22:27:27 +0000 (14:27 -0800)
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>
src/intel/isl/isl.c

index 7831c5e5be2aedf92c62ec5276d8bf6220d2d32e..32463b12982d8600aa25179e24ae786359efea87 100644 (file)
@@ -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