diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-26 15:01:24 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-26 15:01:24 +0200 |
| commit | 2fe2056807d1304de86deb2b59992d51d9252ad0 (patch) | |
| tree | 665d730ee19df03e4dfca01371009ec778a343af /mesalib/src/gallium/auxiliary/hud/hud_cpu.c | |
| parent | fa791414601df61d20d860299dba80fdb62565df (diff) | |
| download | vcxsrv-2fe2056807d1304de86deb2b59992d51d9252ad0.tar.gz vcxsrv-2fe2056807d1304de86deb2b59992d51d9252ad0.tar.bz2 vcxsrv-2fe2056807d1304de86deb2b59992d51d9252ad0.zip | |
libXext mesa git update 29 June 20013
libXext commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4
mesa commit 9aebad618c0aab527a0b838ce0a79ffa6dd426bb
Diffstat (limited to 'mesalib/src/gallium/auxiliary/hud/hud_cpu.c')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/hud/hud_cpu.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mesalib/src/gallium/auxiliary/hud/hud_cpu.c b/mesalib/src/gallium/auxiliary/hud/hud_cpu.c index ce98115d5..cd20deec9 100644 --- a/mesalib/src/gallium/auxiliary/hud/hud_cpu.c +++ b/mesalib/src/gallium/auxiliary/hud/hud_cpu.c @@ -116,6 +116,12 @@ query_cpu_load(struct hud_graph *gr) } } +static void +free_query_data(void *p) +{ + FREE(p); +} + void hud_cpu_graph_install(struct hud_pane *pane, unsigned cpu_index) { @@ -144,7 +150,11 @@ hud_cpu_graph_install(struct hud_pane *pane, unsigned cpu_index) } gr->query_new_value = query_cpu_load; - gr->free_query_data = free; + + /* Don't use free() as our callback as that messes up Gallium's + * memory debugger. Use simple free_query_data() wrapper. + */ + gr->free_query_data = free_query_data; info = gr->query_data; info->cpu_index = cpu_index; |