Module: Mesa Branch: 11.0 Commit: 0c7b4c20138e4c84eb2d8f9e6368d81c0d6843c6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c7b4c20138e4c84eb2d8f9e6368d81c0d6843c6
Author: Nicolai Hähnle <[email protected]> Date: Tue Jan 5 21:49:11 2016 -0500 st/mesa: use _mesa_delete_buffer_object This is more future-proof than the current code. Reviewed-by: Marek Olšák <[email protected]> Cc: "11.0 11.1" <[email protected]> (cherry picked from commit 1c2187b1c225b2f7e1891544d184bde60390977e) [Emil Velikov: resolve trivial conflicts] Signed-off-by: Emil Velikov <[email protected]> Conflicts: src/mesa/state_tracker/st_cb_bufferobjects.c --- src/mesa/state_tracker/st_cb_bufferobjects.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c index db254c2..157d974 100644 --- a/src/mesa/state_tracker/st_cb_bufferobjects.c +++ b/src/mesa/state_tracker/st_cb_bufferobjects.c @@ -83,8 +83,7 @@ st_bufferobj_free(struct gl_context *ctx, struct gl_buffer_object *obj) if (st_obj->buffer) pipe_resource_reference(&st_obj->buffer, NULL); - free(st_obj->Base.Label); - free(st_obj); + _mesa_delete_buffer_object(ctx, obj); } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
