diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2019-04-23 21:34:26 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2019-04-23 21:35:02 +0300 |
commit | 148c0aa0faa66b44ad26f2c4703d59e9a133ff71 (patch) | |
tree | 82a7c4fc5b88d9ec20c724abeac231bbce0cf88a /source/blender/draw/intern | |
parent | d10205c1a7d6d595db600842c9c2ed343d9f51aa (diff) |
Fix T63178 Eevee animation render crash
If image buffer is not loaded and blender attempts to reload it (during
`BKE_image_acquire_ibuf`) over and over for each frame rendered.
When attempting this reload, image_load_image_file is calling
`BKE_image_free_buffers` and tag the Image to the (GPU) image_free_queue
(because this run on the rendering thread).
If the main thread decide to redraw the UI and go through `GPU_free_unused_buffers` they all get deleted and if that happens before the rendering thread use them ... segfault.
If I replace the environment textures with correct ones (the file does not seems to contain them), there is no crash when rendering.
I used a list of GPUTexture from blender Image to increase and decrease the
reference counter correctly.
This add very little memory and computation overhead.
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 13 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 6 |
2 files changed, 18 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index fc66d52c4ef..31dd5828649 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -519,11 +519,20 @@ static void drw_viewport_cache_resize(void) GPU_viewport_cache_release(DST.viewport); if (DST.vmempool != NULL) { + /* Release Image textures. */ + BLI_mempool_iter iter; + GPUTexture **tex; + BLI_mempool_iternew(DST.vmempool->images, &iter); + while ((tex = BLI_mempool_iterstep(&iter))) { + GPU_texture_free(*tex); + } + BLI_mempool_clear_ex(DST.vmempool->calls, BLI_mempool_len(DST.vmempool->calls)); BLI_mempool_clear_ex(DST.vmempool->states, BLI_mempool_len(DST.vmempool->states)); BLI_mempool_clear_ex(DST.vmempool->shgroups, BLI_mempool_len(DST.vmempool->shgroups)); BLI_mempool_clear_ex(DST.vmempool->uniforms, BLI_mempool_len(DST.vmempool->uniforms)); BLI_mempool_clear_ex(DST.vmempool->passes, BLI_mempool_len(DST.vmempool->passes)); + BLI_mempool_clear_ex(DST.vmempool->images, BLI_mempool_len(DST.vmempool->images)); } DRW_instance_data_list_free_unused(DST.idatalist); @@ -603,6 +612,10 @@ static void drw_viewport_var_init(void) if (DST.vmempool->passes == NULL) { DST.vmempool->passes = BLI_mempool_create(sizeof(DRWPass), 0, 64, 0); } + if (DST.vmempool->images == NULL) { + DST.vmempool->images = BLI_mempool_create( + sizeof(GPUTexture *), 0, 512, BLI_MEMPOOL_ALLOW_ITER); + } DST.idatalist = GPU_viewport_instance_data_list_get(DST.viewport); DRW_instance_data_list_reset(DST.idatalist); diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 77f84976165..de3505b4ccd 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -981,8 +981,12 @@ static DRWShadingGroup *drw_shgroup_material_inputs(DRWShadingGroup *grp, GPUTexture *tex = NULL; if (input->ima) { - tex = GPU_texture_from_blender( + GPUTexture **tex_ref = BLI_mempool_alloc(DST.vmempool->images); + + *tex_ref = tex = GPU_texture_from_blender( input->ima, input->iuser, GL_TEXTURE_2D, input->image_isdata); + + GPU_texture_ref(tex); } else { /* Color Ramps */ |