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

zink: break out resource bind-adding into separate function for reuse 

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16252>
This commit is contained in:
Mike Blumenkrantz 2022-04-29 07:41:02 -04:00 committed by Marge Bot
parent 1c20688dcc
commit afa4c402dd
1 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/gallium/drivers/zink/zink_resource.c
View File

@ -1017,6 +1017,45 @@ zink_resource_create_drawable(struct pipe_screen *pscreen,
return resource_create(pscreen, templ, NULL, 0, NULL, 0, loader_private);
}
static bool
add_resource_bind(struct zink_context *ctx, struct zink_resource *res, unsigned bind)
{
struct zink_screen *screen = zink_screen(ctx->base.screen);
assert((res->base.b.bind & bind) == 0);
zink_resource_image_barrier(ctx, res, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, 0, 0);
res->base.b.bind |= bind;
struct zink_resource_object *old_obj = res->obj;
struct zink_resource_object *new_obj = resource_object_create(screen, &res->base.b, NULL, &res->optimal_tiling, res->modifiers, res->modifiers_count, NULL);
if (!new_obj) {
debug_printf("new backing resource alloc failed!");
res->base.b.bind &= ~bind;
return false;
}
struct zink_resource staging = *res;
staging.obj = old_obj;
staging.all_binds = 0;
res->layout = VK_IMAGE_LAYOUT_UNDEFINED;
res->obj->access = 0;
res->obj->access_stage = 0;
bool needs_unref = true;
if (zink_resource_has_usage(res)) {
zink_batch_reference_resource_move(&ctx->batch, res);
needs_unref = false;
}
res->obj = new_obj;
zink_descriptor_set_refs_clear(&old_obj->desc_set_refs, old_obj);
for (unsigned i = 0; i <= res->base.b.last_level; i++) {
struct pipe_box box = {0, 0, 0,
u_minify(res->base.b.width0, i),
u_minify(res->base.b.height0, i), res->base.b.array_size};
box.depth = util_num_layers(&res->base.b, i);
ctx->base.resource_copy_region(&ctx->base, &res->base.b, i, 0, 0, 0, &staging.base.b, i, &box);
}
if (needs_unref)
zink_resource_object_reference(screen, &old_obj, NULL);
return true;
}
static bool
zink_resource_get_param(struct pipe_screen *pscreen, struct pipe_context *pctx,
struct pipe_resource *pres,
@ -1819,7 +1858,6 @@ zink_resource_get_separate_stencil(struct pipe_resource *pres)
bool
zink_resource_object_init_storage(struct zink_context *ctx, struct zink_resource *res)
{
struct zink_screen *screen = zink_screen(ctx->base.screen);
/* base resource already has the cap */
if (res->base.b.bind & PIPE_BIND_SHADER_IMAGE)
return true;
@ -1829,41 +1867,11 @@ zink_resource_object_init_storage(struct zink_context *ctx, struct zink_resource
}
assert(!res->obj->dt);
zink_fb_clears_apply_region(ctx, &res->base.b, (struct u_rect){0, res->base.b.width0, 0, res->base.b.height0});
zink_resource_image_barrier(ctx, res, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, 0, 0);
res->base.b.bind |= PIPE_BIND_SHADER_IMAGE;
struct zink_resource_object *old_obj = res->obj;
struct zink_resource_object *new_obj = resource_object_create(screen, &res->base.b, NULL, &res->optimal_tiling, res->modifiers, res->modifiers_count, NULL);
if (!new_obj) {
debug_printf("new backing resource alloc failed!");
res->base.b.bind &= ~PIPE_BIND_SHADER_IMAGE;
return false;
}
struct zink_resource staging = *res;
staging.obj = old_obj;
staging.all_binds = 0;
res->layout = VK_IMAGE_LAYOUT_UNDEFINED;
res->obj->access = 0;
res->obj->access_stage = 0;
bool needs_unref = true;
if (zink_resource_has_usage(res)) {
zink_batch_reference_resource_move(&ctx->batch, res);
needs_unref = false;
}
res->obj = new_obj;
zink_descriptor_set_refs_clear(&old_obj->desc_set_refs, old_obj);
for (unsigned i = 0; i <= res->base.b.last_level; i++) {
struct pipe_box box = {0, 0, 0,
u_minify(res->base.b.width0, i),
u_minify(res->base.b.height0, i), res->base.b.array_size};
box.depth = util_num_layers(&res->base.b, i);
ctx->base.resource_copy_region(&ctx->base, &res->base.b, i, 0, 0, 0, &staging.base.b, i, &box);
}
if (needs_unref)
zink_resource_object_reference(screen, &old_obj, NULL);
bool ret = add_resource_bind(ctx, res, PIPE_BIND_SHADER_IMAGE);
if (ret)
zink_resource_rebind(ctx, res);
zink_resource_rebind(ctx, res);
return true;
return ret;
}
void