fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-04 12:50:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

zink: Make wrap_surface return a zink_ctx_surface directly

Browse source 
Avoids to cast if back to zink_ctx_surface afterwards.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28025>
This commit is contained in:
Corentin Noël 2024-03-08 14:29:45 +01:00 • committed by Marge Bot
parent 2a77a46837
commit faaa65a1a3
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/zink/zink_surface.c
View file

@ -268,7 +268,7 @@ zink_get_surface(struct zink_context *ctx,
}
/* wrap a surface for use as a framebuffer attachment */
static struct pipe_surface *
static struct zink_ctx_surface *
wrap_surface(struct pipe_context *pctx, const struct pipe_surface *psurf)
{
struct zink_ctx_surface *csurf = CALLOC_STRUCT(zink_ctx_surface);
@ -276,13 +276,13 @@ wrap_surface(struct pipe_context *pctx, const struct pipe_surface *psurf)
mesa_loge("ZINK: failed to allocate csurf!");
return NULL;
}
csurf->base = *psurf;
pipe_reference_init(&csurf->base.reference, 1);
csurf->surf = (struct zink_surface*)psurf;
csurf->base.context = pctx;
return &csurf->base;
return csurf;
}
/* this the context hook that returns a zink_ctx_surface */
@ -338,7 +338,7 @@ zink_create_surface(struct pipe_context *pctx,
if (!psurf && !needs_mutable)
return NULL;
struct zink_ctx_surface *csurf = (struct zink_ctx_surface*)wrap_surface(pctx, needs_mutable ? templ : psurf);
struct zink_ctx_surface *csurf = wrap_surface(pctx, needs_mutable ? templ : psurf);
csurf->needs_mutable = needs_mutable;
if (needs_mutable) {
csurf->surf = NULL;
@ -355,7 +355,7 @@ zink_create_surface(struct pipe_context *pctx,
if (!transient)
return NULL;
ivci.image = transient->obj->image;
csurf->transient = (struct zink_ctx_surface*)wrap_surface(pctx, (struct pipe_surface*)create_surface(pctx, &transient->base.b, templ, &ivci, true));
csurf->transient = wrap_surface(pctx, (struct pipe_surface*)create_surface(pctx, &transient->base.b, templ, &ivci, true));
if (!csurf->transient) {
pipe_resource_reference((struct pipe_resource**)&transient, NULL);
pipe_surface_release(pctx, &psurf);