[Bf-blender-cvs] [8e35a968c5a] master: Subdiv: Use defined order of corner/edge vertices

[Sergey Sharybin]

Commit: 8e35a968c5ac385d291cd2b08461ef4128f7bab6
Author: Sergey Sharybin
Date:   Mon Jan 7 17:08:54 2019 +0100
Branches: master
https://developer.blender.org/rB8e35a968c5ac385d291cd2b08461ef4128f7bab6

Subdiv: Use defined order of corner/edge vertices

This switches evaluation of vertices which are on the boundaries
of PTex faces to a single threaded one. While this introduces
some slowdown it fixes ambiguity of PTex index used to evaluate
particular vertex.

Possible alternative solutions would be:
- Do some pre-calculation of index, then do evaluation in threads.
- Try using Gregory patches and see if that makes any affect.

Fix T60235: Flickering of object instances

===================================================================

M	source/blender/blenkernel/intern/subdiv_foreach.c

===================================================================

diff --git a/source/blender/blenkernel/intern/subdiv_foreach.c b/source/blender/blenkernel/intern/subdiv_foreach.c
index b81f2a08b33..2cfcc137ba5 100644
--- a/source/blender/blenkernel/intern/subdiv_foreach.c
+++ b/source/blender/blenkernel/intern/subdiv_foreach.c
@@ -806,12 +806,6 @@ static void subdiv_foreach_vertices(SubdivForeachTaskContext *ctx,
 	const Mesh *coarse_mesh = ctx->coarse_mesh;
 	const MPoly *coarse_mpoly = coarse_mesh->mpoly;
 	const MPoly *coarse_poly = &coarse_mpoly[poly_index];
-	if (ctx->foreach_context->vertex_corner != NULL) {
-		subdiv_foreach_corner_vertices(ctx, tls, coarse_poly);
-	}
-	if (ctx->foreach_context->vertex_edge != NULL) {
-		subdiv_foreach_edge_vertices(ctx, tls, coarse_poly);
-	}
 	if (ctx->foreach_context->vertex_inner != NULL) {
 		subdiv_foreach_inner_vertices(ctx, tls, coarse_poly);
 	}
@@ -1950,6 +1944,22 @@ static void subdiv_foreach_vertices_of_loose_edges_task(
  * Subdivision process entry points.
  */
 
+static void subdiv_foreach_single_geometry_vertices(
+        SubdivForeachTaskContext *ctx,
+        void *tls)
+{
+	if (ctx->foreach_context->vertex_corner == NULL) {
+		return;
+	}
+	const Mesh *coarse_mesh = ctx->coarse_mesh;
+	const MPoly *coarse_mpoly = coarse_mesh->mpoly;
+	for (int poly_index = 0; poly_index < coarse_mesh->totpoly; poly_index++) {
+		const MPoly *coarse_poly = &coarse_mpoly[poly_index];
+		subdiv_foreach_corner_vertices(ctx, tls, coarse_poly);
+		subdiv_foreach_edge_vertices(ctx, tls, coarse_poly);
+	}
+}
+
 static void subdiv_foreach_single_thread_tasks(SubdivForeachTaskContext *ctx)
 {
 	/* NOTE: In theory, we can try to skip allocation of TLS here, but in
@@ -1960,6 +1970,8 @@ static void subdiv_foreach_single_thread_tasks(SubdivForeachTaskContext *ctx)
 	 * and boundary edges. */
 	subdiv_foreach_every_corner_vertices(ctx, tls);
 	subdiv_foreach_every_edge_vertices(ctx, tls);
+	/* Run callbacks which are supposed to be run once per shared geometry. */
+	subdiv_foreach_single_geometry_vertices(ctx, tls);
 	subdiv_foreach_tls_free(tls);
 }