From 0f34a4ec4ee296121c0f2ae416d5899c846efd90 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg=20Kristensen?= Date: Mon, 4 Jan 2016 10:53:47 -0800 Subject: [PATCH] isl: Use isl_align_npot for row_pitch Many formats are not power-of-two bytes per pixels and we need the non-power-of-two align macro here. This reverts the revert from 4f9a211b, but keeps the change from a827b553 that fixed the yuv if-else mix-up. --- src/isl/isl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/isl/isl.c b/src/isl/isl.c index 3823a720660..6c49164615b 100644 --- a/src/isl/isl.c +++ b/src/isl/isl.c @@ -833,9 +833,9 @@ isl_calc_row_pitch(const struct isl_device *dev, */ if (info->usage & ISL_SURF_USAGE_RENDER_TARGET_BIT) { if (isl_format_is_yuv(info->format)) { - row_pitch = isl_align(row_pitch, 2 * fmtl->bs); + row_pitch = isl_align_npot(row_pitch, 2 * fmtl->bs); } else { - row_pitch = isl_align(row_pitch, fmtl->bs); + row_pitch = isl_align_npot(row_pitch, fmtl->bs); } } break; -- 2.11.0