Revert "isl: Fix assertion failure for npot pixel formats"

This reverts commit 96d1baa88d37c51c94579f650cfd9465d28634f4.

diff --git a/src/isl/isl.c b/src/isl/isl.c
index 2bf15017e2fc57ecb506c8966c2440c7e0e462ba..75f65001a1eb76cb4faab1d135133fe635ac2b3b 100644 (file)
--- 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;