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

zink: remove framebuffer indirection 

Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15904>
This commit is contained in:
Mike Blumenkrantz 2022-04-12 15:00:38 -04:00 committed by Marge Bot
parent fe8212791f
commit 623de06056
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/drivers/zink/zink_context.c
View File

@ -2128,7 +2128,7 @@ update_framebuffer_state(struct zink_context *ctx, int old_w, int old_h)
* always do get_framebuffer first to avoid deleting the same fb
* we're about to use
*/
struct zink_framebuffer *fb = ctx->get_framebuffer(ctx);
struct zink_framebuffer *fb = zink_get_framebuffer_imageless(ctx);
ctx->fb_changed |= ctx->framebuffer != fb;
ctx->framebuffer = fb;
}
@ -2192,7 +2192,7 @@ setup_framebuffer(struct zink_context *ctx)
if (!ctx->fb_changed)
return;
ctx->init_framebuffer(screen, ctx->framebuffer, rp);
zink_init_framebuffer_imageless(screen, ctx->framebuffer, rp);
ctx->fb_changed = false;
ctx->gfx_pipeline_state.render_pass = rp;
}
@ -3857,7 +3857,7 @@ zink_rebind_framebuffer(struct zink_context *ctx, struct zink_resource *res)
return;
zink_batch_no_rp(ctx);
struct zink_framebuffer *fb = ctx->get_framebuffer(ctx);
struct zink_framebuffer *fb = zink_get_framebuffer_imageless(ctx);
ctx->fb_changed |= ctx->framebuffer != fb;
ctx->framebuffer = fb;
}
@ -4215,9 +4215,6 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
ctx->base.screen = pscreen;
ctx->base.priv = priv;
ctx->get_framebuffer = zink_get_framebuffer_imageless;
ctx->init_framebuffer = zink_init_framebuffer_imageless;
ctx->base.destroy = zink_context_destroy;
ctx->base.get_device_reset_status = zink_get_device_reset_status;
ctx->base.set_device_reset_callback = zink_set_device_reset_callback;

2
src/gallium/drivers/zink/zink_context.h
View File

@ -215,8 +215,6 @@ struct zink_context {
struct zink_image_view image_views[PIPE_SHADER_TYPES][ZINK_MAX_SHADER_IMAGES];
struct pipe_framebuffer_state fb_state;
struct zink_framebuffer *(*get_framebuffer)(struct zink_context*);
void (*init_framebuffer)(struct zink_screen *screen, struct zink_framebuffer *fb, struct zink_render_pass *rp);
struct hash_table framebuffer_cache;
struct zink_vertex_elements_state *element_state;