Page MenuHome
Differential D16180

Mesh: Move runtime data out of DNA
ClosedPublic
Actions

Authored by Hans Goudey (HooglyBoogly) on Oct 7 2022, 5:51 AM.

Details

Reviewers
Campbell Barton (campbellbarton)
Commits
rBc34c6d3e25f2: Mesh: Move runtime data out of DNA
Summary

This commit replaces the Mesh_Runtime struct embedded in Mesh
with blender::bke::MeshRuntime. This has quite a few benefits:

  • It's possible to use C++ types like std::mutex, Array, BitVector, etc. more easily
  • Meshes saved in files are slightly smaller
  • Copying and writing meshes is a bit more obvious without clearing of runtime data, etc.

The first is by far the most important though. It will allows us to avoid a bunch
of manual memory management boilerplate that is error-prone and annoying.
It should also simplify future CoW improvements for runtime data.

This patch doesn't change anything besides changing mesh.runtime.data to
mesh.runtime->data. The cleanups above will happen in separate commits.

Diff Detail

Repository
rB Blender

Event Timeline

Hans Goudey (HooglyBoogly) requested review of this revision.Oct 7 2022, 5:51 AM
Hans Goudey (HooglyBoogly) updated this revision to Diff 56573.
Hans Goudey (HooglyBoogly) created this revision.
Hans Goudey (HooglyBoogly) added projects: Modeling, Core.

Cleanup stray semicolon

Hans Goudey (HooglyBoogly) updated this revision to Diff 56574.Oct 7 2022, 5:52 AM
Campbell Barton (campbellbarton) requested changes to this revision.Oct 7 2022, 6:36 AM

Running into crash entering edit-mode on the default cube on the factory startup (Mesh.runtime is NULL): P3242

Besides the NULL state of runtime being resolved, I don't see issue with the patch, although the tests should be run on this (if you didn't already).

source/blender/makesdna/DNA_mesh_types.h
204

Checking over the code, it seems this is expected to be allocated (no need to NULL check the value), for meshes in Main.

It would be good to note this in a code-comment, also if there are any cases where it will be NULL at run-time - that should be mentioned too.

This revision now requires changes to proceed.Oct 7 2022, 6:36 AM
Hans Goudey (HooglyBoogly) mentioned this in rB349091ce00d5: Cleanup: Move editmesh_undo.c to C++.Oct 7 2022, 5:42 PM
Hans Goudey (HooglyBoogly) updated this revision to Diff 56621.EditedOct 8 2022, 12:07 AM
Hans Goudey (HooglyBoogly) marked an inline comment as done.
  • Add comment about runtime data in DNA
  • Fix issue with null runtime data for undo meshes

Thanks for the review. Tests are passing here.

Campbell Barton (campbellbarton) accepted this revision.Oct 13 2022, 2:05 AM
Campbell Barton (campbellbarton) added inline comments.
source/blender/makesdna/DNA_mesh_types.h
207

This "should" doesn't inspire confidence, example for alternate wording.

Run-time data is ensured to be non-null on file-load and can be accessed without NULL checks.
An exception to this is temporary meshes which should allocate and free the data if the meshes are passed to functions that expect run-time data.
This revision is now accepted and ready to land.Oct 13 2022, 2:05 AM
Hans Goudey (HooglyBoogly) updated this revision to Diff 56773.Oct 13 2022, 2:23 AM

Merge master

Hans Goudey (HooglyBoogly) updated this revision to Diff 56774.Oct 13 2022, 2:30 AM

Merge master again

Closed by commit rBc34c6d3e25f2: Mesh: Move runtime data out of DNA (authored by Hans Goudey (HooglyBoogly)). · Explain WhyOct 13 2022, 3:56 AM
This revision was automatically updated to reflect the committed changes.
Hans Goudey (HooglyBoogly) added a commit: rBc34c6d3e25f2: Mesh: Move runtime data out of DNA.
Hans Goudey (HooglyBoogly) mentioned this in D16204: Geometry: Cache bounds min and max, share between data-blocks.Oct 14 2022, 6:13 AM

Revision Contents
Changeset List

PathSize
source/
blender/
blenkernel/
20 lines
19 lines
144 lines
intern/
32 lines
4 lines
2 lines
6 lines
2 lines
38 lines
2 lines
4 lines
32 lines
68 lines
2 lines
186 lines
6 lines
66 lines
6 lines
2 lines
10 lines
4 lines
2 lines
8 lines
5 lines
3 lines
3 lines
6 lines
8 lines
2 lines
10 lines
3 lines
bmesh/
intern/
2 lines
draw/
engines/
workbench/
5 lines
intern/
2 lines
6 lines
32 lines
2 lines
2 lines
9 lines
mesh_extractors/
10 lines
2 lines
2 lines
2 lines
2 lines
editors/
mesh/
6 lines
physics/
6 lines
2 lines
sculpt_paint/
2 lines
2 lines
space_info/
5 lines
space_view3d/
5 lines
6 lines
2 lines
transform/
22 lines
gpencil_modifiers/
intern/
lineart/
4 lines
makesdna/
137 lines
makesrna/
intern/
46 lines
modifiers/
intern/
3 lines
2 lines
4 lines
2 lines
2 lines
5 lines
2 lines
4 lines
2 lines
2 lines
3 lines
2 lines
2 lines
2 lines
2 lines
render/
intern/
2 lines

Diff 56574

View Options

source/blender/blenkernel/BKE_editmesh_cache.h

Loading...
View Options

