[Bf-blender-cvs] [ffabd03] master: OpenSubdiv: disable TF on lower GL versions. Fixes T46794

Mike Erwin noreply at git.blender.org
Mon Dec 7 00:59:08 CET 2015


Commit: ffabd037bbdd807c3b2ff179312a3cc2b379d2a9
Author: Mike Erwin
Date:   Tue Dec 1 20:48:08 2015 -0500
Branches: master
https://developer.blender.org/rBffabd037bbdd807c3b2ff179312a3cc2b379d2a9

OpenSubdiv: disable TF on lower GL versions. Fixes T46794

My previous edit to this check was too lax.

OSD's shader for the Transform Feedback evaluator declares itself
#version 410 so disable the feature if user's GL < 4.1.

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

M	intern/opensubdiv/opensubdiv_utils_capi.cc

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

diff --git a/intern/opensubdiv/opensubdiv_utils_capi.cc b/intern/opensubdiv/opensubdiv_utils_capi.cc
index aac1995..c993e34 100644
--- a/intern/opensubdiv/opensubdiv_utils_capi.cc
+++ b/intern/opensubdiv/opensubdiv_utils_capi.cc
@@ -66,8 +66,7 @@ int openSubdiv_getAvailableEvaluators(void)
 #endif  /* OPENSUBDIV_HAS_OPENCL */
 
 #ifdef OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK
-	if (GLEW_VERSION_3_0 || GLEW_ARB_texture_buffer_object) {
-		// TODO(merwin): remove extension check once Blender moves to 3.2 core
+	if (GLEW_VERSION_4_1) {
 		flags |= OPENSUBDIV_EVALUATOR_GLSL_TRANSFORM_FEEDBACK;
 	}
 #endif  /* OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK */




More information about the Bf-blender-cvs mailing list