From e2abf7d28d276331b45aafde837a2c4396095177 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 22 Mar 2022 15:10:02 -0400 Subject: [PATCH] zink: move blit src/dst decls up in function no changes Reviewed-by: Erik Faye-Lund Part-of: --- src/gallium/drivers/zink/zink_blit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c index 4d5d63ef80c..0fe77b25d55 100644 --- a/src/gallium/drivers/zink/zink_blit.c +++ b/src/gallium/drivers/zink/zink_blit.c @@ -264,6 +264,9 @@ zink_blit(struct pipe_context *pctx, unlikely(!zink_screen(pctx->screen)->info.have_EXT_conditional_rendering && !zink_check_conditional_render(ctx))) return; + struct zink_resource *src = zink_resource(info->src.resource); + struct zink_resource *dst = zink_resource(info->dst.resource); + if (src_desc == dst_desc || src_desc->nr_channels != 4 || src_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN || (src_desc->nr_channels == 4 && src_desc->channel[3].type != UTIL_FORMAT_TYPE_VOID)) { @@ -280,8 +283,6 @@ zink_blit(struct pipe_context *pctx, } } - struct zink_resource *src = zink_resource(info->src.resource); - struct zink_resource *dst = zink_resource(info->dst.resource); /* if we're copying between resources with matching aspects then we can probably just copy_region */ if (src->aspect == dst->aspect) { struct pipe_blit_info new_info = *info;