From 5f4ad65daf650867679187126fdc67bd845c569c Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 26 Feb 2022 00:56:51 -0800 Subject: [PATCH] blorp: Make blitter_supports_aux accessible from multiple files. We'll want it in blorp_clear.c shortly. Reviewed-by: Jason Ekstrand Reviewed-by: Ivan Briano Reviewed-by: Jordan Justen Part-of: --- 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 6bd68b5..8b13057 100644 --- a/src/intel/blorp/blorp_blit.c +++ b/src/intel/blorp/blorp_blit.c @@ -2456,9 +2456,9 @@ blorp_blit_supports_compute(struct blorp_context *blorp, } } -static bool -blitter_supports_aux(const struct intel_device_info *devinfo, - enum isl_aux_usage aux_usage) +bool +blorp_blitter_supports_aux(const struct intel_device_info *devinfo, + enum isl_aux_usage aux_usage) { switch (aux_usage) { case ISL_AUX_USAGE_NONE: @@ -2486,10 +2486,10 @@ blorp_copy_supports_blitter(struct blorp_context *blorp, if (dst_surf->samples > 1 || src_surf->samples > 1) return false; - if (!blitter_supports_aux(devinfo, dst_aux_usage)) + if (!blorp_blitter_supports_aux(devinfo, dst_aux_usage)) return false; - if (!blitter_supports_aux(devinfo, src_aux_usage)) + if (!blorp_blitter_supports_aux(devinfo, src_aux_usage)) return false; const struct isl_format_layout *fmtl = diff --git a/src/intel/blorp/blorp_priv.h b/src/intel/blorp/blorp_priv.h index d57e6f4..932b3fd 100644 --- a/src/intel/blorp/blorp_priv.h +++ b/src/intel/blorp/blorp_priv.h @@ -412,6 +412,9 @@ struct brw_blorp_blit_prog_key * Used internally by gfx6_blorp_exec() and gfx7_blorp_exec(). */ +bool blorp_blitter_supports_aux(const struct intel_device_info *devinfo, + enum isl_aux_usage aux_usage); + void brw_blorp_init_wm_prog_key(struct brw_wm_prog_key *wm_key); void brw_blorp_init_cs_prog_key(struct brw_cs_prog_key *cs_key); -- 2.7.4