Commit 440275b3 authored by Bas Nieuwenhuizen's avatar Bas Nieuwenhuizen Committed by Eric Engestrom
Browse files

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: #1206
Fixes: 49f4ecc6

 "mesa/st: start adding memory object support"
Reviewed-by: Timothy Arceri's avatarTimothy Arceri <>
Part-of: <!6148>
(cherry picked from commit 99cf9108)
parent 4fb918f4
......@@ -931,7 +931,7 @@
"description": "mesa/st: Actually free the driver part of memory objects on destruction.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "49f4ecc67773c082d93708bdf111acc4248678da"
......@@ -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);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment