diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-02-28 06:04:40 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-03-01 05:53:25 +0300 |
| commit | 1ba96857d1ea50d97d0b305c270414ac4df5ac16 (patch) | |
| tree | ddaa57b92c1f87ef23b33d289aa7980e7c03fae7 /source/blender/gpu | |
| parent | d1da7dba47b6d520fd9fc93d0aa327144d7fc6ae (diff) | |
DRW: Merge calls_generate pool with calls pool & add DRWCallState pool.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/GPU_viewport.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_viewport.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/gpu/GPU_viewport.h b/source/blender/gpu/GPU_viewport.h index dff7e278ae1..b733027b0f3 100644 --- a/source/blender/gpu/GPU_viewport.h +++ b/source/blender/gpu/GPU_viewport.h @@ -46,7 +46,7 @@ typedef struct GPUViewport GPUViewport; /* Contains memory pools informations */ typedef struct ViewportMemoryPool { struct BLI_mempool *calls; - struct BLI_mempool *calls_generate; + struct BLI_mempool *states; struct BLI_mempool *shgroups; struct BLI_mempool *uniforms; struct BLI_mempool *passes; diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c index ee9d175e217..25bd265d1a6 100644 --- a/source/blender/gpu/intern/gpu_viewport.c +++ b/source/blender/gpu/intern/gpu_viewport.c @@ -603,8 +603,8 @@ void GPU_viewport_free(GPUViewport *viewport) if (viewport->vmempool.calls != NULL) { BLI_mempool_destroy(viewport->vmempool.calls); } - if (viewport->vmempool.calls_generate != NULL) { - BLI_mempool_destroy(viewport->vmempool.calls_generate); + if (viewport->vmempool.states != NULL) { + BLI_mempool_destroy(viewport->vmempool.states); } if (viewport->vmempool.shgroups != NULL) { BLI_mempool_destroy(viewport->vmempool.shgroups); |