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

GPencil: Performance improvement for Multiframe and Onion Skin

Browse Source 
Before when Onion or Multiframe was enabled the VBO length was the total of points on the object for all frames and this results in a big size when the scene had a lot of frames.

Now, the size of VBO length is calculated more precisely and reduce the time to alloc the VBO.This also reduce memory footprint.
This commit is contained in:
Antonio Vazquez
2019-09-21 19:21:37 +02:00
parent 886adbbe49
commit c71be416e0
1 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
View File

@@ -135,7 +135,7 @@ static void gpencil_calc_vertex(GPENCIL_StorageList *stl,
GpencilBatchCache *cache,
bGPdata *gpd)
{
if (!cache->is_dirty) {
if ((!cache->is_dirty) || (gpd == NULL)) {
return;
}
@@ -153,6 +153,11 @@ static void gpencil_calc_vertex(GPENCIL_StorageList *stl,
const bool is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd);
/* Onion skining. */
const int step = gpd->gstep;
const int mode = gpd->onion_mode;
const short onion_keytype = gpd->onion_keytype;
cache_ob->tot_vertex = 0;
cache_ob->tot_triangles = 0;
int idx_eval = 0;
@@ -165,7 +170,7 @@ static void gpencil_calc_vertex(GPENCIL_StorageList *stl,
continue;
}
/* if multiedit or onion skin need to count all frames of the layer */
/* If multiedit or onion skin need to count all frames of the layer. */
if ((is_multiedit) || (is_onion)) {
init_gpf = gpl->frames.first;
}
@@ -179,9 +184,35 @@ static void gpencil_calc_vertex(GPENCIL_StorageList *stl,
for (bGPDframe *gpf = init_gpf; gpf; gpf = gpf->next) {
for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
cache_ob->tot_vertex += gps->totpoints + 3;
cache_ob->tot_triangles += gps->totpoints - 1;
if (!is_onion) {
if ((!is_multiedit) ||
((is_multiedit) && ((gpf == gpl->actframe) || (gpf->flag & GP_FRAME_SELECT)))) {
cache_ob->tot_vertex += gps->totpoints + 3;
cache_ob->tot_triangles += gps->totpoints - 1;
}
}
else {
/* Only selected frames. */
if ((mode == GP_ONION_MODE_SELECTED) && ((gpf->flag & GP_FRAME_SELECT) == 0)) {
continue;
}
/* Verify keyframe type. */
if ((onion_keytype > -1) && (gpf->key_type != onion_keytype)) {
continue;
}
/* Absolute range. */
if (mode == GP_ONION_MODE_ABSOLUTE) {
if ((gpl->actframe) && (abs(gpl->actframe->framenum - gpf->framenum) > step)) {
continue;
}
}
/* For relative range it takes too much time compute, so use all frames. */
cache_ob->tot_vertex += gps->totpoints + 3;
cache_ob->tot_triangles += gps->totpoints - 1;
}
}
/* If not multiframe nor Onion skin, don't need follow counting. */
if ((!is_multiedit) && (!is_onion)) {
break;
}