From d62ca48c31f8dcbc90c6ae9a8e01a668cc9fe68e Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Sun, 1 Sep 2019 09:07:38 -0500 Subject: [PATCH] intel/blorp: Expose surf_fake_interleaved_msaa internally --- src/intel/blorp/blorp_blit.c | 10 +++++----- src/intel/blorp/blorp_priv.h | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c index 53efe0d78ec..a43aa88d0db 100644 --- a/src/intel/blorp/blorp_blit.c +++ b/src/intel/blorp/blorp_blit.c @@ -1609,9 +1609,9 @@ blorp_surf_convert_to_single_slice(const struct isl_device *isl_dev, info->z_offset = 0; } -static void -surf_fake_interleaved_msaa(const struct isl_device *isl_dev, - struct brw_blorp_surface_info *info) +void +blorp_surf_fake_interleaved_msaa(const struct isl_device *isl_dev, + struct brw_blorp_surface_info *info) { assert(info->surf.msaa_layout == ISL_MSAA_LAYOUT_INTERLEAVED); @@ -1639,7 +1639,7 @@ blorp_surf_retile_w_to_y(const struct isl_device *isl_dev, */ if (isl_dev->info->gen > 6 && info->surf.msaa_layout == ISL_MSAA_LAYOUT_INTERLEAVED) { - surf_fake_interleaved_msaa(isl_dev, info); + blorp_surf_fake_interleaved_msaa(isl_dev, info); } if (isl_dev->info->gen == 6) { @@ -1881,7 +1881,7 @@ try_blorp_blit(struct blorp_batch *batch, params->x1 = ALIGN(params->x1, 2) * px_size_sa.width; params->y1 = ALIGN(params->y1, 2) * px_size_sa.height; - surf_fake_interleaved_msaa(batch->blorp->isl_dev, ¶ms->dst); + blorp_surf_fake_interleaved_msaa(batch->blorp->isl_dev, ¶ms->dst); wm_prog_key->use_kill = true; wm_prog_key->need_dst_offset = true; diff --git a/src/intel/blorp/blorp_priv.h b/src/intel/blorp/blorp_priv.h index 5ec8d62553e..ddd118f1349 100644 --- a/src/intel/blorp/blorp_priv.h +++ b/src/intel/blorp/blorp_priv.h @@ -84,6 +84,9 @@ blorp_surf_convert_to_uncompressed(const struct isl_device *isl_dev, uint32_t *x, uint32_t *y, uint32_t *width, uint32_t *height); void +blorp_surf_fake_interleaved_msaa(const struct isl_device *isl_dev, + struct brw_blorp_surface_info *info); +void blorp_surf_retile_w_to_y(const struct isl_device *isl_dev, struct brw_blorp_surface_info *info); -- 2.30.2