From b1311a48e093ebe7ee6162e2afe1886728866918 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 1 Sep 2016 18:57:18 -0700 Subject: [PATCH] intel/isl: Allow multisampling with ISL_FORMAT_HiZ HiZ buffers can be multisampled and, on Broadwell and earlier, simply using interleaved multisampling with a compression block size of 8x4 samples yields the correct HiZ surface size calculations. Unfortunately, choose_msaa_layout was rejecting multisampled HiZ buffers because of format checks. Now that we have a simple helper for determining if a format supports multisampling, that's an easy enough issue to fix. Signed-off-by: Jason Ekstrand Reviewed-by: Chad Versace Reviewed-by: Nanley Chery --- src/intel/isl/isl.c | 4 +++- src/intel/isl/isl_format.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 26ee4c4..a53f46f 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -594,7 +594,6 @@ isl_calc_phys_level0_extent_sa(const struct isl_device *dev, assert(info->depth == 1); assert(info->levels == 1); assert(isl_format_supports_multisampling(dev->info, info->format)); - assert(fmtl->bw == 1 && fmtl->bh == 1); *phys_level0_sa = (struct isl_extent4d) { .w = info->width, @@ -606,6 +605,9 @@ isl_calc_phys_level0_extent_sa(const struct isl_device *dev, isl_msaa_interleaved_scale_px_to_sa(info->samples, &phys_level0_sa->w, &phys_level0_sa->h); + + phys_level0_sa->w = isl_align(phys_level0_sa->w, fmtl->bw); + phys_level0_sa->h = isl_align(phys_level0_sa->h, fmtl->bh); break; } break; diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c index 81c01e0..daf2d81 100644 --- a/src/intel/isl/isl_format.c +++ b/src/intel/isl/isl_format.c @@ -444,9 +444,16 @@ isl_format_supports_multisampling(const struct gen_device_info *devinfo, * - any compressed texture format (BC*) * - any YCRCB* format * - * The restriction on the format's size is removed on Broadwell. + * The restriction on the format's size is removed on Broadwell. Also, + * there is an exception for HiZ which we treat as a compressed format and + * is allowed to be multisampled on Broadwell and earlier. */ - if (devinfo->gen < 8 && isl_format_get_layout(format)->bpb > 64) { + if (format == ISL_FORMAT_HIZ) { + /* On SKL+, HiZ is always single-sampled even when the primary surface + * is multisampled. See also isl_surf_get_hiz_surf(). + */ + return devinfo->gen <= 8; + } else if (devinfo->gen < 8 && isl_format_get_layout(format)->bpb > 64) { return false; } else if (isl_format_is_compressed(format)) { return false; -- 2.7.4