OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: fix destroy batch

Browse Source 
Extract batch destruction in its own function, then make sure to
release objects.

Signed-off-by: Antonio Caggiano <antonio.caggiano@collabora.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9243>
This commit is contained in:
Antonio Caggiano
2020-08-14 08:10:06 +02:00
committed by Mike Blumenkrantz
parent da2d8f1078
commit 9dac191f6e
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/gallium/drivers/zink/zink_context.c
View File

@@ -51,6 +51,24 @@
#include "util/u_memory.h"
#include "util/u_upload_mgr.h"
static void
destroy_batch(struct zink_context* ctx, struct zink_batch* batch)
{
struct zink_screen *screen = zink_screen(ctx->base.screen);
zink_reset_batch(ctx, batch);
vkDestroyDescriptorPool(screen->dev, batch->descpool, NULL);
vkFreeCommandBuffers(screen->dev, batch->cmdpool, 1, &batch->cmdbuf);
vkDestroyCommandPool(screen->dev, batch->cmdpool, NULL);
zink_fence_reference(screen, &batch->fence, NULL);
_mesa_set_destroy(batch->resources, NULL);
_mesa_set_destroy(batch->sampler_views, NULL);
util_dynarray_fini(&batch->zombie_samplers);
_mesa_set_destroy(batch->surfaces, NULL);
_mesa_set_destroy(batch->programs, NULL);
_mesa_set_destroy(batch->active_queries, NULL);
}
static void
zink_context_destroy(struct pipe_context *pctx)
{
@@ -67,28 +85,10 @@ zink_context_destroy(struct pipe_context *pctx)
for (unsigned i = 0; i < ARRAY_SIZE(ctx->null_buffers); i++)
pipe_resource_reference(&ctx->null_buffers[i], NULL);
for (int i = 0; i < ARRAY_SIZE(ctx->batches); ++i) {
zink_reset_batch(ctx, &ctx->batches[i]);
util_dynarray_fini(&ctx->batches[i].zombie_samplers);
vkDestroyDescriptorPool(screen->dev, ctx->batches[i].descpool, NULL);
_mesa_set_destroy(ctx->batches[i].resources, NULL);
_mesa_set_destroy(ctx->batches[i].sampler_views, NULL);
_mesa_set_destroy(ctx->batches[i].programs, NULL);
vkFreeCommandBuffers(screen->dev, ctx->batches[i].cmdpool, 1, &ctx->batches[i].cmdbuf);
vkDestroyCommandPool(screen->dev, ctx->batches[i].cmdpool, NULL);
}
if (ctx->compute_batch.cmdpool) {
zink_reset_batch(ctx, &ctx->compute_batch);
util_dynarray_fini(&ctx->compute_batch.zombie_samplers);
vkDestroyDescriptorPool(screen->dev, ctx->compute_batch.descpool, NULL);
vkFreeCommandBuffers(screen->dev, ctx->compute_batch.cmdpool, 1, &ctx->compute_batch.cmdbuf);
_mesa_set_destroy(ctx->compute_batch.resources, NULL);
_mesa_set_destroy(ctx->compute_batch.sampler_views, NULL);
_mesa_set_destroy(ctx->compute_batch.programs, NULL);
vkDestroyCommandPool(screen->dev, ctx->compute_batch.cmdpool, NULL);
}
for (int i = 0; i < ARRAY_SIZE(ctx->batches); ++i)
destroy_batch(ctx, &ctx->batches[i]);
if (ctx->compute_batch.cmdpool)
destroy_batch(ctx, &ctx->compute_batch);
hash_table_foreach(ctx->render_pass_cache, he)
zink_destroy_render_pass(screen, he->data);