[Bf-blender-cvs] [6951e8890ae] master: Mikktspace: Optimized port to C++
Lukas Stockner
noreply at git.blender.org
Wed Sep 7 01:01:05 CEST 2022
Commit: 6951e8890ae3d0923e377cff6023d78202d81a03
Author: Lukas Stockner
Date: Sat Sep 3 17:21:44 2022 +0200
Branches: master
https://developer.blender.org/rB6951e8890ae3d0923e377cff6023d78202d81a03
Mikktspace: Optimized port to C++
This commit is a big overhaul to the Mikktspace module, which is used
to compute tangents. I'm not calling it a rewrite since it's the
result of a lot of iterations on the original code, but pretty much
everything is reworked somehow.
Overall goal was to a) make it faster and b) make it maintainable.
Notable changes:
- Since the callbacks for requesting geometry data were a big
bottleneck before, I've ported it to C++ and made it header-only,
templating on the data source. That way, the compiler generates code
specific to the caller, which allows it to inline the data source and
specialize for some cases (e.g. subd vs. non-subd in Cycles).
- The one input parameter, an optional angle threshold, was not used
anywhere. Turns out that removing it allows for considerable
algorithmic simplification, removing a lot of the complexity in the
later stages. Therefore, I've just removed the option in the new code.
- The code computes several outputs, but only one (the tangent itself)
is ever used in Blender. Therefore, I've removed the others to
simplify the code. They could easily be brought back if needed, none
of the algorithmic simplifications are conflicting with them.
- The original code had fallback paths for many steps in case temporary
memory allocation fails, but that never actually gets used anyways
since malloc() doesn't really ever return NULL in practise, so I
removed them.
- In general, I've restructured A LOT of the code to make the
algorithms clearer and make use of some C++ features (vectors,
std::array, booleans, classes), though there's still some of cleanup
that could be done.
- Parallelized duplicate detection, neighbor detection, triangle
tangent computation, degenerate triangle handling and tangent space
accumulation.
- Replaced several algorithms with faster equivalents: Duplicate
detection uses a (concurrent) hash set now, neighbor detection uses
Radixsort and splits vertices by index pairs etc.
As for results, the exact speedup depends on the scene of course, but
let's consider the file from T97378:
- Blender 3.1 (before D14675): 6.07sec
- Blender 3.2 (with D14675): 4.62sec
- rBf0a36599007d (last nightly build): 4.42sec
- With this commit: 0.90sec
This speedup will mostly be noticed at the start of Cycles renders and,
even more importantly, in Eevee when doing something that changes the
geometry (e.g. animating) on a model using normal maps.
Differential Revision: https://developer.blender.org/D15589
===================================================================
M intern/cycles/blender/CMakeLists.txt
M intern/cycles/blender/mesh.cpp
M intern/cycles/util/math.h
M intern/mikktspace/CMakeLists.txt
A intern/mikktspace/mikk_atomic_hash_set.hh
A intern/mikktspace/mikk_float3.hh
A intern/mikktspace/mikk_util.hh
D intern/mikktspace/mikktspace.c
D intern/mikktspace/mikktspace.h
A intern/mikktspace/mikktspace.hh
M source/blender/blenkernel/intern/editmesh_tangent.cc
M source/blender/blenkernel/intern/mesh_tangent.cc
===================================================================
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 24bc165c708..666b0077a72 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -65,6 +65,8 @@ set(LIB
cycles_subd
cycles_util
+ bf_intern_mikktspace
+
${Epoxy_LIBRARIES}
${PYTHON_LINKFLAGS}
${PYTHON_LIBRARIES}
@@ -101,6 +103,10 @@ if(WITH_MOD_FLUID)
add_definitions(-DWITH_FLUID)
endif()
+if(WITH_TBB)
+ add_definitions(-DWITH_TBB)
+endif()
+
if(WITH_OPENVDB)
add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
list(APPEND INC_SYS
diff --git a/intern/cycles/blender/mesh.cpp b/intern/cycles/blender/mesh.cpp
index 47c3ff65aae..1d1eadebc39 100644
--- a/intern/cycles/blender/mesh.cpp
+++ b/intern/cycles/blender/mesh.cpp
@@ -24,7 +24,7 @@
#include "util/log.h"
#include "util/math.h"
-#include "mikktspace.h"
+#include "mikktspace.hh"
#include "DNA_meshdata_types.h"
@@ -32,16 +32,15 @@ CCL_NAMESPACE_BEGIN
/* Tangent Space */
-struct MikkUserData {
- MikkUserData(const BL::Mesh &b_mesh,
- const char *layer_name,
- const Mesh *mesh,
- float3 *tangent,
- float *tangent_sign)
+template<bool is_subd> struct MikkMeshWrapper {
+ MikkMeshWrapper(const BL::Mesh &b_mesh,
+ const char *layer_name,
+ const Mesh *mesh,
+ float3 *tangent,
+ float *tangent_sign)
: mesh(mesh), texface(NULL), orco(NULL), tangent(tangent), tangent_sign(tangent_sign)
{
- const AttributeSet &attributes = (mesh->get_num_subd_faces()) ? mesh->subd_attributes :
- mesh->attributes;
+ const AttributeSet &attributes = is_subd ? mesh->subd_attributes : mesh->attributes;
Attribute *attr_vN = attributes.find(ATTR_STD_VERTEX_NORMAL);
vertex_normal = attr_vN->data_float3();
@@ -51,7 +50,9 @@ struct MikkUserData {
if (attr_orco) {
orco = attr_orco->data_float3();
+ float3 orco_size;
mesh_texture_space(*(BL::Mesh *)&b_mesh, orco_loc, orco_size);
+ inv_orco_size = 1.0f / orco_size;
}
}
else {
@@ -62,160 +63,126 @@ struct MikkUserData {
}
}
- const Mesh *mesh;
- int num_faces;
-
- float3 *vertex_normal;
- float2 *texface;
- float3 *orco;
- float3 orco_loc, orco_size;
-
- float3 *tangent;
- float *tangent_sign;
-};
-
-static int mikk_get_num_faces(const SMikkTSpaceContext *context)
-{
- const MikkUserData *userdata = (const MikkUserData *)context->m_pUserData;
- if (userdata->mesh->get_num_subd_faces()) {
- return userdata->mesh->get_num_subd_faces();
- }
- else {
- return userdata->mesh->num_triangles();
+ int GetNumFaces()
+ {
+ if constexpr (is_subd) {
+ return mesh->get_num_subd_faces();
+ }
+ else {
+ return mesh->num_triangles();
+ }
}
-}
-static int mikk_get_num_verts_of_face(const SMikkTSpaceContext *context, const int face_num)
-{
- const MikkUserData *userdata = (const MikkUserData *)context->m_pUserData;
- if (userdata->mesh->get_num_subd_faces()) {
- const Mesh *mesh = userdata->mesh;
- return mesh->get_subd_num_corners()[face_num];
- }
- else {
- return 3;
+ int GetNumVerticesOfFace(const int face_num)
+ {
+ if constexpr (is_subd) {
+ return mesh->get_subd_num_corners()[face_num];
+ }
+ else {
+ return 3;
+ }
}
-}
-static int mikk_vertex_index(const Mesh *mesh, const int face_num, const int vert_num)
-{
- if (mesh->get_num_subd_faces()) {
- const Mesh::SubdFace &face = mesh->get_subd_face(face_num);
- return mesh->get_subd_face_corners()[face.start_corner + vert_num];
- }
- else {
- return mesh->get_triangles()[face_num * 3 + vert_num];
+ int CornerIndex(const int face_num, const int vert_num)
+ {
+ if constexpr (is_subd) {
+ const Mesh::SubdFace &face = mesh->get_subd_face(face_num);
+ return face.start_corner + vert_num;
+ }
+ else {
+ return face_num * 3 + vert_num;
+ }
}
-}
-static int mikk_corner_index(const Mesh *mesh, const int face_num, const int vert_num)
-{
- if (mesh->get_num_subd_faces()) {
- const Mesh::SubdFace &face = mesh->get_subd_face(face_num);
- return face.start_corner + vert_num;
- }
- else {
- return face_num * 3 + vert_num;
+ int VertexIndex(const int face_num, const int vert_num)
+ {
+ int corner = CornerIndex(face_num, vert_num);
+ if constexpr (is_subd) {
+ return mesh->get_subd_face_corners()[corner];
+ }
+ else {
+ return mesh->get_triangles()[corner];
+ }
}
-}
-
-static void mikk_get_position(const SMikkTSpaceContext *context,
- float P[3],
- const int face_num,
- const int vert_num)
-{
- const MikkUserData *userdata = (const MikkUserData *)context->m_pUserData;
- const Mesh *mesh = userdata->mesh;
- const int vertex_index = mikk_vertex_index(mesh, face_num, vert_num);
- const float3 vP = mesh->get_verts()[vertex_index];
- P[0] = vP.x;
- P[1] = vP.y;
- P[2] = vP.z;
-}
-static void mikk_get_texture_coordinate(const SMikkTSpaceContext *context,
- float uv[2],
- const int face_num,
- const int vert_num)
-{
- const MikkUserData *userdata = (const MikkUserData *)context->m_pUserData;
- const Mesh *mesh = userdata->mesh;
- if (userdata->texface != NULL) {
- const int corner_index = mikk_corner_index(mesh, face_num, vert_num);
- float2 tfuv = userdata->texface[corner_index];
- uv[0] = tfuv.x;
- uv[1] = tfuv.y;
- }
- else if (userdata->orco != NULL) {
- const int vertex_index = mikk_vertex_index(mesh, face_num, vert_num);
- const float3 orco_loc = userdata->orco_loc;
- const float3 orco_size = userdata->orco_size;
- const float3 orco = (userdata->orco[vertex_index] + orco_loc) / orco_size;
-
- const float2 tmp = map_to_sphere(orco);
- uv[0] = tmp.x;
- uv[1] = tmp.y;
- }
- else {
- uv[0] = 0.0f;
- uv[1] = 0.0f;
+ mikk::float3 GetPosition(const int face_num, const int vert_num)
+ {
+ const float3 vP = mesh->get_verts()[VertexIndex(face_num, vert_num)];
+ return mikk::float3(vP.x, vP.y, vP.z);
}
-}
-static void mikk_get_normal(const SMikkTSpaceContext *context,
- float N[3],
- const int face_num,
- const int vert_num)
-{
- const MikkUserData *userdata = (const MikkUserData *)context->m_pUserData;
- const Mesh *mesh = userdata->mesh;
- float3 vN;
- if (mesh->get_num_subd_faces()) {
- const Mesh::SubdFace &face = mesh->get_subd_face(face_num);
- if (face.smooth) {
- const int vertex_index = mikk_vertex_index(mesh, face_num, vert_num);
- vN = userdata->vertex_normal[vertex_index];
+ mikk::float3 GetTexCoord(const int face_num, const int vert_num)
+ {
+ /* TODO: Check whether introducing a template boolean in order to
+ * turn this into a constexpr is worth it. */
+ if (texface != NULL) {
+ const int corner_index = CornerIndex(face_num, vert_num);
+ float2 tfuv = texface[corner_index];
+ return mikk::float3(tfuv.x, tfuv.y, 1.0f);
+ }
+ else if (orco != NULL) {
+ const int vertex_index = VertexIndex(face_num, vert_num);
+ const float2 uv = map_to_sphere((orco[vertex_index] + orco_loc) * inv_orco_size);
+ return mikk::float3(uv.x, uv.y, 1.0f);
}
else {
- vN = face.normal(mesh);
+ return mikk::float3(0.0f, 0.0f, 1.0f);
}
}
- else {
- if (mesh->get_smooth()[face_num]) {
- const int vertex_index = mikk_vertex_index(mesh, face_num, vert_num);
- vN = userdata->vertex_normal[vertex_index];
+
+ mikk::float3 GetNormal(const int face_num, const int vert_num)
+ {
+ float3 vN;
+ if (is_subd) {
+ const Mesh::SubdFace &face = mesh->get_subd_face(face_num);
+ if (face.smooth) {
+ const int vertex_index = VertexIndex(face_num, vert_num);
+ vN = vertex_normal[vertex_index];
+ }
+ else {
+ vN = face.normal(mesh);
+ }
}
else {
- const Mesh::Triangle tri = mesh->get_triangle(face_num);
- vN = tri.compute_normal(&mesh->get_verts()[0]);
+ if (mesh->get_smooth()[face_num]) {
+ const int vertex_index = VertexIndex(face_num, vert_num);
+ vN = vertex_normal[vertex_index];
+ }
+ else {
+ const Mesh::Triangle tri = mesh->get_triangle(face_num);
+ vN = tri.compute_normal(&mesh->get_verts()[0]);
+ }
}
+ return mikk::float3(vN.x, vN.y, vN.z);
}
- N[0] = vN.x;
- N[1] = vN.y;
- N[2] = vN.z;
-}
-static void mikk_set_tangent_space(const SMikkTSpaceContext *context,
- const float T[],
- const float sign,
- const int face_num,
- const int vert_num)
-{
- MikkUserData *userdata = (MikkUserData *)context->m_pUserData;
- const Mesh *mesh = userdata->mesh;
- const int corner_index = mikk_corner_index(mesh, face_num, vert_num);
- userdata->tangent[corner_index] = make_float3(T[0], T[1], T[2]);
- if (userdata->tangent_sign != NULL) {
- userdata->tangent_sign[corner_index] = sign;
+ void SetTangentSpace(const int face_num, const int vert_num, mikk::float3 T, bool orientation)
+ {
+ const int corner_index = CornerIndex(face_num, vert_num);
+ tangent[corner_index] = make_float3(T.x, T.y, T.z);
+ if (tangent_sign != NULL) {
+ tangent_sign[corner_index] = orientation ? 1.0f : -1.0f;
+ }
}
-}
+
+ const Mesh *mesh;
+ int num_faces;
+
+ float3 *vertex_normal;
+ float2 *texface;
+ float3 *orco;
+ float3 orco_loc, inv_orco_size;
+
+ float3 *tangent;
+ float *tangent_sign;
+};
static void mikk_compute_tangents(
const BL::Mesh &b_mesh, const char *layer_name, Mesh *mesh, bool need_sign, bool active_render)
{
/* Create tangent attributes. */
- AttributeSet &attributes = (mesh->get_num_subd_faces()) ? mesh->subd_attributes :
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list