Mesa (11.0): i915: use _mesa_delete_buffer_object

Emil Velikov evelikov at kemper.freedesktop.org
Fri Jan 15 14:45:18 UTC 2016


Module: Mesa
Branch: 11.0
Commit: 34c94330ddf1b969569b4cb6e35a72ecf22d4ce8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=34c94330ddf1b969569b4cb6e35a72ecf22d4ce8

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Tue Jan  5 21:51:13 2016 -0500

i915: use _mesa_delete_buffer_object

This is more future-proof, plugs the memory leak of Label and properly
destroys the buffer mutex.

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

---

 src/mesa/drivers/dri/i915/intel_buffer_objects.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i915/intel_buffer_objects.c b/src/mesa/drivers/dri/i915/intel_buffer_objects.c
index ef06743..e676096 100644
--- a/src/mesa/drivers/dri/i915/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/i915/intel_buffer_objects.c
@@ -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);
 }
 
 




More information about the mesa-commit mailing list