diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-11 13:30:30 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-11 13:30:30 +0300 |
commit | e2c0197a96dbac2aee519fbfb142441c6aed0963 (patch) | |
tree | 71d45ebf954c14a9906547e05949313169e7eb24 /intern | |
parent | 2325d15d02e9e0b1fda2586ad5ffbe8364e706f4 (diff) | |
parent | e26f61a2b5071ba4e587dbee62e55ad46519a5d9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/device/opencl/opencl.h | 3 | ||||
-rw-r--r-- | intern/opensubdiv/opensubdiv_capi.cc | 64 |
2 files changed, 67 insertions, 0 deletions
diff --git a/intern/cycles/device/opencl/opencl.h b/intern/cycles/device/opencl/opencl.h index 7da690904aa..78ca377d933 100644 --- a/intern/cycles/device/opencl/opencl.h +++ b/intern/cycles/device/opencl/opencl.h @@ -27,6 +27,9 @@ CCL_NAMESPACE_BEGIN +/* Disable workarounds, seems to be working fine on latest drivers. */ +#define CYCLES_DISABLE_DRIVER_WORKAROUNDS + /* Define CYCLES_DISABLE_DRIVER_WORKAROUNDS to disable workaounds for testing */ #ifndef CYCLES_DISABLE_DRIVER_WORKAROUNDS /* Work around AMD driver hangs by ensuring each command is finished before doing anything else. */ diff --git a/intern/opensubdiv/opensubdiv_capi.cc b/intern/opensubdiv/opensubdiv_capi.cc index aed5d4fbd14..bb865bc0e0f 100644 --- a/intern/opensubdiv/opensubdiv_capi.cc +++ b/intern/opensubdiv/opensubdiv_capi.cc @@ -75,6 +75,16 @@ #include "MEM_guardedalloc.h" +#include <string> +#include <vector> + +using std::string; +using std::vector; + +#define STRINGIFY_ARG(x) "" #x +#define STRINGIFY_APPEND(a, b) "" a #b +#define STRINGIFY(x) STRINGIFY_APPEND("", x) + /* **************** Types declaration **************** */ using OpenSubdiv::Osd::GLMeshInterface; @@ -147,6 +157,38 @@ typedef Mesh<GLVertexBuffer, namespace { +#if !defined(OPENSUBDIV_VERSION_NUMBER) && !defined(OPENSUBDIV_VERSION_MINOR) +void stringSplit(vector<string>* tokens, + const string& str, + const string& separators, + bool skip_empty) { + size_t token_start = 0, token_length = 0; + for (size_t i = 0; i < str.length(); ++i) { + const char ch = str[i]; + if (separators.find(ch) == string::npos) { + /* Append non-separator char to a token. */ + ++token_length; + } else { + /* Append current token to the list (if any). */ + if (token_length > 0 || !skip_empty) { + string token = str.substr(token_start, token_length); + tokens->push_back(token); + } + /* Re-set token pointers, */ + token_start = i + 1; + token_length = 0; + } + } + /* Append token which might be at the end of the string. */ + if ((token_length != 0) || + (!skip_empty && token_start > 0 && + separators.find(str[token_start-1]) != string::npos)) { + string token = str.substr(token_start, token_length); + tokens->push_back(token); + } +} +#endif + struct FVarVertex { float u, v; void Clear() { @@ -372,5 +414,27 @@ const struct OpenSubdiv_TopologyRefinerDescr *openSubdiv_getGLMeshTopologyRefine int openSubdiv_getVersionHex(void) { +#if defined(OPENSUBDIV_VERSION_NUMBER) return OPENSUBDIV_VERSION_NUMBER; +#elif defined(OPENSUBDIV_VERSION_MAJOR) + return OPENSUBDIV_VERSION_MAJOR * 10000 + + OPENSUBDIV_VERSION_MINOR * 100 + + OPENSUBDIV_VERSION_PATCH; +#elif defined(OPENSUBDIV_VERSION) + const char* version = STRINGIFY(OPENSUBDIV_VERSION); + if (version[0] == 'v') { + version += 1; + } + int major = 0, minor = 0, patch = 0; + vector<string> tokens; + stringSplit(&tokens, version, "_", true); + if (tokens.size() == 3) { + major = atoi(tokens[0].c_str()); + minor = atoi(tokens[1].c_str()); + patch = atoi(tokens[2].c_str()); + } + return major * 10000 + minor * 100 + patch; +#else + return 0; +#endif } |