diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2019-05-13 16:57:03 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2019-05-14 11:57:03 +0300 |
commit | e5349f14eb17689316ab5a85a7d4ffbb740ec93c (patch) | |
tree | 3ad2b81b1db82c932c67f2bf573265e772be1520 /source/blender/gpu | |
parent | 0e5da91f0aa534c3dfdb6a650cfb067fa84099da (diff) |
BLI_memblock: Add more options
- Use int instead of uint for safety and less conversions.
- Add free callback
- Add cleared alloc option
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_viewport.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c index 9b53f623746..b825819ceb4 100644 --- a/source/blender/gpu/intern/gpu_viewport.c +++ b/source/blender/gpu/intern/gpu_viewport.c @@ -620,19 +620,19 @@ void GPU_viewport_free(GPUViewport *viewport) MEM_freeN(viewport->txl); if (viewport->vmempool.calls != NULL) { - BLI_memblock_destroy(viewport->vmempool.calls); + BLI_memblock_destroy(viewport->vmempool.calls, NULL); } if (viewport->vmempool.states != NULL) { - BLI_memblock_destroy(viewport->vmempool.states); + BLI_memblock_destroy(viewport->vmempool.states, NULL); } if (viewport->vmempool.shgroups != NULL) { - BLI_memblock_destroy(viewport->vmempool.shgroups); + BLI_memblock_destroy(viewport->vmempool.shgroups, NULL); } if (viewport->vmempool.uniforms != NULL) { - BLI_memblock_destroy(viewport->vmempool.uniforms); + BLI_memblock_destroy(viewport->vmempool.uniforms, NULL); } if (viewport->vmempool.passes != NULL) { - BLI_memblock_destroy(viewport->vmempool.passes); + BLI_memblock_destroy(viewport->vmempool.passes, NULL); } if (viewport->vmempool.images != NULL) { BLI_memblock_iter iter; @@ -641,7 +641,7 @@ void GPU_viewport_free(GPUViewport *viewport) while ((tex = BLI_memblock_iterstep(&iter))) { GPU_texture_free(*tex); } - BLI_memblock_destroy(viewport->vmempool.images); + BLI_memblock_destroy(viewport->vmempool.images, NULL); } DRW_instance_data_list_free(viewport->idatalist); |