OSDN Git Service

i915: use _mesa_delete_buffer_object
authorNicolai Hähnle <nicolai.haehnle@amd.com>
Wed, 6 Jan 2016 02:51:13 +0000 (21:51 -0500)
committerEmil Velikov <emil.l.velikov@gmail.com>
Fri, 15 Jan 2016 14:49:30 +0000 (16:49 +0200)
This is more future-proof, plugs the memory leak of Label and properly
destroys the buffer mutex.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 1b74c02e83c59a51f155b64de0444ea3df183af6)

src/mesa/drivers/dri/i915/intel_buffer_objects.c

index ef06743..e676096 100644 (file)
@@ -99,7 +99,7 @@ intel_bufferobj_free(struct gl_context * ctx, struct gl_buffer_object *obj)
    _mesa_align_free(intel_obj->sys_buffer);
 
    drm_intel_bo_unreference(intel_obj->buffer);
-   free(intel_obj);
+   _mesa_delete_buffer_object(ctx, obj);
 }