Mesa (main): zink: rename imageless framebuffer functions

[GitLab Mirror]

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

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

zink: rename imageless framebuffer functions

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     | 6 +++---
 src/gallium/drivers/zink/zink_framebuffer.c | 4 ++--
 src/gallium/drivers/zink/zink_framebuffer.h | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 8b6f94a300a..77db0b28f6d 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 = zink_get_framebuffer_imageless(ctx);
+   struct zink_framebuffer *fb = zink_get_framebuffer(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;
 
-   zink_init_framebuffer_imageless(screen, ctx->framebuffer, rp);
+   zink_init_framebuffer(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 = zink_get_framebuffer_imageless(ctx);
+   struct zink_framebuffer *fb = zink_get_framebuffer(ctx);
    ctx->fb_changed |= ctx->framebuffer != fb;
    ctx->framebuffer = fb;
 }
diff --git a/src/gallium/drivers/zink/zink_framebuffer.c b/src/gallium/drivers/zink/zink_framebuffer.c
index 46f44552cfe..f6ab4807403 100644
--- a/src/gallium/drivers/zink/zink_framebuffer.c
+++ b/src/gallium/drivers/zink/zink_framebuffer.c
@@ -49,7 +49,7 @@ zink_destroy_framebuffer(struct zink_screen *screen,
 }
 
 void
-zink_init_framebuffer_imageless(struct zink_screen *screen, struct zink_framebuffer *fb, struct zink_render_pass *rp)
+zink_init_framebuffer(struct zink_screen *screen, struct zink_framebuffer *fb, struct zink_render_pass *rp)
 {
    VkFramebuffer ret;
 
@@ -144,7 +144,7 @@ zink_use_dummy_attachments(const struct zink_context *ctx)
 }
 
 struct zink_framebuffer *
-zink_get_framebuffer_imageless(struct zink_context *ctx)
+zink_get_framebuffer(struct zink_context *ctx)
 {
    assert(zink_screen(ctx->base.screen)->info.have_KHR_imageless_framebuffer);
 
diff --git a/src/gallium/drivers/zink/zink_framebuffer.h b/src/gallium/drivers/zink/zink_framebuffer.h
index 669d3e7b2f4..6ec92544ee5 100644
--- a/src/gallium/drivers/zink/zink_framebuffer.h
+++ b/src/gallium/drivers/zink/zink_framebuffer.h
@@ -62,7 +62,7 @@ struct zink_framebuffer {
 };
 
 void
-zink_init_framebuffer_imageless(struct zink_screen *screen, struct zink_framebuffer *fb, struct zink_render_pass *rp);
+zink_init_framebuffer(struct zink_screen *screen, struct zink_framebuffer *fb, struct zink_render_pass *rp);
 
 void
 zink_destroy_framebuffer(struct zink_screen *screen,
@@ -89,5 +89,5 @@ zink_framebuffer_reference(struct zink_screen *screen,
 }
 
 struct zink_framebuffer *
-zink_get_framebuffer_imageless(struct zink_context *ctx);
+zink_get_framebuffer(struct zink_context *ctx);
 #endif