[Bf-blender-cvs] [b318464] master: OpenSubdiv: Enable GLSL Compute for AMD devices

[Sergey Sharybin]

Commit: b3184640fe800d1c39688183d7e91e858992636f
Author: Sergey Sharybin
Date: Tue Nov 10 12:14:50 2015 +0500
Branches: master
https://developer.blender.org/rBb3184640fe800d1c39688183d7e91e858992636f

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 :)

===================================================================

M intern/opensubdiv/opensubdiv_utils_capi.cc

===================================================================

diff --git a/intern/opensubdiv/opensubdiv_utils_capi.cc b/intern/opensubdiv/opensubdiv_utils_capi.cc
index a945484..ea7b3bc 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;