mesa: free object labels when deleting
Signed-off-by: Timothy Arceri <t_arceri@yahoo.com.au> Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:

committed by
Brian Paul

parent
278372b47e
commit
6d8dd59cf5
@@ -115,6 +115,7 @@ _mesa_delete_array_object( struct gl_context *ctx, struct gl_array_object *obj )
|
|||||||
unbind_array_object_vbos(ctx, obj);
|
unbind_array_object_vbos(ctx, obj);
|
||||||
_mesa_reference_buffer_object(ctx, &obj->ElementArrayBufferObj, NULL);
|
_mesa_reference_buffer_object(ctx, &obj->ElementArrayBufferObj, NULL);
|
||||||
_glthread_DESTROY_MUTEX(obj->Mutex);
|
_glthread_DESTROY_MUTEX(obj->Mutex);
|
||||||
|
free(obj->Label);
|
||||||
free(obj);
|
free(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -265,6 +265,7 @@ _mesa_delete_buffer_object(struct gl_context *ctx,
|
|||||||
bufObj->Name = ~0;
|
bufObj->Name = ~0;
|
||||||
|
|
||||||
_glthread_DESTROY_MUTEX(bufObj->Mutex);
|
_glthread_DESTROY_MUTEX(bufObj->Mutex);
|
||||||
|
free(bufObj->Label);
|
||||||
free(bufObj);
|
free(bufObj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -769,6 +769,7 @@ _mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
free(dlist->Label);
|
||||||
free(dlist);
|
free(dlist);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -195,6 +195,7 @@ _mesa_destroy_framebuffer(struct gl_framebuffer *fb)
|
|||||||
{
|
{
|
||||||
if (fb) {
|
if (fb) {
|
||||||
_mesa_free_framebuffer_data(fb);
|
_mesa_free_framebuffer_data(fb);
|
||||||
|
free(fb->Label);
|
||||||
free(fb);
|
free(fb);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -126,6 +126,7 @@ _mesa_check_query(struct gl_context *ctx, struct gl_query_object *q)
|
|||||||
static void
|
static void
|
||||||
_mesa_delete_query(struct gl_context *ctx, struct gl_query_object *q)
|
_mesa_delete_query(struct gl_context *ctx, struct gl_query_object *q)
|
||||||
{
|
{
|
||||||
|
free(q->Label);
|
||||||
free(q);
|
free(q);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -84,6 +84,7 @@ void
|
|||||||
_mesa_delete_renderbuffer(struct gl_context *ctx, struct gl_renderbuffer *rb)
|
_mesa_delete_renderbuffer(struct gl_context *ctx, struct gl_renderbuffer *rb)
|
||||||
{
|
{
|
||||||
_glthread_DESTROY_MUTEX(rb->Mutex);
|
_glthread_DESTROY_MUTEX(rb->Mutex);
|
||||||
|
free(rb->Label);
|
||||||
free(rb);
|
free(rb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -155,6 +155,7 @@ static void
|
|||||||
_mesa_delete_sampler_object(struct gl_context *ctx,
|
_mesa_delete_sampler_object(struct gl_context *ctx,
|
||||||
struct gl_sampler_object *sampObj)
|
struct gl_sampler_object *sampObj)
|
||||||
{
|
{
|
||||||
|
free(sampObj->Label);
|
||||||
free(sampObj);
|
free(sampObj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -125,6 +125,7 @@ static void
|
|||||||
_mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh)
|
_mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh)
|
||||||
{
|
{
|
||||||
free((void *)sh->Source);
|
free((void *)sh->Source);
|
||||||
|
free(sh->Label);
|
||||||
_mesa_reference_program(ctx, &sh->Program, NULL);
|
_mesa_reference_program(ctx, &sh->Program, NULL);
|
||||||
ralloc_free(sh);
|
ralloc_free(sh);
|
||||||
}
|
}
|
||||||
@@ -351,6 +352,8 @@ _mesa_free_shader_program_data(struct gl_context *ctx,
|
|||||||
shProg->_LinkedShaders[sh] = NULL;
|
shProg->_LinkedShaders[sh] = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
free(shProg->Label);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -83,6 +83,7 @@ static void
|
|||||||
_mesa_delete_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
|
_mesa_delete_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
|
||||||
{
|
{
|
||||||
(void) ctx;
|
(void) ctx;
|
||||||
|
free(syncObj->Label);
|
||||||
free(syncObj);
|
free(syncObj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -238,6 +238,8 @@ _mesa_delete_texture_object(struct gl_context *ctx,
|
|||||||
/* destroy the mutex -- it may have allocated memory (eg on bsd) */
|
/* destroy the mutex -- it may have allocated memory (eg on bsd) */
|
||||||
_glthread_DESTROY_MUTEX(texObj->Mutex);
|
_glthread_DESTROY_MUTEX(texObj->Mutex);
|
||||||
|
|
||||||
|
free(texObj->Label);
|
||||||
|
|
||||||
/* free this object */
|
/* free this object */
|
||||||
free(texObj);
|
free(texObj);
|
||||||
}
|
}
|
||||||
|
@@ -195,6 +195,7 @@ delete_transform_feedback(struct gl_context *ctx,
|
|||||||
_mesa_reference_buffer_object(ctx, &obj->Buffers[i], NULL);
|
_mesa_reference_buffer_object(ctx, &obj->Buffers[i], NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
free(obj->Label);
|
||||||
free(obj);
|
free(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -81,6 +81,7 @@ st_bufferobj_free(struct gl_context *ctx, struct gl_buffer_object *obj)
|
|||||||
if (st_obj->buffer)
|
if (st_obj->buffer)
|
||||||
pipe_resource_reference(&st_obj->buffer, NULL);
|
pipe_resource_reference(&st_obj->buffer, NULL);
|
||||||
|
|
||||||
|
free(st_obj->Base.Label);
|
||||||
free(st_obj);
|
free(st_obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -60,6 +60,7 @@ static void st_delete_sync_object(struct gl_context *ctx,
|
|||||||
struct st_sync_object *so = (struct st_sync_object*)obj;
|
struct st_sync_object *so = (struct st_sync_object*)obj;
|
||||||
|
|
||||||
screen->fence_reference(screen, &so->fence, NULL);
|
screen->fence_reference(screen, &so->fence, NULL);
|
||||||
|
free(so->b.Label);
|
||||||
free(so);
|
free(so);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user