From 4f9a211b4a036c3d5854e99ddbebb4bc0ef327df Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 30 Dec 2015 21:01:55 -0800 Subject: [PATCH] Revert "isl: Fix assertion failure for npot pixel formats" This reverts commit 96d1baa88d37c51c94579f650cfd9465d28634f4. --- 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 2bf15017e2f..75f65001a1e 100644 --- a/src/isl/isl.c +++ b/src/isl/isl.c @@ -813,9 +813,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_npot(row_pitch, fmtl->bs); + row_pitch = isl_align(row_pitch, fmtl->bs); } else { - row_pitch = isl_align_npot(row_pitch, 2 * fmtl->bs); + row_pitch = isl_align(row_pitch, 2 * fmtl->bs); } } break; -- 2.30.2