fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 21:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: track a bitmask of fb attachments with mismatched layer counts

Browse source 
these need special handling for clears

Acked-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17366>
This commit is contained in:
Mike Blumenkrantz 2022-07-08 11:35:39 -04:00 • committed by Marge Bot
parent 9d68684240
commit 631db579af
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/zink/zink_context.c
View file

@ -2746,6 +2746,7 @@ zink_set_framebuffer_state(struct pipe_context *pctx,
unsigned prev_void_alpha_attachments = ctx->gfx_pipeline_state.void_alpha_attachments;
ctx->gfx_pipeline_state.void_alpha_attachments = 0;
ctx->transient_attachments = 0;
ctx->fb_layer_mismatch = 0;
ctx->dynamic_fb.info.renderArea.offset.x = 0;
ctx->dynamic_fb.info.renderArea.offset.y = 0;
@ -2766,6 +2767,8 @@ zink_set_framebuffer_state(struct pipe_context *pctx,
if (!samples)
samples = MAX3(transient ? transient->base.nr_samples : 1, psurf->texture->nr_samples, 1);
struct zink_resource *res = zink_resource(psurf->texture);
if (zink_csurface(psurf)->info.layerCount > layers)
ctx->fb_layer_mismatch |= BITFIELD_BIT(i);
if (res->modifiers) {
assert(!ctx->needs_present || ctx->needs_present == res);
ctx->needs_present = res;
@ -2794,6 +2797,8 @@ zink_set_framebuffer_state(struct pipe_context *pctx,
ctx->transient_attachments |= BITFIELD_BIT(PIPE_MAX_COLOR_BUFS);
if (!samples)
samples = MAX3(transient ? transient->base.nr_samples : 1, psurf->texture->nr_samples, 1);
if (zink_csurface(psurf)->info.layerCount > layers)
ctx->fb_layer_mismatch |= BITFIELD_BIT(PIPE_MAX_COLOR_BUFS);
zink_resource(psurf->texture)->fb_binds++;
}
rebind_fb_state(ctx, NULL, true);

1
src/gallium/drivers/zink/zink_context.h
View file

@ -267,6 +267,7 @@ struct zink_context {
VkRenderingAttachmentInfo attachments[PIPE_MAX_COLOR_BUFS + 2]; //+depth, +stencil
VkRenderingInfo info;
} dynamic_fb;
uint32_t fb_layer_mismatch; //bitmask
struct set rendering_state_cache;
struct set render_pass_state_cache;
struct hash_table *render_pass_cache;