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.

diff --git a/src/isl/isl.c b/src/isl/isl.c
index 3823a72066096d60967bb8dc0d779c5e94d7c2fd..6c49164615b9df12ceab64f5937cf76e2331a6b1 100644 (file)
--- 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;