Jacques Lucke
4130f1e674
This refactors the geometry nodes evaluation system. No changes for the user are expected. At a high level the goals are: * Support using geometry nodes outside of the geometry nodes modifier. * Support using the evaluator infrastructure for other purposes like field evaluation. * Support more nodes, especially when many of them are disabled behind switch nodes. * Support doing preprocessing on node groups. For more details see T98492. There are fairly detailed comments in the code, but here is a high level overview for how it works now: * There is a new "lazy-function" system. It is similar in spirit to the multi-function system but with different goals. Instead of optimizing throughput for highly parallelizable work, this system is designed to compute only the data that is actually necessary. What data is necessary can be determined dynamically during evaluation. Many lazy-functions can be composed in a graph to form a new lazy-function, which can again be used in a graph etc. * Each geometry node group is converted into a lazy-function graph prior to evaluation. To evaluate geometry nodes, one then just has to evaluate that graph. Node groups are no longer inlined into their parents. Next steps for the evaluation system is to reduce the use of threads in some situations to avoid overhead. Many small node groups don't benefit from multi-threading at all. This is much easier to do now because not everything has to be inlined in one huge node tree anymore. Differential Revision: https://developer.blender.org/D15914
230 lines
4.5 KiB
CMake
230 lines
4.5 KiB
CMake
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
# Copyright 2006 Blender Foundation. All rights reserved.
|
|
|
|
set(INC
|
|
.
|
|
intern
|
|
../blenfont
|
|
../blenkernel
|
|
../blenlib
|
|
../blenloader
|
|
../blentranslation
|
|
../bmesh
|
|
../depsgraph
|
|
../editors/include
|
|
../functions
|
|
../geometry
|
|
../makesdna
|
|
../makesrna
|
|
../nodes
|
|
../render
|
|
../windowmanager
|
|
../../../intern/eigen
|
|
../../../intern/guardedalloc
|
|
|
|
# dna_type_offsets.h in BLO_read_write.h
|
|
${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
|
|
# RNA_prototypes.h
|
|
${CMAKE_BINARY_DIR}/source/blender/makesrna
|
|
)
|
|
|
|
set(INC_SYS
|
|
${ZLIB_INCLUDE_DIRS}
|
|
)
|
|
|
|
set(SRC
|
|
intern/MOD_armature.c
|
|
intern/MOD_array.c
|
|
intern/MOD_bevel.c
|
|
intern/MOD_boolean.cc
|
|
intern/MOD_build.c
|
|
intern/MOD_cast.c
|
|
intern/MOD_cloth.c
|
|
intern/MOD_collision.c
|
|
intern/MOD_correctivesmooth.c
|
|
intern/MOD_curve.c
|
|
intern/MOD_datatransfer.c
|
|
intern/MOD_decimate.c
|
|
intern/MOD_displace.c
|
|
intern/MOD_dynamicpaint.c
|
|
intern/MOD_edgesplit.c
|
|
intern/MOD_explode.c
|
|
intern/MOD_fluid.c
|
|
intern/MOD_hook.c
|
|
intern/MOD_laplaciandeform.c
|
|
intern/MOD_laplaciansmooth.c
|
|
intern/MOD_lattice.c
|
|
intern/MOD_mask.cc
|
|
intern/MOD_mesh_to_volume.cc
|
|
intern/MOD_meshcache.c
|
|
intern/MOD_meshcache_mdd.c
|
|
intern/MOD_meshcache_pc2.c
|
|
intern/MOD_meshcache_util.c
|
|
intern/MOD_meshdeform.c
|
|
intern/MOD_meshsequencecache.cc
|
|
intern/MOD_mirror.c
|
|
intern/MOD_multires.c
|
|
intern/MOD_nodes.cc
|
|
intern/MOD_none.c
|
|
intern/MOD_normal_edit.c
|
|
intern/MOD_ocean.c
|
|
intern/MOD_particleinstance.c
|
|
intern/MOD_particlesystem.cc
|
|
intern/MOD_remesh.c
|
|
intern/MOD_screw.c
|
|
intern/MOD_shapekey.c
|
|
intern/MOD_shrinkwrap.c
|
|
intern/MOD_simpledeform.c
|
|
intern/MOD_skin.c
|
|
intern/MOD_smooth.c
|
|
intern/MOD_softbody.c
|
|
intern/MOD_solidify.c
|
|
intern/MOD_solidify_extrude.c
|
|
intern/MOD_solidify_nonmanifold.c
|
|
intern/MOD_subsurf.c
|
|
intern/MOD_surface.c
|
|
intern/MOD_surfacedeform.c
|
|
intern/MOD_triangulate.c
|
|
intern/MOD_ui_common.c
|
|
intern/MOD_util.c
|
|
intern/MOD_uvproject.c
|
|
intern/MOD_uvwarp.c
|
|
intern/MOD_volume_displace.cc
|
|
intern/MOD_volume_to_mesh.cc
|
|
intern/MOD_warp.c
|
|
intern/MOD_wave.c
|
|
intern/MOD_weighted_normal.c
|
|
intern/MOD_weightvg_util.c
|
|
intern/MOD_weightvgedit.c
|
|
intern/MOD_weightvgmix.c
|
|
intern/MOD_weightvgproximity.c
|
|
intern/MOD_weld.cc
|
|
intern/MOD_wireframe.c
|
|
|
|
MOD_modifiertypes.h
|
|
MOD_nodes.h
|
|
intern/MOD_meshcache_util.h
|
|
intern/MOD_solidify_util.h
|
|
intern/MOD_ui_common.h
|
|
intern/MOD_util.h
|
|
intern/MOD_weightvg_util.h
|
|
)
|
|
|
|
set(LIB
|
|
bf_blenkernel
|
|
bf_blenlib
|
|
)
|
|
|
|
if(WITH_ALEMBIC)
|
|
add_definitions(-DWITH_ALEMBIC)
|
|
list(APPEND INC
|
|
../io/alembic
|
|
)
|
|
list(APPEND LIB
|
|
bf_alembic
|
|
)
|
|
endif()
|
|
|
|
if(WITH_USD)
|
|
add_definitions(-DWITH_USD)
|
|
list(APPEND INC
|
|
../io/usd
|
|
)
|
|
list(APPEND LIB
|
|
bf_usd
|
|
)
|
|
endif()
|
|
|
|
if(WITH_MOD_REMESH)
|
|
list(APPEND INC
|
|
../../../intern/dualcon
|
|
)
|
|
list(APPEND LIB
|
|
bf_intern_dualcon
|
|
)
|
|
add_definitions(-DWITH_MOD_REMESH)
|
|
endif()
|
|
|
|
if(WITH_MOD_FLUID)
|
|
add_definitions(-DWITH_FLUID)
|
|
endif()
|
|
|
|
if(WITH_MOD_OCEANSIM)
|
|
add_definitions(-DWITH_OCEANSIM)
|
|
endif()
|
|
|
|
if(WITH_OPENSUBDIV)
|
|
add_definitions(-DWITH_OPENSUBDIV)
|
|
endif()
|
|
|
|
if(WITH_BULLET)
|
|
if(NOT WITH_SYSTEM_BULLET)
|
|
list(APPEND LIB
|
|
extern_bullet
|
|
)
|
|
endif()
|
|
add_definitions(-DWITH_BULLET)
|
|
endif()
|
|
|
|
# To disable adaptive subdivision test in subsurf UI without cycles
|
|
if(WITH_CYCLES)
|
|
add_definitions(-DWITH_CYCLES)
|
|
endif()
|
|
|
|
if(WITH_GMP)
|
|
add_definitions(-DWITH_GMP)
|
|
|
|
list(APPEND INC_SYS
|
|
${GMP_INCLUDE_DIRS}
|
|
)
|
|
|
|
list(APPEND LIB
|
|
${GMP_LIBRARIES}
|
|
)
|
|
endif()
|
|
|
|
if(WITH_TBB)
|
|
add_definitions(-DWITH_TBB)
|
|
if(WIN32)
|
|
# TBB includes Windows.h which will define min/max macros
|
|
# that will collide with the stl versions.
|
|
add_definitions(-DNOMINMAX)
|
|
endif()
|
|
list(APPEND INC_SYS
|
|
${TBB_INCLUDE_DIRS}
|
|
)
|
|
|
|
list(APPEND LIB
|
|
${TBB_LIBRARIES}
|
|
)
|
|
endif()
|
|
|
|
if(WITH_OPENVDB)
|
|
list(APPEND INC
|
|
../../../intern/openvdb
|
|
)
|
|
list(APPEND INC_SYS
|
|
${OPENVDB_INCLUDE_DIRS}
|
|
)
|
|
list(APPEND LIB
|
|
bf_intern_openvdb
|
|
${OPENVDB_LIBRARIES}
|
|
)
|
|
add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
|
|
endif()
|
|
|
|
if(WITH_EXPERIMENTAL_FEATURES)
|
|
add_definitions(-DWITH_SIMULATION_DATABLOCK)
|
|
endif()
|
|
|
|
# So we can have special tricks in modifier system.
|
|
|
|
blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
|
|
|
# Some modifiers include BLO_read_write.h, which includes dna_type_offsets.h
|
|
# which is generated by bf_dna. Need to ensure compilaiton order here.
|
|
# Also needed so we can use dna_type_offsets.h for defaults initialization.
|
|
add_dependencies(bf_modifiers bf_dna)
|
|
# RNA_prototypes.h
|
|
add_dependencies(bf_modifiers bf_rna)
|