[Bf-blender-cvs] [444ca1a117a] master: OpenSubdiv: Refactor, move utils to base
Sergey Sharybin
noreply at git.blender.org
Wed May 27 12:22:28 CEST 2020
Commit: 444ca1a117a17b5c7449f3f847e669c71390390d
Author: Sergey Sharybin
Date: Tue May 19 10:59:38 2020 +0200
Branches: master
https://developer.blender.org/rB444ca1a117a17b5c7449f3f847e669c71390390d
OpenSubdiv: Refactor, move utils to base
Also split them across utilities and types.
===================================================================
M intern/opensubdiv/CMakeLists.txt
M intern/opensubdiv/internal/base/edge_map.h
M intern/opensubdiv/internal/base/opensubdiv_capi.cc
R077 intern/opensubdiv/internal/opensubdiv_util.h intern/opensubdiv/internal/base/type.h
R092 intern/opensubdiv/internal/opensubdiv_util.cc intern/opensubdiv/internal/base/util.cc
A intern/opensubdiv/internal/base/util.h
M intern/opensubdiv/internal/evaluator/evaluator_impl.cc
M intern/opensubdiv/internal/topology/topology_refiner_capi.cc
M intern/opensubdiv/internal/topology/topology_refiner_factory.cc
===================================================================
diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt
index da26c76aa30..4387daf40e4 100644
--- a/intern/opensubdiv/CMakeLists.txt
+++ b/intern/opensubdiv/CMakeLists.txt
@@ -54,8 +54,11 @@ if(WITH_OPENSUBDIV)
internal/base/edge_map.h
internal/base/memory.h
internal/base/opensubdiv_capi.cc
+ internal/base/type.h
internal/base/type_convert.cc
internal/base/type_convert.h
+ internal/base/util.cc
+ internal/base/util.h
# Device.
internal/device/device_context_cuda.cc
@@ -79,9 +82,6 @@ if(WITH_OPENSUBDIV)
internal/topology/topology_refiner_factory.cc
internal/topology/topology_refiner_impl.cc
internal/topology/topology_refiner_impl.h
-
- internal/opensubdiv_util.cc
- internal/opensubdiv_util.h
)
list(APPEND LIB
diff --git a/intern/opensubdiv/internal/base/edge_map.h b/intern/opensubdiv/internal/base/edge_map.h
index eb70af2354c..da1ec5bd31b 100644
--- a/intern/opensubdiv/internal/base/edge_map.h
+++ b/intern/opensubdiv/internal/base/edge_map.h
@@ -19,7 +19,7 @@
#ifndef OPENSUBDIV_BASE_EDGE_MAP_H_
#define OPENSUBDIV_BASE_EDGE_MAP_H_
-#include "internal/opensubdiv_util.h"
+#include "internal/base/type.h"
namespace blender {
namespace opensubdiv {
diff --git a/intern/opensubdiv/internal/base/opensubdiv_capi.cc b/intern/opensubdiv/internal/base/opensubdiv_capi.cc
index 1d0f23f3046..430acfd4497 100644
--- a/intern/opensubdiv/internal/base/opensubdiv_capi.cc
+++ b/intern/opensubdiv/internal/base/opensubdiv_capi.cc
@@ -20,6 +20,7 @@
# include <iso646.h>
#endif
+#include "internal/base/util.h"
#include "internal/device/device_context_cuda.h"
#include "internal/device/device_context_glsl_compute.h"
#include "internal/device/device_context_glsl_transform_feedback.h"
diff --git a/intern/opensubdiv/internal/opensubdiv_util.h b/intern/opensubdiv/internal/base/type.h
similarity index 77%
copy from intern/opensubdiv/internal/opensubdiv_util.h
copy to intern/opensubdiv/internal/base/type.h
index 379ce20c479..95c307bed6a 100644
--- a/intern/opensubdiv/internal/opensubdiv_util.h
+++ b/intern/opensubdiv/internal/base/type.h
@@ -14,8 +14,8 @@
// along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifndef OPENSUBDIV_UTIL_H_
-#define OPENSUBDIV_UTIL_H_
+#ifndef OPENSUBDIV_BASE_TYPE_H_
+#define OPENSUBDIV_BASE_TYPE_H_
#include <stdint.h>
@@ -41,16 +41,7 @@ using std::swap;
using std::unordered_map;
using std::vector;
-#define STRINGIFY_ARG(x) "" #x
-#define STRINGIFY_APPEND(a, b) "" a #b
-#define STRINGIFY(x) STRINGIFY_APPEND("", x)
-
-void stringSplit(vector<string> *tokens,
- const string &str,
- const string &separators,
- bool skip_empty);
-
} // namespace opensubdiv
} // namespace blender
-#endif // OPENSUBDIV_UTIL_H_
+#endif // OPENSUBDIV_BASE_TYPE_H_
diff --git a/intern/opensubdiv/internal/opensubdiv_util.cc b/intern/opensubdiv/internal/base/util.cc
similarity index 92%
rename from intern/opensubdiv/internal/opensubdiv_util.cc
rename to intern/opensubdiv/internal/base/util.cc
index ea61b21e5d0..9c858ec3cda 100644
--- a/intern/opensubdiv/internal/opensubdiv_util.cc
+++ b/intern/opensubdiv/internal/base/util.cc
@@ -14,14 +14,7 @@
// along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#include "internal/opensubdiv_util.h"
-
-#include <GL/glew.h>
-#include <cstring>
-
-#ifdef _MSC_VER
-# include <iso646.h>
-#endif
+#include "internal/base/util.h"
namespace blender {
namespace opensubdiv {
@@ -44,7 +37,7 @@ void stringSplit(vector<string> *tokens,
string token = str.substr(token_start, token_length);
tokens->push_back(token);
}
- // Re-set token pointers,
+ // Re-set token pointers.
token_start = i + 1;
token_length = 0;
}
diff --git a/intern/opensubdiv/internal/opensubdiv_util.h b/intern/opensubdiv/internal/base/util.h
similarity index 65%
rename from intern/opensubdiv/internal/opensubdiv_util.h
rename to intern/opensubdiv/internal/base/util.h
index 379ce20c479..4035ba7301a 100644
--- a/intern/opensubdiv/internal/opensubdiv_util.h
+++ b/intern/opensubdiv/internal/base/util.h
@@ -14,37 +14,14 @@
// along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#ifndef OPENSUBDIV_UTIL_H_
-#define OPENSUBDIV_UTIL_H_
+#ifndef OPENSUBDIV_BASE_UTIL_H_
+#define OPENSUBDIV_BASE_UTIL_H_
-#include <stdint.h>
-
-#include <algorithm>
-#include <cassert>
-#include <stack>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
+#include "internal/base/type.h"
namespace blender {
namespace opensubdiv {
-using std::fill;
-using std::make_pair;
-using std::max;
-using std::min;
-using std::pair;
-using std::stack;
-using std::string;
-using std::swap;
-using std::unordered_map;
-using std::vector;
-
-#define STRINGIFY_ARG(x) "" #x
-#define STRINGIFY_APPEND(a, b) "" a #b
-#define STRINGIFY(x) STRINGIFY_APPEND("", x)
-
void stringSplit(vector<string> *tokens,
const string &str,
const string &separators,
@@ -53,4 +30,4 @@ void stringSplit(vector<string> *tokens,
} // namespace opensubdiv
} // namespace blender
-#endif // OPENSUBDIV_UTIL_H_
+#endif // OPENSUBDIV_BASE_UTIL_H_
diff --git a/intern/opensubdiv/internal/evaluator/evaluator_impl.cc b/intern/opensubdiv/internal/evaluator/evaluator_impl.cc
index 5216903a169..341e8dbc233 100644
--- a/intern/opensubdiv/internal/evaluator/evaluator_impl.cc
+++ b/intern/opensubdiv/internal/evaluator/evaluator_impl.cc
@@ -37,7 +37,7 @@
#include "MEM_guardedalloc.h"
-#include "internal/opensubdiv_util.h"
+#include "internal/base/type.h"
#include "internal/topology/topology_refiner_impl.h"
#include "opensubdiv_topology_refiner_capi.h"
diff --git a/intern/opensubdiv/internal/topology/topology_refiner_capi.cc b/intern/opensubdiv/internal/topology/topology_refiner_capi.cc
index fbca43065b4..167d618804f 100644
--- a/intern/opensubdiv/internal/topology/topology_refiner_capi.cc
+++ b/intern/opensubdiv/internal/topology/topology_refiner_capi.cc
@@ -20,8 +20,8 @@
#include "MEM_guardedalloc.h"
#include "internal/base/edge_map.h"
+#include "internal/base/type.h"
#include "internal/base/type_convert.h"
-#include "internal/opensubdiv_util.h"
#include "internal/topology/topology_refiner_impl.h"
#include "opensubdiv_converter_capi.h"
diff --git a/intern/opensubdiv/internal/topology/topology_refiner_factory.cc b/intern/opensubdiv/internal/topology/topology_refiner_factory.cc
index b35b0cf1f82..1a51fce6e24 100644
--- a/intern/opensubdiv/internal/topology/topology_refiner_factory.cc
+++ b/intern/opensubdiv/internal/topology/topology_refiner_factory.cc
@@ -27,8 +27,8 @@
#include <opensubdiv/far/topologyRefinerFactory.h>
+#include "internal/base/type.h"
#include "internal/base/type_convert.h"
-#include "internal/opensubdiv_util.h"
#include "opensubdiv_converter_capi.h"
using blender::opensubdiv::min;
More information about the Bf-blender-cvs
mailing list