Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-09-16 18:23:32 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-09-16 18:23:32 +0300
commit7b3491f2c65b842eaa266f2e95822876fff93946 (patch)
tree049854dddd68455bca64cee8a28d0dd6a685b4a0
parent19d17c8d908039b73b3437432b62da8dd268e05c (diff)
OpenSubdiv: Fix for missing caching of vendor string parsing result
-rw-r--r--intern/opensubdiv/opensubdiv_capi.cc1
-rw-r--r--intern/opensubdiv/opensubdiv_utils_capi.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/intern/opensubdiv/opensubdiv_capi.cc b/intern/opensubdiv/opensubdiv_capi.cc
index a56e29f31b3..11cf170365e 100644
--- a/intern/opensubdiv/opensubdiv_capi.cc
+++ b/intern/opensubdiv/opensubdiv_capi.cc
@@ -304,6 +304,7 @@ int openSubdiv_supportGPUDisplay(void)
static bool vendor_checked = false;
static bool is_intel = false;
if (!vendor_checked) {
+ vendor_checked = true;
const char *vendor = (const char *)glGetString(GL_VENDOR);
if (strstr(vendor, "Intel")) {
if(getenv("OPENSUBDIV_ALLOW_INTEL") == NULL) {
diff --git a/intern/opensubdiv/opensubdiv_utils_capi.cc b/intern/opensubdiv/opensubdiv_utils_capi.cc
index a3aff5327db..74db862484a 100644
--- a/intern/opensubdiv/opensubdiv_utils_capi.cc
+++ b/intern/opensubdiv/opensubdiv_utils_capi.cc
@@ -78,6 +78,7 @@ int openSubdiv_getAvailableEvaluators(void)
* hard time evaluating required shaders.
*/
if (!vendor_checked) {
+ vendor_checked = true;
const char *vendor = (const char *)glGetString(GL_VENDOR);
const char *renderer = (const char *)glGetString(GL_RENDERER);
if (strstr(vendor, "ATI") ||