[Bf-blender-cvs] [f34cb5a] master: tweak GL extension check for OpenSubdiv drawing

[Mike Erwin]

Commit: f34cb5ab5a80d553991ecdfc2e97dbbff8a35c06
Author: Mike Erwin
Date:   Sat Nov 14 13:43:39 2015 -0500
Branches: master
https://developer.blender.org/rBf34cb5ab5a80d553991ecdfc2e97dbbff8a35c06

tweak GL extension check for OpenSubdiv drawing

Once we adopt GL 3.2 across Blender, the check will be:

return GLEW_VERSION_4_0 || GLEW_ARB_gpu_shader5;

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

M	intern/opensubdiv/opensubdiv_capi.cc

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

diff --git a/intern/opensubdiv/opensubdiv_capi.cc b/intern/opensubdiv/opensubdiv_capi.cc
index 804cc39..1fd9c0b 100644
--- a/intern/opensubdiv/opensubdiv_capi.cc
+++ b/intern/opensubdiv/opensubdiv_capi.cc
@@ -295,7 +295,10 @@ const struct OpenSubdiv_TopologyRefinerDescr *openSubdiv_getGLMeshTopologyRefine
 
 int openSubdiv_supportGPUDisplay(void)
 {
-	return GLEW_EXT_geometry_shader4 &&
-	       GLEW_ARB_gpu_shader5 &&
-	       GLEW_ARB_uniform_buffer_object;
+	// TODO: simplify extension check once Blender adopts GL 3.2
+	return GLEW_VERSION_4_0 || (
+	       GLEW_EXT_geometry_shader4 && // ARB version core in 3.2
+	       GLEW_ARB_gpu_shader5 && // written against 3.2, core in 4.0
+	       GLEW_ARB_uniform_buffer_object // core in 3.1
+	       );
 }