diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-04-04 11:50:25 -0400 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-04-06 04:49:00 +0000 |
| commit | 7cf7e113bacc9b12124c11ac49023a6c8c8b7b17 (patch) | |
| tree | a3e6fc4d98017aa99cba7b5b6f7a66a93a2f72ac | |
| parent | e72ca7e7acd96f864594170d3e9015a689cb898e (diff) | |
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>
| -rw-r--r-- | src/gallium/drivers/zink/zink_context.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index a3ddf6868d3..52d3a090888 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -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; - - 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; + 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); + } - 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, |