fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 02:38:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: move fb attachment init to new function

Browse source 
this is going to get more complicated

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12934>
This commit is contained in:
Mike Blumenkrantz 2021-09-17 09:12:39 -04:00 • committed by Marge Bot
parent a4dcacf18f
commit 44da321982
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1702,12 +1702,11 @@ setup_framebuffer(struct zink_context *ctx)
} }
static VkImageView static VkImageView
prep_fb_attachment(struct zink_context *ctx, struct pipe_surface *psurf, unsigned i) prep_fb_attachment(struct zink_context *ctx, struct zink_surface *surf, unsigned i)
{ {
if (!psurf) if (!surf)
return zink_csurface(ctx->dummy_surface[util_logbase2_ceil(ctx->fb_state.samples)])->image_view; return zink_csurface(ctx->dummy_surface[util_logbase2_ceil(ctx->fb_state.samples)])->image_view;
struct zink_surface *surf = zink_csurface(psurf);
zink_batch_resource_usage_set(&ctx->batch, zink_resource(surf->base.texture), true); zink_batch_resource_usage_set(&ctx->batch, zink_resource(surf->base.texture), true);
zink_batch_usage_set(&surf->batch_uses, ctx->batch.state); zink_batch_usage_set(&surf->batch_uses, ctx->batch.state);
@ -1720,6 +1719,21 @@ prep_fb_attachment(struct zink_context *ctx, struct pipe_surface *psurf, unsigne
return surf->image_view; return surf->image_view;
} }
static void
prep_fb_attachments(struct zink_context *ctx, VkImageView *att)
{
const unsigned cresolve_offset = ctx->fb_state.nr_cbufs + !!ctx->fb_state.zsbuf;
unsigned num_resolves = 0;
for (int i = 0; i < ctx->fb_state.nr_cbufs; i++) {
struct zink_surface *surf = zink_csurface(ctx->fb_state.cbufs[i]);
att[i] = prep_fb_attachment(ctx, surf, i);
}
if (ctx->fb_state.zsbuf) {
struct zink_surface *surf = zink_csurface(ctx->fb_state.zsbuf);
att[ctx->fb_state.nr_cbufs] = prep_fb_attachment(ctx, surf, ctx->fb_state.nr_cbufs);
}
}
static unsigned static unsigned
begin_render_pass(struct zink_context *ctx) begin_render_pass(struct zink_context *ctx)
{ {
@ -1784,9 +1798,7 @@ begin_render_pass(struct zink_context *ctx)
infos.pNext = NULL; infos.pNext = NULL;
infos.attachmentCount = ctx->framebuffer->state.num_attachments; infos.attachmentCount = ctx->framebuffer->state.num_attachments;
infos.pAttachments = att; infos.pAttachments = att;
for (int i = 0; i < ctx->fb_state.nr_cbufs; i++) prep_fb_attachments(ctx, att);
att[i] = prep_fb_attachment(ctx, ctx->fb_state.cbufs[i], i);
att[ctx->fb_state.nr_cbufs] = prep_fb_attachment(ctx, ctx->fb_state.zsbuf, ctx->fb_state.nr_cbufs);
if (zink_screen(ctx->base.screen)->info.have_KHR_imageless_framebuffer) { if (zink_screen(ctx->base.screen)->info.have_KHR_imageless_framebuffer) {
#ifndef NDEBUG #ifndef NDEBUG
for (int i = 0; i < ctx->fb_state.nr_cbufs; i++) { for (int i = 0; i < ctx->fb_state.nr_cbufs; i++) {