AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: force imageless fb rebind if rebinding an attachment

Browse Source 
ensure that the STORAGE usage gets picked up here

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12843>
This commit is contained in:
Mike Blumenkrantz
2021-09-02 15:20:43 -04:00
committed by Marge Bot
parent 372f7d4726
commit ad57bb1b7d
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_context.c
+15 -4
View File
@@ -3161,22 +3161,33 @@ zink_rebind_framebuffer(struct zink_context *ctx, struct zink_resource *res)
{
if (!ctx->framebuffer)
return;
bool did_rebind = false;
if (res->aspect & VK_IMAGE_ASPECT_COLOR_BIT) {
for (unsigned i = 0; i < ctx->fb_state.nr_cbufs; i++) {
if (!ctx->fb_state.cbufs[i] ||
zink_resource(ctx->fb_state.cbufs[i]->texture) != res)
continue;
zink_rebind_ctx_surface(ctx, &ctx->fb_state.cbufs[i]);
zink_batch_no_rp(ctx);
did_rebind = true;
}
} else {
if (ctx->fb_state.zsbuf && zink_resource(ctx->fb_state.zsbuf->texture) != res) {
zink_rebind_ctx_surface(ctx, &ctx->fb_state.zsbuf);
zink_batch_no_rp(ctx);
did_rebind = true;
}
}
if (rebind_fb_state(ctx, res, false))
zink_batch_no_rp(ctx);
did_rebind |= rebind_fb_state(ctx, res, false);
if (!did_rebind)
return;
zink_batch_no_rp(ctx);
if (zink_screen(ctx->base.screen)->info.have_KHR_imageless_framebuffer) {
struct zink_framebuffer *fb = ctx->get_framebuffer(ctx);
ctx->fb_changed |= ctx->framebuffer != fb;
ctx->framebuffer = fb;
}
}
ALWAYS_INLINE static struct zink_resource *