diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2016-01-05 21:49:11 -0500 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-01-15 16:49:30 +0200 |
| commit | 0c7b4c20138e4c84eb2d8f9e6368d81c0d6843c6 (patch) | |
| tree | 42ba5490c4989193256fc016b1da9d7d1b043d7b | |
| parent | 9e4ac5cc1b0cbdfa122882ec66163818c8983d27 (diff) | |
st/mesa: use _mesa_delete_buffer_object
This is more future-proof than the current code.
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 1c2187b1c225b2f7e1891544d184bde60390977e)
[Emil Velikov: resolve trivial conflicts]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Conflicts:
src/mesa/state_tracker/st_cb_bufferobjects.c
| -rw-r--r-- | src/mesa/state_tracker/st_cb_bufferobjects.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c index db254c2144..157d974a0a 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); } |