NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

radeonsi: cosmetic changes around do_hardware_msaa_resolve

Browse source 
- move gfx_level checking into the function
- rename the function
- call it in si_blit later
- set the SQTT event

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17864>
This commit is contained in:
Marek Olšák 2022-07-23 12:29:05 -04:00 • committed by Marge Bot
parent b1b0a860a5
commit 28842d96df
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/gallium/drivers/radeonsi/si_blit.c
View file

@ -1026,9 +1026,14 @@ static bool resolve_formats_compatible(enum pipe_format src, enum pipe_format ds
return *need_rgb_to_bgr;
}
static bool do_hardware_msaa_resolve(struct pipe_context *ctx, const struct pipe_blit_info *info)
static bool si_msaa_resolve_blit_via_CB(struct pipe_context *ctx, const struct pipe_blit_info *info)
{
struct si_context *sctx = (struct si_context *)ctx;
/* Gfx11 doesn't have CB_RESOLVE. */
if (sctx->gfx_level >= GFX11)
return false;
struct si_texture *src = (struct si_texture *)info->src.resource;
struct si_texture *dst = (struct si_texture *)info->dst.resource;
ASSERTED struct si_texture *stmp;
@ -1156,11 +1161,6 @@ static void si_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
struct si_context *sctx = (struct si_context *)ctx;
struct si_texture *sdst = (struct si_texture *)info->dst.resource;
/* Gfx11 doesn't have CB_RESOLVE. */
/* TODO: Use compute-based resolving instead. */
if (sctx->gfx_level < GFX11 && do_hardware_msaa_resolve(ctx, info))
return;
if (sctx->gfx_level >= GFX7 &&
(info->dst.resource->bind & PIPE_BIND_PRIME_BLIT_DST) && sdst->surface.is_linear &&
/* Use SDMA or async compute when copying to a DRI_PRIME imported linear surface. */
@ -1196,6 +1196,12 @@ static void si_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
simple_mtx_unlock(&sscreen->async_compute_context_lock);
}
if (unlikely(sctx->thread_trace_enabled))
sctx->sqtt_next_event = EventCmdResolveImage;
if (si_msaa_resolve_blit_via_CB(ctx, info))
return;
if (unlikely(sctx->thread_trace_enabled))
sctx->sqtt_next_event = EventCmdCopyImage;