zink: rename imageless framebuffer functions

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:01:31 -04:00
committed by Marge Bot
parent 623de06056
commit 00f2517391
3 changed files with 7 additions and 7 deletions
+3 -3
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 = 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;
}
+2 -2
View File
@@ -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);
+2 -2
View File
@@ -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