source/blender/blenkernel/BKE_mesh_runtime.h

Loading...
View Options

source/blender/blenkernel/BKE_mesh_types.h

Loading...
View Options

source/blender/blenkernel/intern/DerivedMesh.cc

Loading...
View Options

source/blender/blenkernel/intern/bvhutils.cc

Loading...
View Options

source/blender/blenkernel/intern/cloth.c

Loading...
View Options

source/blender/blenkernel/intern/editmesh.cc

Loading...
View Options

source/blender/blenkernel/intern/mball_tessellate.cc

Loading...
View Options

source/blender/blenkernel/intern/mesh.cc

Loading...
View Options

source/blender/blenkernel/intern/mesh_convert.cc

Loading...
View Options

source/blender/blenkernel/intern/mesh_debug.cc

Loading...
View Options

source/blender/blenkernel/intern/mesh_iterators.cc

Loading...
View Options

source/blender/blenkernel/intern/mesh_normals.cc

Loading...
View Options

source/blender/blenkernel/intern/mesh_remap.c

Loading...
View Options

source/blender/blenkernel/intern/mesh_runtime.cc

Loading...
View Options

source/blender/blenkernel/intern/mesh_tangent.cc

Loading...
View Options

source/blender/blenkernel/intern/mesh_wrapper.cc

Loading...
View Options

source/blender/blenkernel/intern/modifier.cc

Loading...
View Options

source/blender/blenkernel/intern/multires.cc

Loading...
View Options

source/blender/blenkernel/intern/object.cc

Loading...
View Options

source/blender/blenkernel/intern/object_dupli.cc

Loading...
View Options

source/blender/blenkernel/intern/object_update.cc

Loading...
View Options

source/blender/blenkernel/intern/paint.cc

Loading...
View Options

source/blender/blenkernel/intern/particle.c

Loading...
View Options

source/blender/blenkernel/intern/particle_distribute.c

Loading...
View Options

source/blender/blenkernel/intern/particle_system.c

Loading...
View Options

source/blender/blenkernel/intern/rigidbody.c

Loading...
View Options

source/blender/blenkernel/intern/shrinkwrap.cc

Loading...
View Options

source/blender/blenkernel/intern/subdiv_ccg.cc

Loading...
View Options

source/blender/blenkernel/intern/subdiv_mesh.cc

Loading...
View Options

source/blender/blenkernel/intern/subdiv_modifier.cc

Loading...
View Options

source/blender/bmesh/intern/bmesh_mesh_convert.cc

Loading...
View Options

source/blender/draw/engines/workbench/workbench_engine.c

Loading...
View Options

source/blender/draw/intern/draw_cache_extract_mesh.cc

Loading...
View Options

source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc

Loading...
View Options

source/blender/draw/intern/draw_cache_impl_mesh.cc

Loading...
View Options

source/blender/draw/intern/draw_cache_impl_subdivision.cc

Loading...
View Options

source/blender/draw/intern/draw_manager_data.cc

Loading...
View Options

source/blender/draw/intern/draw_manager_text.cc

Loading...
View Options

source/blender/draw/intern/mesh_extractors/extract_mesh.hh

Loading...
View Options

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc

Loading...
View Options

source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc

Loading...
View Options

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc

Loading...
View Options

source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc

Loading...
View Options

source/blender/editors/mesh/editmesh_select.cc

Loading...
View Options

source/blender/editors/physics/particle_edit.c

Loading...
View Options

source/blender/editors/physics/particle_object.c

Loading...
View Options

source/blender/editors/sculpt_paint/paint_image_proj.c

Loading...
View Options

source/blender/editors/sculpt_paint/paint_utils.c

Loading...
View Options

source/blender/editors/space_info/info_stats.cc

Loading...
View Options

source/blender/editors/space_view3d/drawobject.c

Loading...
View Options

source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc

Loading...
View Options

source/blender/editors/space_view3d/view3d_iterators.cc

Loading...
View Options

source/blender/editors/transform/transform_snap_object.cc

Loading...
View Options

source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c

Loading...
View Options

source/blender/makesdna/DNA_mesh_types.h

Loading...
View Options

source/blender/makesrna/intern/rna_mesh.c

Loading...
View Options

source/blender/modifiers/intern/MOD_cast.c

Loading...
View Options

source/blender/modifiers/intern/MOD_datatransfer.cc

Loading...
View Options

source/blender/modifiers/intern/MOD_multires.cc

Loading...
View Options

source/blender/modifiers/intern/MOD_normal_edit.cc

Loading...
View Options

source/blender/modifiers/intern/MOD_particlesystem.cc

Loading...
View Options

source/blender/modifiers/intern/MOD_remesh.c

Loading...
View Options

source/blender/modifiers/intern/MOD_subsurf.cc

Loading...
View Options

source/blender/modifiers/intern/MOD_util.cc

Loading...
View Options

source/blender/modifiers/intern/MOD_uvproject.cc

Loading...
View Options

source/blender/modifiers/intern/MOD_uvwarp.cc

Loading...
View Options

source/blender/modifiers/intern/MOD_wave.cc

Loading...
View Options

source/blender/modifiers/intern/MOD_weighted_normal.cc

Loading...
View Options

source/blender/modifiers/intern/MOD_weightvgedit.cc

Loading...
View Options

source/blender/modifiers/intern/MOD_weightvgmix.cc

Loading...
View Options

source/blender/modifiers/intern/MOD_weightvgproximity.cc

Loading...
View Options

source/blender/render/intern/bake.c

Loading...