griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Multires baker: fix memory leak caused by threading issues

Browse Source 
Didn't notice this before because of non-working guarded allocation
at the time threading was added to multires baker.
This commit is contained in:
Sergey Sharybin
2013-01-21 18:34:14 +00:00
parent 698aeec8b8
commit 64c85d89dd
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/render/intern/source/multires_bake.c
View File

@@ -428,6 +428,27 @@ static void *do_multires_bake_thread(void *data_v)
return NULL;
}
/* some of arrays inside ccgdm are lazy-initialized, which will generally
* require lock around accessing such data
* this function will ensure all arrays are allocated before threading started
*/
static void init_ccgdm_arrays(DerivedMesh *dm)
{
CCGElem **grid_data;
CCGKey key;
int grid_size;
int *grid_offset;
grid_size = dm->getGridSize(dm);
grid_data = dm->getGridData(dm);
grid_offset = dm->getGridOffset(dm);
dm->getGridKey(dm, &key);
(void) grid_data;
(void) grid_data;
(void) grid_offset;
}
static void do_multires_bake(MultiresBakeRender *bkr, Image *ima, int require_tangent, MPassKnownData passKnownData,
MInitBakeData initBakeData, MApplyBakeData applyBakeData, MFreeBakeData freeBakeData)
{
@@ -467,6 +488,8 @@ static void do_multires_bake(MultiresBakeRender *bkr, Image *ima, int require_ta
handles = MEM_callocN(tot_thread * sizeof(MultiresBakeThread), "do_multires_bake handles");
init_ccgdm_arrays(bkr->hires_dm);
/* faces queue */
queue.cur_face = 0;
queue.tot_face = tot_face;
@@ -515,6 +538,8 @@ static void do_multires_bake(MultiresBakeRender *bkr, Image *ima, int require_ta
if (freeBakeData)
freeBakeData(bake_data);
MEM_freeN(handles);
BKE_image_release_ibuf(ima, ibuf, NULL);
}
}
@@ -673,6 +698,7 @@ static void *init_heights_data(MultiresBakeRender *bkr, Image *ima)
smd.subdivType = ME_SIMPLE_SUBSURF;
height_data->ssdm = subsurf_make_derived_from_derived(bkr->lores_dm, &smd, NULL, 0);
init_ccgdm_arrays(height_data->ssdm);
}
}