Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OpenSubdiv: Attempt to solve crash in background mode

Browse Source
This commit is contained in:
Sergey Sharybin
2015-09-16 20:33:16 +05:00
parent 0f19e6d1a7
commit cf4711bdf9
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/opensubdiv/opensubdiv_capi.cc
View File

@@ -306,7 +306,7 @@ int openSubdiv_supportGPUDisplay(void)
if (!vendor_checked) {
vendor_checked = true;
const char *vendor = (const char *)glGetString(GL_VENDOR);
if (strstr(vendor, "Intel")) {
if (vendor != NULL && strstr(vendor, "Intel")) {
if(getenv("OPENSUBDIV_ALLOW_INTEL") == NULL) {
is_intel = true;
}

12
intern/opensubdiv/opensubdiv_utils_capi.cc
View File

@@ -81,11 +81,13 @@ int openSubdiv_getAvailableEvaluators(void)
vendor_checked = true;
const char *vendor = (const char *)glGetString(GL_VENDOR);
const char *renderer = (const char *)glGetString(GL_RENDERER);
if (strstr(vendor, "ATI") ||
strstr(renderer, "Mesa DRI R") ||
(strstr(renderer, "Gallium ") && strstr(renderer, " on ATI ")))
{
disable_glsl_compute = true;
if (vendor != NULL && renderer != NULL) {
if (strstr(vendor, "ATI") ||
strstr(renderer, "Mesa DRI R") ||
(strstr(renderer, "Gallium ") && strstr(renderer, " on ATI ")))
{
disable_glsl_compute = true;
}
}
}
if (!disable_glsl_compute) {