diff options
| author | Ilia Mirkin <[email protected]> | 2013-11-29 05:52:27 -0500 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-12-04 06:20:36 -0800 |
| commit | 267679be84de5bc9d2bd0fccb1712bc5cddb6be7 (patch) | |
| tree | 424c0749c5879f0e8fb79138abf10075e8fbdf89 | |
| parent | c45cf6199fc493538cef33125c8a97a892e2ca83 (diff) | |
mesa: don't leak performance monitors on context destroy
Signed-off-by: Ilia Mirkin <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Cc: "10.0" <[email protected]>
| -rw-r--r-- | src/mesa/main/context.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/performance_monitor.c | 19 | ||||
| -rw-r--r-- | src/mesa/main/performance_monitor.h | 3 |
3 files changed, 23 insertions, 0 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 87a4a35451d..658499fa4e3 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1194,6 +1194,7 @@ _mesa_free_context_data( struct gl_context *ctx ) _mesa_free_sync_data(ctx); _mesa_free_varray_data(ctx); _mesa_free_transform_feedback(ctx); + _mesa_free_performance_monitors(ctx); _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj, NULL); _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj, NULL); diff --git a/src/mesa/main/performance_monitor.c b/src/mesa/main/performance_monitor.c index 4981e6fb27c..e62f7701217 100644 --- a/src/mesa/main/performance_monitor.c +++ b/src/mesa/main/performance_monitor.c @@ -93,6 +93,25 @@ fail: return NULL; } +static void +free_performance_monitor(GLuint key, void *data, void *user) +{ + struct gl_perf_monitor_object *m = data; + struct gl_context *ctx = user; + + ralloc_free(m->ActiveGroups); + ralloc_free(m->ActiveCounters); + ctx->Driver.DeletePerfMonitor(ctx, m); +} + +void +_mesa_free_performance_monitors(struct gl_context *ctx) +{ + _mesa_HashDeleteAll(ctx->PerfMonitor.Monitors, + free_performance_monitor, ctx); + _mesa_DeleteHashTable(ctx->PerfMonitor.Monitors); +} + static inline struct gl_perf_monitor_object * lookup_monitor(struct gl_context *ctx, GLuint id) { diff --git a/src/mesa/main/performance_monitor.h b/src/mesa/main/performance_monitor.h index a852a4184c2..76234e5c1bc 100644 --- a/src/mesa/main/performance_monitor.h +++ b/src/mesa/main/performance_monitor.h @@ -35,6 +35,9 @@ extern void _mesa_init_performance_monitors(struct gl_context *ctx); +extern void +_mesa_free_performance_monitors(struct gl_context *ctx); + extern void GLAPIENTRY _mesa_GetPerfMonitorGroupsAMD(GLint *numGroups, GLsizei groupsSize, GLuint *groups); |