Mesa (master): mesa/st: Actually free the driver part of memory objects on destruction.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 99cf9108340c2ccf7c1b05ec6f951e2e91b9c76c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=99cf9108340c2ccf7c1b05ec6f951e2e91b9c76c

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Sat Aug  1 03:13:55 2020 +0200

mesa/st: Actually free the driver part of memory objects on destruction.

_mesa_delete_memory_object(ctx, obj) == free(obj) but doesn't free the
part of the gallium driver.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1206
Fixes: 49f4ecc6777 "mesa/st: start adding memory object support"
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6148>

---

 src/mesa/state_tracker/st_cb_memoryobjects.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/mesa/state_tracker/st_cb_memoryobjects.c b/src/mesa/state_tracker/st_cb_memoryobjects.c
index b193eb37cb2..3ef316a45f8 100644
--- a/src/mesa/state_tracker/st_cb_memoryobjects.c
+++ b/src/mesa/state_tracker/st_cb_memoryobjects.c
@@ -54,6 +54,12 @@ static void
 st_memoryobj_free(struct gl_context *ctx,
                   struct gl_memory_object *obj)
 {
+   struct st_memory_object *st_obj = st_memory_object(obj);
+   struct st_context *st = st_context(ctx);
+   struct pipe_context *pipe = st->pipe;
+   struct pipe_screen *screen = pipe->screen;
+
+   screen->memobj_destroy(screen, st_obj->memory);
    _mesa_delete_memory_object(ctx, obj);
 }