diff options
| author | Timothy Arceri <[email protected]> | 2017-07-26 11:11:00 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-08-08 15:56:12 +1000 |
| commit | da10065d2b9b78fcb9446a4626343352cf30add0 (patch) | |
| tree | a0a1fbdb3f829bca78c9ec10c6d5dfe17cb9028b /src/mesa/main/texturebindless.c | |
| parent | 8614679e78186482cc7ff84af83acdd29e359086 (diff) | |
mesa: add NULL checking to free_shared_state()
This will allow us to call this function from
_mesa_alloc_shared_state() in the case that we run out of memory
part way through allocating the state.
Reviewed-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src/mesa/main/texturebindless.c')
| -rw-r--r-- | src/mesa/main/texturebindless.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/main/texturebindless.c b/src/mesa/main/texturebindless.c index cb95ed07c5a..f062ea904a1 100644 --- a/src/mesa/main/texturebindless.c +++ b/src/mesa/main/texturebindless.c @@ -394,8 +394,12 @@ _mesa_init_shared_handles(struct gl_shared_state *shared) void _mesa_free_shared_handles(struct gl_shared_state *shared) { - _mesa_hash_table_u64_destroy(shared->TextureHandles, NULL); - _mesa_hash_table_u64_destroy(shared->ImageHandles, NULL); + if (shared->TextureHandles) + _mesa_hash_table_u64_destroy(shared->TextureHandles, NULL); + + if (shared->ImageHandles) + _mesa_hash_table_u64_destroy(shared->ImageHandles, NULL); + mtx_destroy(&shared->HandlesMutex); } |