From f34cb5ab5a80d553991ecdfc2e97dbbff8a35c06 Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Sat, 14 Nov 2015 13:43:39 -0500 Subject: 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; --- intern/opensubdiv/opensubdiv_capi.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'intern/opensubdiv') diff --git a/intern/opensubdiv/opensubdiv_capi.cc b/intern/opensubdiv/opensubdiv_capi.cc index 804cc39a585..1fd9c0b7873 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 + ); } -- cgit v1.2.3