diff options
author | Kenneth Graunke <[email protected]> | 2012-06-05 15:58:41 -0700 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2012-06-07 00:01:40 -0700 |
commit | 3603fdcebfa25e2217f1dbfb0a99261be3e84b02 (patch) | |
tree | 063093f7e9a71eebdd03d67953881e0d5c91bf2f | |
parent | 5f3f63b76d36b752d7d98c04ab044b5a961b5593 (diff) |
glsl: Hook up loop_variable_state destructor to plug a memory leak.
While ~loop_state() is already freeing the loop_variable_state objects
via ralloc_free(this->mem_ctx), the ~loop_variable_state() destructor
was never getting called, so the hash table inside loop_variable_state
was never getting destroyed.
Fixes a memory leak in any shader with loops.
NOTE: This is a candidate for stable release branches.
Signed-off-by: Kenneth Graunke <[email protected]>
-rw-r--r-- | src/glsl/loop_analysis.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/glsl/loop_analysis.h b/src/glsl/loop_analysis.h index 8bed1db0210..05c982fc164 100644 --- a/src/glsl/loop_analysis.h +++ b/src/glsl/loop_analysis.h @@ -140,6 +140,23 @@ public: { hash_table_dtor(this->var_hash); } + + static void* operator new(size_t size, void *ctx) + { + void *lvs = ralloc_size(ctx, size); + assert(lvs != NULL); + + ralloc_set_destructor(lvs, (void (*)(void*)) destructor); + + return lvs; + } + +private: + static void + destructor(loop_variable_state *lvs) + { + lvs->~loop_variable_state(); + } }; |