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.
This commit is contained in:
Kristian Høgsberg Kristensen 2016-01-04 10:53:47 -08:00
parent abc1c9878f
commit 0f34a4ec4e
1 changed files with 2 additions and 2 deletions

View File

@ -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;