5e46e3d28a
Remove the indirection previously used for the topology refiner to separate C and C++ code. Instead retrieve the base level in calling code and call opensubdiv API functions directly. This avoids copying arrays of mesh indices and should reduce function call overhead since index retrieval can now be inlined. It also lets us remove a lot of boilerplate shim code. The downside is increased need for WITH_OPENSUBDIV defines in various parts of blenkernel, but I think that is required to avoid the previous indirection and have the kernel deal with OpenSubdiv more directly. Pull Request: https://projects.blender.org/blender/blender/pulls/120825
110 lines
2.5 KiB
CMake
110 lines
2.5 KiB
CMake
# SPDX-FileCopyrightText: 2013 Blender Foundation
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
set(INC
|
|
.
|
|
)
|
|
|
|
set(INC_SYS
|
|
)
|
|
|
|
set(SRC
|
|
opensubdiv_capi.hh
|
|
opensubdiv_capi_type.hh
|
|
opensubdiv_converter_capi.hh
|
|
opensubdiv_evaluator_capi.hh
|
|
opensubdiv_topology_refiner_capi.hh
|
|
)
|
|
|
|
set(LIB
|
|
PRIVATE bf::intern::guardedalloc
|
|
)
|
|
|
|
if(WITH_OPENSUBDIV)
|
|
macro(OPENSUBDIV_DEFINE_COMPONENT component)
|
|
if(${${component}})
|
|
add_definitions(-D${component})
|
|
endif()
|
|
endmacro()
|
|
|
|
list(APPEND INC_SYS
|
|
${OPENSUBDIV_INCLUDE_DIRS}
|
|
${Epoxy_INCLUDE_DIRS}
|
|
)
|
|
|
|
list(APPEND SRC
|
|
# Base.
|
|
internal/base/memory.h
|
|
internal/base/opensubdiv_capi.cc
|
|
internal/base/type_convert.cc
|
|
internal/base/type_convert.h
|
|
internal/base/util.cc
|
|
internal/base/util.h
|
|
|
|
# Evaluator.
|
|
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
|
|
internal/evaluator/evaluator_capi.cc
|
|
internal/evaluator/evaluator_impl.cc
|
|
internal/evaluator/evaluator_impl.h
|
|
internal/evaluator/gl_compute_evaluator.cc
|
|
internal/evaluator/gl_compute_evaluator.h
|
|
internal/evaluator/patch_map.cc
|
|
internal/evaluator/patch_map.h
|
|
|
|
|
|
# Topology.
|
|
internal/topology/mesh_topology.cc
|
|
internal/topology/mesh_topology_compare.cc
|
|
internal/topology/mesh_topology.h
|
|
internal/topology/topology_refiner_factory.cc
|
|
internal/topology/topology_refiner_impl.cc
|
|
internal/topology/topology_refiner_impl_compare.cc
|
|
internal/topology/topology_refiner_impl.h
|
|
)
|
|
|
|
list(APPEND LIB
|
|
${OPENSUBDIV_LIBRARIES}
|
|
)
|
|
|
|
if(WITH_OPENMP AND WITH_OPENMP_STATIC)
|
|
list(APPEND LIB
|
|
${OpenMP_LIBRARIES}
|
|
)
|
|
endif()
|
|
|
|
if(WIN32)
|
|
add_definitions(-DNOMINMAX)
|
|
add_definitions(-D_USE_MATH_DEFINES)
|
|
endif()
|
|
|
|
data_to_c_simple(
|
|
internal/evaluator/shaders/glsl_compute_kernel.glsl
|
|
SRC
|
|
STRIP_LEADING_C_COMMENTS
|
|
)
|
|
else()
|
|
list(APPEND SRC
|
|
stub/opensubdiv_stub.cc
|
|
stub/opensubdiv_evaluator_stub.cc
|
|
)
|
|
endif()
|
|
|
|
blender_add_lib(bf_intern_opensubdiv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
|
|
|
# Tests.
|
|
|
|
if(WITH_GTESTS AND WITH_OPENSUBDIV)
|
|
add_definitions(${GFLAGS_DEFINES})
|
|
add_definitions(${GLOG_DEFINES})
|
|
|
|
blender_add_test_executable(opensubdiv_mesh_topology "internal/topology/mesh_topology_test.cc" "${INC}" "${INC_SYS}" "${LIB};bf_intern_opensubdiv")
|
|
endif()
|