2023-06-14 22:49:59 +10:00
|
|
|
# SPDX-FileCopyrightText: 2013 Blender Foundation
|
|
|
|
|
#
|
2022-02-11 09:07:11 +11:00
|
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
2015-07-20 15:18:35 +02:00
|
|
|
|
|
|
|
|
set(INC
|
|
|
|
|
.
|
2025-03-10 07:31:59 +01:00
|
|
|
../../source/blender/gpu/intern
|
2015-07-20 15:18:35 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
set(INC_SYS
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
set(SRC
|
2023-12-10 20:18:40 -05:00
|
|
|
opensubdiv_capi.hh
|
|
|
|
|
opensubdiv_capi_type.hh
|
|
|
|
|
opensubdiv_converter_capi.hh
|
|
|
|
|
opensubdiv_evaluator_capi.hh
|
2024-11-01 09:42:33 +01:00
|
|
|
opensubdiv_evaluator.hh
|
2024-11-07 10:36:53 +01:00
|
|
|
opensubdiv_topology_refiner.hh
|
2015-07-20 15:18:35 +02:00
|
|
|
)
|
|
|
|
|
|
2019-04-14 15:18:44 +02:00
|
|
|
set(LIB
|
2024-11-25 17:05:30 +01:00
|
|
|
PRIVATE bf::blenlib
|
2023-07-10 18:44:19 +02:00
|
|
|
PRIVATE bf::intern::guardedalloc
|
2025-03-04 07:51:15 +01:00
|
|
|
PRIVATE bf::gpu
|
2019-04-14 15:18:44 +02:00
|
|
|
)
|
|
|
|
|
|
2018-08-13 12:21:29 +02:00
|
|
|
if(WITH_OPENSUBDIV)
|
|
|
|
|
macro(OPENSUBDIV_DEFINE_COMPONENT component)
|
|
|
|
|
if(${${component}})
|
|
|
|
|
add_definitions(-D${component})
|
|
|
|
|
endif()
|
|
|
|
|
endmacro()
|
2015-07-20 15:18:35 +02:00
|
|
|
|
2018-08-13 12:21:29 +02:00
|
|
|
list(APPEND INC_SYS
|
2020-09-17 17:10:42 +05:30
|
|
|
${OPENSUBDIV_INCLUDE_DIRS}
|
2022-08-15 14:58:04 +02:00
|
|
|
${Epoxy_INCLUDE_DIRS}
|
2018-08-13 12:21:29 +02:00
|
|
|
)
|
2015-07-20 15:18:35 +02:00
|
|
|
|
2018-08-13 12:21:29 +02:00
|
|
|
list(APPEND SRC
|
2020-05-19 09:42:05 +02:00
|
|
|
# Base.
|
|
|
|
|
internal/base/memory.h
|
2020-05-19 10:55:56 +02:00
|
|
|
internal/base/opensubdiv_capi.cc
|
2020-05-19 10:49:41 +02:00
|
|
|
internal/base/type_convert.cc
|
|
|
|
|
internal/base/type_convert.h
|
2020-05-19 10:59:38 +02:00
|
|
|
internal/base/util.cc
|
|
|
|
|
internal/base/util.h
|
2020-05-19 09:42:05 +02:00
|
|
|
|
2020-05-19 10:46:42 +02:00
|
|
|
# Evaluator.
|
OpenSubDiv: add support for an OpenGL evaluator
This evaluator is used in order to evaluate subdivision at render time, allowing for
faster renders of meshes with a subdivision surface modifier placed at the last
position in the modifier list.
When evaluating the subsurf modifier, we detect whether we can delegate evaluation
to the draw code. If so, the subdivision is first evaluated on the GPU using our own
custom evaluator (only the coarse data needs to be initially sent to the GPU), then,
buffers for the final `MeshBufferCache` are filled on the GPU using a set of
compute shaders. However, some buffers are still filled on the CPU side, if doing so
on the GPU is impractical (e.g. the line adjacency buffer used for x-ray, whose
logic is hardly GPU compatible).
This is done at the mesh buffer extraction level so that the result can be readily used
in the various OpenGL engines, without having to write custom geometry or tesselation
shaders.
We use our own subdivision evaluation shaders, instead of OpenSubDiv's vanilla one, in
order to control the data layout, and interpolation. For example, we store vertex colors
as compressed 16-bit integers, while OpenSubDiv's default evaluator only work for float
types.
In order to still access the modified geometry on the CPU side, for use in modifiers
or transform operators, a dedicated wrapper type is added `MESH_WRAPPER_TYPE_SUBD`.
Subdivision will be lazily evaluated via `BKE_object_get_evaluated_mesh` which will
create such a wrapper if possible. If the final subdivision surface is not needed on
the CPU side, `BKE_object_get_evaluated_mesh_no_subsurf` should be used.
Enabling or disabling GPU subdivision can be done through the user preferences (under
Viewport -> Subdivision).
See patch description for benchmarks.
Reviewed By: campbellbarton, jbakker, fclem, brecht, #eevee_viewport
Differential Revision: https://developer.blender.org/D12406
2021-12-27 16:34:47 +01:00
|
|
|
internal/evaluator/eval_output.cc
|
|
|
|
|
internal/evaluator/eval_output.h
|
|
|
|
|
internal/evaluator/eval_output_cpu.cc
|
|
|
|
|
internal/evaluator/eval_output_cpu.h
|
|
|
|
|
internal/evaluator/eval_output_gpu.cc
|
|
|
|
|
internal/evaluator/eval_output_gpu.h
|
|
|
|
|
internal/evaluator/evaluator_cache_impl.cc
|
|
|
|
|
internal/evaluator/evaluator_cache_impl.h
|
2020-05-19 10:46:42 +02:00
|
|
|
internal/evaluator/evaluator_capi.cc
|
|
|
|
|
internal/evaluator/evaluator_impl.cc
|
2025-03-10 07:31:59 +01:00
|
|
|
internal/evaluator/gpu_compute_evaluator.cc
|
|
|
|
|
internal/evaluator/gpu_compute_evaluator.h
|
|
|
|
|
internal/evaluator/gpu_patch_table.cc
|
|
|
|
|
internal/evaluator/gpu_patch_table.hh
|
2025-03-21 00:19:55 +00:00
|
|
|
internal/evaluator/gpu_vertex_buffer_wrapper.hh
|
OpenSubDiv: add support for an OpenGL evaluator
This evaluator is used in order to evaluate subdivision at render time, allowing for
faster renders of meshes with a subdivision surface modifier placed at the last
position in the modifier list.
When evaluating the subsurf modifier, we detect whether we can delegate evaluation
to the draw code. If so, the subdivision is first evaluated on the GPU using our own
custom evaluator (only the coarse data needs to be initially sent to the GPU), then,
buffers for the final `MeshBufferCache` are filled on the GPU using a set of
compute shaders. However, some buffers are still filled on the CPU side, if doing so
on the GPU is impractical (e.g. the line adjacency buffer used for x-ray, whose
logic is hardly GPU compatible).
This is done at the mesh buffer extraction level so that the result can be readily used
in the various OpenGL engines, without having to write custom geometry or tesselation
shaders.
We use our own subdivision evaluation shaders, instead of OpenSubDiv's vanilla one, in
order to control the data layout, and interpolation. For example, we store vertex colors
as compressed 16-bit integers, while OpenSubDiv's default evaluator only work for float
types.
In order to still access the modified geometry on the CPU side, for use in modifiers
or transform operators, a dedicated wrapper type is added `MESH_WRAPPER_TYPE_SUBD`.
Subdivision will be lazily evaluated via `BKE_object_get_evaluated_mesh` which will
create such a wrapper if possible. If the final subdivision surface is not needed on
the CPU side, `BKE_object_get_evaluated_mesh_no_subsurf` should be used.
Enabling or disabling GPU subdivision can be done through the user preferences (under
Viewport -> Subdivision).
See patch description for benchmarks.
Reviewed By: campbellbarton, jbakker, fclem, brecht, #eevee_viewport
Differential Revision: https://developer.blender.org/D12406
2021-12-27 16:34:47 +01:00
|
|
|
internal/evaluator/patch_map.cc
|
|
|
|
|
internal/evaluator/patch_map.h
|
|
|
|
|
|
2020-05-19 10:46:42 +02:00
|
|
|
|
2020-05-18 18:47:38 +02:00
|
|
|
# Topology.
|
2020-05-19 11:39:07 +02:00
|
|
|
internal/topology/mesh_topology.cc
|
2020-05-19 14:30:58 +02:00
|
|
|
internal/topology/mesh_topology_compare.cc
|
2020-05-19 11:39:07 +02:00
|
|
|
internal/topology/mesh_topology.h
|
2020-05-19 09:26:22 +02:00
|
|
|
internal/topology/topology_refiner_factory.cc
|
2020-05-18 18:47:38 +02:00
|
|
|
internal/topology/topology_refiner_impl.cc
|
2020-05-19 12:02:54 +02:00
|
|
|
internal/topology/topology_refiner_impl_compare.cc
|
2018-08-13 12:21:29 +02:00
|
|
|
)
|
2015-07-20 15:18:35 +02:00
|
|
|
|
CMake: Refactor external dependencies handling
This is a more correct fix to the issue Brecht was fixing in D6600.
While the fix in that patch worked fine for linking it broke ASAN
runtime under some circumstances.
For example, `make full debug developer` would compile, but trying
to start blender will cause assert failure in ASAN (related on check
that ASAN is not running already).
Top-level idea: leave it to CMake to keep track of dependency graph.
The root of the issue comes to the fact that target like "blender" is
configured to use a lot of static libraries coming from Blender sources
and to use external static libraries. There is nothing which ensures
order between blender's and external libraries. Only order of blender
libraries is guaranteed.
It was possible that due to a cycle or other circumstances some of
blender libraries would have been passed to linker after libraries
it uses, causing linker errors.
For example, this order will likely fail:
libbf_blenfont.a libfreetype6.a libbf_blenfont.a
This change makes it so blender libraries are explicitly provided
their dependencies to an external libraries, which allows CMake to
ensure they are always linked against them.
General rule here: if bf_foo depends on an external library it is
to be provided to LIBS for bf_foo.
For example, if bf_blenkernel depends on opensubdiv then LIBS in
blenkernel's CMakeLists.txt is to include OPENSUBDIB_LIBRARIES.
The change is made based on searching for used include folders
such as OPENSUBDIV_INCLUDE_DIRS and adding corresponding libraries
to LIBS ion that CMakeLists.txt. Transitive dependencies are not
simplified by this approach, but I am not aware of any downside of
this: CMake should be smart enough to simplify them on its side.
And even if not, this shouldn't affect linking time.
Benefit of not relying on transitive dependencies is that build
system is more robust towards future changes. For example, if
bf_intern_opensubiv is no longer depends on OPENSUBDIV_LIBRARIES
and all such code is moved to bf_blenkernel this will not break
linking.
The not-so-trivial part is change to blender_add_lib (and its
version in Cycles). The complexity is caused by libraries being
provided as a single list argument which doesn't allow to use
different release and debug libraries on Windows. The idea is:
- Have every library prefixed as "optimized" or "debug" if
separation is needed (non-prefixed libraries will be considered
"generic").
- Loop through libraries passed to function and do simple parsing
which will look for "optimized" and "debug" words and specify
following library to corresponding category.
This isn't something particularly great. Alternative would be to
use target_link_libraries() directly, which sounds like more code
but which is more explicit and allows to have more flexibility
and control comparing to wrapper approach.
Tested the following configurations on Linux, macOS and Windows:
- make full debug developer
- make full release developer
- make lite debug developer
- make lite release developer
NOTE: Linux libraries needs to be compiled with D6641 applied,
otherwise, depending on configuration, it's possible to run into
duplicated zlib symbols error.
Differential Revision: https://developer.blender.org/D6642
2020-01-20 18:36:19 +01:00
|
|
|
list(APPEND LIB
|
|
|
|
|
${OPENSUBDIV_LIBRARIES}
|
2024-11-03 12:37:11 +01:00
|
|
|
${Epoxy_LIBRARIES}
|
CMake: Refactor external dependencies handling
This is a more correct fix to the issue Brecht was fixing in D6600.
While the fix in that patch worked fine for linking it broke ASAN
runtime under some circumstances.
For example, `make full debug developer` would compile, but trying
to start blender will cause assert failure in ASAN (related on check
that ASAN is not running already).
Top-level idea: leave it to CMake to keep track of dependency graph.
The root of the issue comes to the fact that target like "blender" is
configured to use a lot of static libraries coming from Blender sources
and to use external static libraries. There is nothing which ensures
order between blender's and external libraries. Only order of blender
libraries is guaranteed.
It was possible that due to a cycle or other circumstances some of
blender libraries would have been passed to linker after libraries
it uses, causing linker errors.
For example, this order will likely fail:
libbf_blenfont.a libfreetype6.a libbf_blenfont.a
This change makes it so blender libraries are explicitly provided
their dependencies to an external libraries, which allows CMake to
ensure they are always linked against them.
General rule here: if bf_foo depends on an external library it is
to be provided to LIBS for bf_foo.
For example, if bf_blenkernel depends on opensubdiv then LIBS in
blenkernel's CMakeLists.txt is to include OPENSUBDIB_LIBRARIES.
The change is made based on searching for used include folders
such as OPENSUBDIV_INCLUDE_DIRS and adding corresponding libraries
to LIBS ion that CMakeLists.txt. Transitive dependencies are not
simplified by this approach, but I am not aware of any downside of
this: CMake should be smart enough to simplify them on its side.
And even if not, this shouldn't affect linking time.
Benefit of not relying on transitive dependencies is that build
system is more robust towards future changes. For example, if
bf_intern_opensubiv is no longer depends on OPENSUBDIV_LIBRARIES
and all such code is moved to bf_blenkernel this will not break
linking.
The not-so-trivial part is change to blender_add_lib (and its
version in Cycles). The complexity is caused by libraries being
provided as a single list argument which doesn't allow to use
different release and debug libraries on Windows. The idea is:
- Have every library prefixed as "optimized" or "debug" if
separation is needed (non-prefixed libraries will be considered
"generic").
- Loop through libraries passed to function and do simple parsing
which will look for "optimized" and "debug" words and specify
following library to corresponding category.
This isn't something particularly great. Alternative would be to
use target_link_libraries() directly, which sounds like more code
but which is more explicit and allows to have more flexibility
and control comparing to wrapper approach.
Tested the following configurations on Linux, macOS and Windows:
- make full debug developer
- make full release developer
- make lite debug developer
- make lite release developer
NOTE: Linux libraries needs to be compiled with D6641 applied,
otherwise, depending on configuration, it's possible to run into
duplicated zlib symbols error.
Differential Revision: https://developer.blender.org/D6642
2020-01-20 18:36:19 +01:00
|
|
|
)
|
|
|
|
|
|
2018-08-13 12:21:29 +02:00
|
|
|
if(WIN32)
|
|
|
|
|
add_definitions(-DNOMINMAX)
|
|
|
|
|
add_definitions(-D_USE_MATH_DEFINES)
|
|
|
|
|
endif()
|
2022-02-16 16:55:35 +01:00
|
|
|
|
2025-03-10 07:31:59 +01:00
|
|
|
set(GLSL_SRC
|
2025-03-10 16:06:00 +01:00
|
|
|
internal/evaluator/shaders/osd_eval_stencils_comp.glsl
|
|
|
|
|
internal/evaluator/shaders/osd_eval_patches_comp.glsl
|
2023-08-19 17:56:50 +10:00
|
|
|
)
|
2025-03-10 07:31:59 +01:00
|
|
|
|
|
|
|
|
set(GLSL_C)
|
|
|
|
|
foreach(GLSL_FILE ${GLSL_SRC})
|
|
|
|
|
glsl_to_c(${GLSL_FILE} GLSL_C)
|
|
|
|
|
endforeach()
|
|
|
|
|
|
|
|
|
|
blender_add_lib(bf_osd_shaders "${GLSL_C}" "" "" "")
|
|
|
|
|
|
|
|
|
|
list(APPEND LIB
|
|
|
|
|
bf_osd_shaders
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
set(GLSL_SOURCE_CONTENT "")
|
2025-04-29 15:32:36 +02:00
|
|
|
set(GLSL_METADATA_CONTENT "")
|
2025-09-25 10:57:02 +02:00
|
|
|
set(GLSL_INFOS_CONTENT "")
|
2025-03-10 07:31:59 +01:00
|
|
|
foreach(GLSL_FILE ${GLSL_SRC})
|
|
|
|
|
get_filename_component(GLSL_FILE_NAME ${GLSL_FILE} NAME)
|
|
|
|
|
string(REPLACE "." "_" GLSL_FILE_NAME_UNDERSCORES ${GLSL_FILE_NAME})
|
2025-04-29 15:32:36 +02:00
|
|
|
string(APPEND GLSL_SOURCE_CONTENT "SHADER_SOURCE\(${GLSL_FILE_NAME_UNDERSCORES}, \"${GLSL_FILE_NAME}\", \"${GLSL_FILE}\"\)\n")
|
|
|
|
|
string(APPEND GLSL_METADATA_CONTENT "#include \"${GLSL_FILE}.hh\"\n")
|
2025-09-25 10:57:02 +02:00
|
|
|
string(APPEND GLSL_INFOS_CONTENT "#include \"${GLSL_FILE}.info\"\n")
|
2025-03-10 07:31:59 +01:00
|
|
|
endforeach()
|
|
|
|
|
|
|
|
|
|
set(glsl_source_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_osd_source_list.h")
|
|
|
|
|
file(GENERATE OUTPUT ${glsl_source_list_file} CONTENT "${GLSL_SOURCE_CONTENT}")
|
|
|
|
|
list(APPEND SRC ${glsl_source_list_file})
|
2025-04-29 15:32:36 +02:00
|
|
|
set(glsl_metadata_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_osd_metadata_list.hh")
|
|
|
|
|
file(GENERATE OUTPUT ${glsl_metadata_list_file} CONTENT "${GLSL_METADATA_CONTENT}")
|
|
|
|
|
list(APPEND SRC ${glsl_metadata_list_file})
|
2025-09-25 10:57:02 +02:00
|
|
|
set(glsl_infos_list_file "${CMAKE_CURRENT_BINARY_DIR}/glsl_osd_infos_list.hh")
|
|
|
|
|
file(GENERATE OUTPUT ${glsl_infos_list_file} CONTENT "${GLSL_INFOS_CONTENT}")
|
|
|
|
|
list(APPEND SRC ${glsl_infos_list_file})
|
2025-03-10 07:31:59 +01:00
|
|
|
list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
|
|
|
|
|
|
target_include_directories(bf_osd_shaders PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
|
|
2018-08-13 12:21:29 +02:00
|
|
|
else()
|
|
|
|
|
list(APPEND SRC
|
|
|
|
|
stub/opensubdiv_stub.cc
|
|
|
|
|
stub/opensubdiv_evaluator_stub.cc
|
2015-07-20 15:18:35 +02:00
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
2019-04-14 15:18:44 +02:00
|
|
|
blender_add_lib(bf_intern_opensubdiv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
2020-05-26 10:23:29 +02:00
|
|
|
|
|
|
|
|
# Tests.
|
|
|
|
|
|
|
|
|
|
if(WITH_GTESTS AND WITH_OPENSUBDIV)
|
|
|
|
|
add_definitions(${GFLAGS_DEFINES})
|
|
|
|
|
add_definitions(${GLOG_DEFINES})
|
|
|
|
|
|
2025-03-04 07:51:15 +01:00
|
|
|
set(TEST_SRC
|
|
|
|
|
internal/topology/mesh_topology_test.cc
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
blender_add_test_suite_lib(intern_opensubdiv "${TEST_SRC}" "${INC}" "${INC_SYS}" "${LIB};bf_intern_opensubdiv")
|
2020-05-26 10:23:29 +02:00
|
|
|
endif()
|