From f997449f841f8229680f9e0f0beed4809b9111ab Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Mon, 23 Nov 2015 03:33:49 -0500 Subject: OpenSubdiv: support OpenGL 3.x GLSL 130, 140, 150 with extensions as needed. Similar logic to my recent gpu_extensions changes. Partially fixes T46706. Matcaps now work with OpenSubdiv, as do basic materials. Anything with UV coordinates is still broken. --- intern/opensubdiv/opensubdiv_capi.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'intern/opensubdiv/opensubdiv_capi.cc') diff --git a/intern/opensubdiv/opensubdiv_capi.cc b/intern/opensubdiv/opensubdiv_capi.cc index 1fd9c0b7873..f715bf32565 100644 --- a/intern/opensubdiv/opensubdiv_capi.cc +++ b/intern/opensubdiv/opensubdiv_capi.cc @@ -296,9 +296,8 @@ const struct OpenSubdiv_TopologyRefinerDescr *openSubdiv_getGLMeshTopologyRefine int openSubdiv_supportGPUDisplay(void) { // 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 - ); + return (GLEW_VERSION_3_2 && GLEW_ARB_compatibility) || + (GLEW_VERSION_3_1 && GLEW_ARB_compatibility && GLEW_EXT_geometry_shader4) || + (GLEW_VERSION_3_0 && GLEW_EXT_geometry_shader4 && GLEW_ARB_uniform_buffer_object && GLEW_ARB_texture_buffer_object); + /* also ARB_explicit_attrib_location? */ } -- cgit v1.2.3