From 13468e4443af6008a92ac0986526f910ce5a1c50 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 25 Mar 2020 19:55:17 -0700 Subject: [PATCH] virgl: make virgl_renderer_context_destroy generic Calling virgl_context_remove directly is enough. Signed-off-by: Chia-I Wu Reviewed-by: Gurchetan Singh --- src/virglrenderer.c | 2 +- src/vrend_decode.c | 10 ---------- src/vrend_renderer.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/virglrenderer.c b/src/virglrenderer.c index 8858612..f1a3481 100644 --- a/src/virglrenderer.c +++ b/src/virglrenderer.c @@ -94,7 +94,7 @@ int virgl_renderer_context_create(uint32_t handle, uint32_t nlen, const char *na void virgl_renderer_context_destroy(uint32_t handle) { - vrend_renderer_context_destroy(handle); + virgl_context_remove(handle); } int virgl_renderer_submit_cmd(void *buffer, diff --git a/src/vrend_decode.c b/src/vrend_decode.c index 5c1d5e0..b7caed4 100644 --- a/src/vrend_decode.c +++ b/src/vrend_decode.c @@ -1437,16 +1437,6 @@ int vrend_renderer_context_create(uint32_t handle, uint32_t nlen, const char *de return 0; } -void vrend_renderer_context_destroy(uint32_t handle) -{ - /* never destroy context 0 here, it will be destroyed in vrend_decode_reset()*/ - if (handle == 0) { - return; - } - - virgl_context_remove(handle); -} - struct vrend_context *vrend_lookup_renderer_ctx(uint32_t ctx_id) { struct vrend_decode_ctx *dctx = vrend_decode_ctx_lookup(ctx_id); diff --git a/src/vrend_renderer.h b/src/vrend_renderer.h index cb7e651..f843ac7 100644 --- a/src/vrend_renderer.h +++ b/src/vrend_renderer.h @@ -166,7 +166,6 @@ struct vrend_context *vrend_create_context(int id, uint32_t nlen, const char *de bool vrend_destroy_context(struct vrend_context *ctx); int vrend_renderer_context_create(uint32_t handle, uint32_t nlen, const char *name); void vrend_renderer_context_create_internal(uint32_t handle, uint32_t nlen, const char *name); -void vrend_renderer_context_destroy(uint32_t handle); struct vrend_renderer_resource_create_args { uint32_t handle;