[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58508] trunk/blender/source/blender/ blenkernel/intern: optimization:

[Campbell Barton]

Revision: 58508
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58508
Author:   campbellbarton
Date:     2013-07-22 18:01:27 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
optimization:
- halve the number of allocs in layerInterp_mdeformvert list creation.
- use direct loop access in emDM_copyLoopArray

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/customdata.c
    trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c

Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c	2013-07-22 17:58:54 UTC (rev 58507)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c	2013-07-22 18:01:27 UTC (rev 58508)
@@ -218,9 +218,16 @@
 static void layerInterp_mdeformvert(void **sources, const float *weights,
                                     const float *UNUSED(sub_weights), int count, void *dest)
 {
+	/* a single linked list of MDeformWeight's
+	 * use this to avoid double allocs (which LinkNode would do) */
+	struct MDeformWeight_Link {
+		struct MDeformWeight_Link *next;
+		MDeformWeight dw;
+	};
+
 	MDeformVert *dvert = dest;
-	LinkNode *dest_dw = NULL; /* a list of lists of MDeformWeight pointers */
-	LinkNode *node;
+	struct MDeformWeight_Link *dest_dwlink = NULL;
+	struct MDeformWeight_Link *node;
 	int i, j, totweight;
 
 	if (count <= 0) return;
@@ -238,8 +245,8 @@
 			if (weight == 0.0f)
 				continue;
 
-			for (node = dest_dw; node; node = node->next) {
-				MDeformWeight *tmp_dw = (MDeformWeight *)node->link;
+			for (node = dest_dwlink; node; node = node->next) {
+				MDeformWeight *tmp_dw = &node->dw;
 
 				if (tmp_dw->def_nr == dw->def_nr) {
 					tmp_dw->weight += weight;
@@ -249,11 +256,14 @@
 
 			/* if this def_nr is not in the list, add it */
 			if (!node) {
-				MDeformWeight *tmp_dw = MEM_callocN(sizeof(*tmp_dw),
-				                                    "layerInterp_mdeformvert tmp_dw");
-				tmp_dw->def_nr = dw->def_nr;
-				tmp_dw->weight = weight;
-				BLI_linklist_prepend(&dest_dw, tmp_dw);
+				struct MDeformWeight_Link *tmp_dwlink = MEM_mallocN(sizeof(*tmp_dwlink), __func__);
+				tmp_dwlink->dw.def_nr = dw->def_nr;
+				tmp_dwlink->dw.weight = weight;
+
+				/* inline linklist */
+				tmp_dwlink->next = dest_dwlink;
+				dest_dwlink = tmp_dwlink;
+
 				totweight++;
 			}
 		}
@@ -262,20 +272,31 @@
 	/* delay writing to the destination incase dest is in sources */
 
 	/* now we know how many unique deform weights there are, so realloc */
-	if (dvert->dw) MEM_freeN(dvert->dw);
+	if (dvert->dw && (dvert->totweight == totweight)) {
+		/* pass (fastpath if we don't need to realloc) */
+	}
+	else {
+		if (dvert->dw) {
+			MEM_freeN(dvert->dw);
+		}
 
+		if (totweight) {
+			dvert->dw = MEM_mallocN(sizeof(*dvert->dw) * totweight, __func__);
+		}
+	}
+
 	if (totweight) {
-		dvert->dw = MEM_mallocN(sizeof(*dvert->dw) * totweight,
-		                        "layerInterp_mdeformvert dvert->dw");
+		struct MDeformWeight_Link *node_next;
 		dvert->totweight = totweight;
-
-		for (i = 0, node = dest_dw; node; node = node->next, ++i)
-			dvert->dw[i] = *((MDeformWeight *)node->link);
+		for (i = 0, node = dest_dwlink; node; node = node_next, i++) {
+			node_next = node->next;
+			dvert->dw[i] = node->dw;
+			MEM_freeN(node);
+		}
 	}
-	else
+	else {
 		memset(dvert, 0, sizeof(*dvert));
-
-	BLI_linklist_free(dest_dw, MEM_freeN);
+	}
 }
 
 static void layerCopy_tface(const void *source, void *dest, int count)

Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2013-07-22 17:58:54 UTC (rev 58507)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2013-07-22 18:01:27 UTC (rev 58508)
@@ -1420,18 +1420,20 @@
 {
 	EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
 	BMesh *bm = bmdm->em->bm;
-	BMIter iter, liter;
+	BMIter iter;
 	BMFace *efa;
 	BMLoop *l;
 
 	BM_mesh_elem_index_ensure(bm, BM_VERT | BM_EDGE);
 
 	BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
-		BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+		BMLoop *l_iter, *l_first;
+		l_iter = l_first = BM_FACE_FIRST_LOOP(efa);
+		do {
 			r_loop->v = BM_elem_index_get(l->v);
 			r_loop->e = BM_elem_index_get(l->e);
 			r_loop++;
-		}
+		} while ((l_iter = l_iter->next) != l_first);
 	}
 }