zink: apply fb attachment layout to dummy attachments

this doesn't actually matter but it still triggers validation spam

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15716>
This commit is contained in:
Mike Blumenkrantz 2022-04-04 11:50:25 -04:00 committed by Marge Bot
parent e72ca7e7ac
commit 7cf7e113ba

View file

@ -2096,13 +2096,16 @@ setup_framebuffer(struct zink_context *ctx)
static VkImageView
prep_fb_attachment(struct zink_context *ctx, struct zink_surface *surf, unsigned i)
{
if (!surf || (i < ctx->fb_state.nr_cbufs && zink_use_dummy_attachments(ctx)))
return zink_csurface(ctx->dummy_surface[util_logbase2_ceil(ctx->fb_state.samples)])->image_view;
struct zink_resource *res;
if (!surf || (i < ctx->fb_state.nr_cbufs && zink_use_dummy_attachments(ctx))) {
surf = zink_csurface(ctx->dummy_surface[util_logbase2_ceil(ctx->fb_state.samples)]);
res = zink_resource(surf->base.texture);
} else {
res = zink_resource(surf->base.texture);
zink_batch_resource_usage_set(&ctx->batch, res, true);
zink_batch_usage_set(&surf->batch_uses, ctx->batch.state);
}
zink_batch_resource_usage_set(&ctx->batch, zink_resource(surf->base.texture), true);
zink_batch_usage_set(&surf->batch_uses, ctx->batch.state);
struct zink_resource *res = zink_resource(surf->base.texture);
VkAccessFlags access;
VkPipelineStageFlags pipeline;
VkImageLayout layout = zink_render_pass_attachment_get_barrier_info(ctx->gfx_pipeline_state.render_pass,