Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 7 Jun 2017 10:18:07 +0000 (12:18 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 7 Jun 2017 10:18:07 +0000 (12:18 +0200)
1  2 
intern/opensubdiv/opensubdiv_capi.cc
intern/opensubdiv/opensubdiv_capi.h

index 8337bcb0ce5c6ace4930207f1488cc3a74c6bf15,91803551f12c85ee35b9db2ee55f8f9a9cc3a920..aed5d4fbd14dd628ccc1920568ddcc3b495b7c55
@@@ -368,3 -369,21 +369,8 @@@ const struct OpenSubdiv_TopologyRefiner
  {
        return gl_mesh->topology_refiner;
  }
 -int openSubdiv_supportGPUDisplay(void)
 -{
 -      // TODO: simplify extension check once Blender adopts GL 3.2
 -      return openSubdiv_gpu_legacy_support() &&
 -             (GLEW_VERSION_3_2 ||
 -             (GLEW_VERSION_3_1 && GLEW_EXT_geometry_shader4) ||
 -             (GLEW_VERSION_3_0 &&
 -              GLEW_EXT_geometry_shader4 &&
 -              GLEW_ARB_uniform_buffer_object &&
 -              (GLEW_ARB_texture_buffer_object || GLEW_EXT_texture_buffer_object)));
 -      /* also ARB_explicit_attrib_location? */
 -}
 -
+ int openSubdiv_getVersionHex(void)
+ {
+       return OPENSUBDIV_VERSION_NUMBER;
+ }
index 3fdfefd525fe95f26692bd6b0072cc150052cb74,281bd3f010d64d81596db368b68855a63759b0f1..2c3fcee7dbb0b9ec93ea3bbc9bdbcd8318fe5c56
@@@ -146,10 -146,14 +146,12 @@@ void openSubdiv_osdGLAllocFVar(struct O
  void openSubdiv_osdGLDestroyFVar(OpenSubdiv_GLMesh *gl_mesh);
  
  /* ** Utility functions ** */
 -int openSubdiv_supportGPUDisplay(void);
  int openSubdiv_getAvailableEvaluators(void);
 -void openSubdiv_init(bool gpu_legacy_support);
 +void openSubdiv_init(void);
  void openSubdiv_cleanup(void);
 -bool openSubdiv_gpu_legacy_support(void);
  
+ int openSubdiv_getVersionHex(void);
  #ifdef __cplusplus
  }
  #endif