From ba03407e3389d83a4ae9eb8b266e9942225ac901 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 7 Nov 2024 10:36:53 +0100 Subject: [PATCH] Cleanup: Subdiv: Remove unnecessary C-API header Use the topology refiner header directly. Followup for 5e46e3d28a6948feff3a4937a84f42f9627e317d. Pull Request: https://projects.blender.org/blender/blender/pulls/129941 --- intern/opensubdiv/CMakeLists.txt | 3 +-- intern/opensubdiv/internal/evaluator/evaluator_impl.cc | 3 +-- .../internal/topology/topology_refiner_factory.cc | 3 +-- .../opensubdiv/internal/topology/topology_refiner_impl.cc | 2 +- .../internal/topology/topology_refiner_impl_compare.cc | 4 +--- ...ology_refiner_impl.h => opensubdiv_topology_refiner.hh} | 1 - intern/opensubdiv/opensubdiv_topology_refiner_capi.hh | 7 ------- source/blender/blenkernel/intern/subdiv.cc | 2 +- source/blender/blenkernel/intern/subdiv_ccg.cc | 2 +- source/blender/blenkernel/intern/subdiv_eval.cc | 2 +- source/blender/blenkernel/intern/subdiv_topology.cc | 2 +- source/blender/draw/intern/draw_cache_impl_subdivision.cc | 2 +- 12 files changed, 10 insertions(+), 23 deletions(-) rename intern/opensubdiv/{internal/topology/topology_refiner_impl.h => opensubdiv_topology_refiner.hh} (98%) delete mode 100644 intern/opensubdiv/opensubdiv_topology_refiner_capi.hh diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt index 1d36455875b..9d8e854518e 100644 --- a/intern/opensubdiv/CMakeLists.txt +++ b/intern/opensubdiv/CMakeLists.txt @@ -15,7 +15,7 @@ set(SRC opensubdiv_converter_capi.hh opensubdiv_evaluator_capi.hh opensubdiv_evaluator.hh - opensubdiv_topology_refiner_capi.hh + opensubdiv_topology_refiner.hh ) set(LIB @@ -67,7 +67,6 @@ if(WITH_OPENSUBDIV) 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 diff --git a/intern/opensubdiv/internal/evaluator/evaluator_impl.cc b/intern/opensubdiv/internal/evaluator/evaluator_impl.cc index 1ee23427fa1..e7b67a2ec56 100644 --- a/intern/opensubdiv/internal/evaluator/evaluator_impl.cc +++ b/intern/opensubdiv/internal/evaluator/evaluator_impl.cc @@ -24,10 +24,9 @@ #include "internal/evaluator/eval_output_gpu.h" #include "internal/evaluator/evaluator_cache_impl.h" #include "internal/evaluator/patch_map.h" -#include "internal/topology/topology_refiner_impl.h" #include "opensubdiv_evaluator.hh" #include "opensubdiv_evaluator_capi.hh" -#include "opensubdiv_topology_refiner_capi.hh" +#include "opensubdiv_topology_refiner.hh" using OpenSubdiv::Far::PatchTable; using OpenSubdiv::Far::PatchTableFactory; diff --git a/intern/opensubdiv/internal/topology/topology_refiner_factory.cc b/intern/opensubdiv/internal/topology/topology_refiner_factory.cc index 1caa4439591..52d2c044e68 100644 --- a/intern/opensubdiv/internal/topology/topology_refiner_factory.cc +++ b/intern/opensubdiv/internal/topology/topology_refiner_factory.cc @@ -8,8 +8,6 @@ # include #endif -#include "internal/topology/topology_refiner_impl.h" - #include #include @@ -19,6 +17,7 @@ #include "internal/topology/mesh_topology.h" #include "opensubdiv_converter_capi.hh" +#include "opensubdiv_topology_refiner.hh" struct TopologyRefinerData { const OpenSubdiv_Converter *converter; diff --git a/intern/opensubdiv/internal/topology/topology_refiner_impl.cc b/intern/opensubdiv/internal/topology/topology_refiner_impl.cc index 49eb4e393d8..13667bf40e3 100644 --- a/intern/opensubdiv/internal/topology/topology_refiner_impl.cc +++ b/intern/opensubdiv/internal/topology/topology_refiner_impl.cc @@ -4,7 +4,7 @@ * * Author: Sergey Sharybin. */ -#include "internal/topology/topology_refiner_impl.h" +#include "opensubdiv_topology_refiner.hh" namespace blender::opensubdiv { diff --git a/intern/opensubdiv/internal/topology/topology_refiner_impl_compare.cc b/intern/opensubdiv/internal/topology/topology_refiner_impl_compare.cc index f9d65201949..b1f0ccb0892 100644 --- a/intern/opensubdiv/internal/topology/topology_refiner_impl_compare.cc +++ b/intern/opensubdiv/internal/topology/topology_refiner_impl_compare.cc @@ -4,13 +4,11 @@ * * Author: Sergey Sharybin. */ -#include "internal/topology/topology_refiner_impl.h" - #include "internal/base/type_convert.h" #include "internal/topology/mesh_topology.h" -#include "internal/topology/topology_refiner_impl.h" #include "opensubdiv_converter_capi.hh" +#include "opensubdiv_topology_refiner.hh" namespace blender::opensubdiv { diff --git a/intern/opensubdiv/internal/topology/topology_refiner_impl.h b/intern/opensubdiv/opensubdiv_topology_refiner.hh similarity index 98% rename from intern/opensubdiv/internal/topology/topology_refiner_impl.h rename to intern/opensubdiv/opensubdiv_topology_refiner.hh index 19a85577fec..6cd8b9789b8 100644 --- a/intern/opensubdiv/internal/topology/topology_refiner_impl.h +++ b/intern/opensubdiv/opensubdiv_topology_refiner.hh @@ -15,7 +15,6 @@ #include "internal/base/memory.h" #include "internal/topology/mesh_topology.h" -#include "opensubdiv_topology_refiner_capi.hh" // Those settings don't really belong to OpenSubdiv's topology refiner, but // we are keeping track of them on our side of topology refiner. This is to diff --git a/intern/opensubdiv/opensubdiv_topology_refiner_capi.hh b/intern/opensubdiv/opensubdiv_topology_refiner_capi.hh deleted file mode 100644 index fcb923be3d0..00000000000 --- a/intern/opensubdiv/opensubdiv_topology_refiner_capi.hh +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-FileCopyrightText: 2018 Blender Foundation - * - * SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -#include "internal/topology/topology_refiner_impl.h" diff --git a/source/blender/blenkernel/intern/subdiv.cc b/source/blender/blenkernel/intern/subdiv.cc index b9554e7abbd..62a6b2588a5 100644 --- a/source/blender/blenkernel/intern/subdiv.cc +++ b/source/blender/blenkernel/intern/subdiv.cc @@ -23,7 +23,7 @@ #include "opensubdiv_converter_capi.hh" #ifdef WITH_OPENSUBDIV # include "opensubdiv_evaluator.hh" -# include "opensubdiv_topology_refiner_capi.hh" +# include "opensubdiv_topology_refiner.hh" #endif namespace blender::bke::subdiv { diff --git a/source/blender/blenkernel/intern/subdiv_ccg.cc b/source/blender/blenkernel/intern/subdiv_ccg.cc index 9dc25fd722d..f45d66b6d13 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg.cc +++ b/source/blender/blenkernel/intern/subdiv_ccg.cc @@ -25,7 +25,7 @@ #include "BKE_subdiv_eval.hh" #ifdef WITH_OPENSUBDIV -# include "opensubdiv_topology_refiner_capi.hh" +# include "opensubdiv_topology_refiner.hh" #endif using blender::Array; diff --git a/source/blender/blenkernel/intern/subdiv_eval.cc b/source/blender/blenkernel/intern/subdiv_eval.cc index 957fada067c..844107f6443 100644 --- a/source/blender/blenkernel/intern/subdiv_eval.cc +++ b/source/blender/blenkernel/intern/subdiv_eval.cc @@ -21,7 +21,7 @@ #include "opensubdiv_evaluator_capi.hh" #ifdef WITH_OPENSUBDIV # include "opensubdiv_evaluator.hh" -# include "opensubdiv_topology_refiner_capi.hh" +# include "opensubdiv_topology_refiner.hh" #endif /* -------------------------------------------------------------------- diff --git a/source/blender/blenkernel/intern/subdiv_topology.cc b/source/blender/blenkernel/intern/subdiv_topology.cc index 46e2ed7c5b4..c8e7f5f7a83 100644 --- a/source/blender/blenkernel/intern/subdiv_topology.cc +++ b/source/blender/blenkernel/intern/subdiv_topology.cc @@ -13,7 +13,7 @@ #include "BKE_subdiv.hh" #ifdef WITH_OPENSUBDIV -# include "opensubdiv_topology_refiner_capi.hh" +# include "opensubdiv_topology_refiner.hh" #endif namespace blender::bke::subdiv { diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index f3822fe346d..4cc48044f55 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -42,7 +42,7 @@ #include "opensubdiv_evaluator_capi.hh" #ifdef WITH_OPENSUBDIV # include "opensubdiv_evaluator.hh" -# include "opensubdiv_topology_refiner_capi.hh" +# include "opensubdiv_topology_refiner.hh" #endif #include "draw_cache_extract.hh"