From: Chad Versace <chad.versace@intel.com>
Date: Thu, 31 Dec 2015 00:26:10 +0000 (-0800)
Subject: isl: Fix assertion failure for npot pixel formats
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=96d1baa88d37c51c94579f650cfd9465d28634f4;p=mesa.git

isl: Fix assertion failure for npot pixel formats

When aligning to isl_format_layout::bs (which is the number of bytes in
the pixel), use isl_align_npot() instead of isl_align(), because
isl_align() works only for power-of-2 alignment.

Fixes assertion in
dEQP-VK.pipeline.image.view_type.1d.format.r16g16b16_sfloat.size.512x1.
---

diff --git a/src/isl/isl.c b/src/isl/isl.c
index 75f65001a1e..2bf15017e2f 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(row_pitch, fmtl->bs);
+            row_pitch = isl_align_npot(row_pitch, fmtl->bs);
          } else  {
-            row_pitch = isl_align(row_pitch, 2 * fmtl->bs);
+            row_pitch = isl_align_npot(row_pitch, 2 * fmtl->bs);
          }
       }
       break;