Mesa (main): zink: remove framebuffer indirection

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 623de06056ae1a7f8bd444152cf1cb33776634d7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=623de06056ae1a7f8bd444152cf1cb33776634d7

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue Apr 12 15:00:38 2022 -0400

zink: remove framebuffer indirection

Acked-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15904>

---

 src/gallium/drivers/zink/zink_context.c | 9 +++------
 src/gallium/drivers/zink/zink_context.h | 2 --
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index aab0473a3b5..8b6f94a300a 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -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;
diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h
index ac00aaa46d4..e462753bc49 100644
--- a/src/gallium/drivers/zink/zink_context.h
+++ b/src/gallium/drivers/zink/zink_context.h
@@ -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;