summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2016-11-15 02:18:25 -0800
committerEmil Velikov <emil.l.velikov@gmail.com>2016-11-24 16:34:40 +0000
commit154cb647218999bdc1b2535ffdc85baf933e718e (patch)
treec7f396f346984aa41da4ca4ceb89da771182411e /src
parent607cac69f895836b7633042b52bf7d6b6c3b23c9 (diff)
downloadexternal_mesa3d-154cb647218999bdc1b2535ffdc85baf933e718e.zip
external_mesa3d-154cb647218999bdc1b2535ffdc85baf933e718e.tar.gz
external_mesa3d-154cb647218999bdc1b2535ffdc85baf933e718e.tar.bz2
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> (cherry picked from commit 0ac57afa6fbe59e9fd8eef38365cb3da8ec67f95)
Diffstat (limited to 'src')
-rw-r--r--src/intel/isl/isl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 7831c5e..32463b1 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