zink: fail context creation more gracefully
handle some cases where context creation fails earlier than expected cc: mesa-stable Reviewed-by: Dave Airlie <airlied@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13844>
This commit is contained in:
parent
72a88c77de
commit
a3be30665f
|
@ -100,11 +100,14 @@ zink_context_destroy(struct pipe_context *pctx)
|
||||||
pipe_surface_release(&ctx->base, &ctx->dummy_surface[i]);
|
pipe_surface_release(&ctx->base, &ctx->dummy_surface[i]);
|
||||||
zink_buffer_view_reference(screen, &ctx->dummy_bufferview, NULL);
|
zink_buffer_view_reference(screen, &ctx->dummy_bufferview, NULL);
|
||||||
|
|
||||||
zink_descriptors_deinit_bindless(ctx);
|
if (ctx->dd)
|
||||||
|
zink_descriptors_deinit_bindless(ctx);
|
||||||
|
|
||||||
simple_mtx_destroy(&ctx->batch_mtx);
|
simple_mtx_destroy(&ctx->batch_mtx);
|
||||||
zink_clear_batch_state(ctx, ctx->batch.state);
|
if (ctx->batch.state) {
|
||||||
zink_batch_state_destroy(screen, ctx->batch.state);
|
zink_clear_batch_state(ctx, ctx->batch.state);
|
||||||
|
zink_batch_state_destroy(screen, ctx->batch.state);
|
||||||
|
}
|
||||||
struct zink_batch_state *bs = ctx->batch_states;
|
struct zink_batch_state *bs = ctx->batch_states;
|
||||||
while (bs) {
|
while (bs) {
|
||||||
struct zink_batch_state *bs_next = bs->next;
|
struct zink_batch_state *bs_next = bs->next;
|
||||||
|
@ -149,7 +152,8 @@ zink_context_destroy(struct pipe_context *pctx)
|
||||||
_mesa_hash_table_destroy(ctx->render_pass_cache, NULL);
|
_mesa_hash_table_destroy(ctx->render_pass_cache, NULL);
|
||||||
slab_destroy_child(&ctx->transfer_pool_unsync);
|
slab_destroy_child(&ctx->transfer_pool_unsync);
|
||||||
|
|
||||||
screen->descriptors_deinit(ctx);
|
if (ctx->dd)
|
||||||
|
screen->descriptors_deinit(ctx);
|
||||||
|
|
||||||
zink_descriptor_layouts_deinit(ctx);
|
zink_descriptor_layouts_deinit(ctx);
|
||||||
|
|
||||||
|
@ -605,8 +609,10 @@ zink_delete_sampler_state(struct pipe_context *pctx,
|
||||||
struct zink_sampler_state *sampler = sampler_state;
|
struct zink_sampler_state *sampler = sampler_state;
|
||||||
struct zink_batch *batch = &zink_context(pctx)->batch;
|
struct zink_batch *batch = &zink_context(pctx)->batch;
|
||||||
zink_descriptor_set_refs_clear(&sampler->desc_set_refs, sampler_state);
|
zink_descriptor_set_refs_clear(&sampler->desc_set_refs, sampler_state);
|
||||||
util_dynarray_append(&batch->state->zombie_samplers, VkSampler,
|
/* may be called if context_create fails */
|
||||||
sampler->sampler);
|
if (batch->state)
|
||||||
|
util_dynarray_append(&batch->state->zombie_samplers, VkSampler,
|
||||||
|
sampler->sampler);
|
||||||
if (sampler->custom_border_color)
|
if (sampler->custom_border_color)
|
||||||
p_atomic_dec(&zink_screen(pctx->screen)->cur_custom_border_color_samplers);
|
p_atomic_dec(&zink_screen(pctx->screen)->cur_custom_border_color_samplers);
|
||||||
FREE(sampler);
|
FREE(sampler);
|
||||||
|
|
Loading…
Reference in New Issue