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-11-10 10:14:50 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-11-10 10:16:18 +0300
commitb3184640fe800d1c39688183d7e91e858992636f (patch)
tree9a482e7db12f3f5ad3112bd91c2e96586f6ef1f7 /intern/opensubdiv
parentee761ebda95e00f99574a08df8b763401aba0070 (diff)
OpenSubdiv: Enable GLSL Compute for AMD devices
There was a bug in OpenSubdiv library which is now fixed by updating library in the build environments. Still requires testing, but now being at the beginning of release cycle is should be safe to simply enable option and let everyone to test :)
Diffstat (limited to 'intern/opensubdiv')
-rw-r--r--intern/opensubdiv/opensubdiv_utils_capi.cc23
1 files changed, 2 insertions, 21 deletions
diff --git a/intern/opensubdiv/opensubdiv_utils_capi.cc b/intern/opensubdiv/opensubdiv_utils_capi.cc
index a945484ba61..ea7b3bc6b84 100644
--- a/intern/opensubdiv/opensubdiv_utils_capi.cc
+++ b/intern/opensubdiv/opensubdiv_utils_capi.cc
@@ -72,27 +72,8 @@ int openSubdiv_getAvailableEvaluators(void)
#endif /* OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK */
#ifdef OPENSUBDIV_HAS_GLSL_COMPUTE
- static bool vendor_checked = false;
- static bool disable_glsl_compute = false;
- /* Force disable GLSL Compute on AMD hardware because it has really
- * 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 (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) {
- flags |= OPENSUBDIV_EVALUATOR_GLSL_COMPUTE;
- }
+ /* TODO(sergey): Do we need to check availble extensions here? */
+ flags |= OPENSUBDIV_EVALUATOR_GLSL_COMPUTE;
#endif /* OPENSUBDIV_HAS_GLSL_COMPUTE */
return flags;