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:
authorMike Erwin <significant.bit@gmail.com>2015-11-14 21:43:39 +0300
committerMike Erwin <significant.bit@gmail.com>2015-11-14 21:43:39 +0300
commitf34cb5ab5a80d553991ecdfc2e97dbbff8a35c06 (patch)
treeb94054abf222dd43192005e464ea300367403d86 /intern/opensubdiv
parent46478ad2bc2f3b6d66fdfec286a32da6f43e34cf (diff)
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;
Diffstat (limited to 'intern/opensubdiv')
-rw-r--r--intern/opensubdiv/opensubdiv_capi.cc9
1 files changed, 6 insertions, 3 deletions
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
+ );
}