Blender Git Loki
Git Commits -> Revision d920382
Revision d920382 by Sergey Sharybin (master) July 16, 2018, 07:52 (GMT) |
OpenSubdiv: Re-work C-API integration Main goal is to make API simpler to follow (at least ion terms what is defined/declared where, as opposite of handful big headers which includes all the declarations), and also avoid a big set of long and obscure functions. Now C-API files are split into smaller ones, following OpenSubdiv behavior more closely, and also function pointers in structures used a lot more, which shortens functions names, UV integration part in GL Mesh is mainly stripped away, it needs to be done differently. On a related topic, UV coordinates API in converter needs to be removed as well, we do not need coordinates, only island connectivity information there. Additional changes: - Varying interpolation in evaluator API are temporarily disabled, need to extend API somewhere (probably, evaluator's API) to inform layout information of vertex data (whether it contains varying data, width, stride and such). - Evaluator now can interpolate face-varying data. Only works for adaptive refiner, since some issues in OpenSubdiv itself. Planned changes: - Remove uv coordinates from TopologyConverter. - Support evaluation of patches (as opposite to individual coordinates as it happens currently). - Support more flexible layout of varying and face-varying data. It is stupid to assume varying is 3 floats and face-varying 2 floats. - Support of second order derivatives. - Everything else what i'm missing in this list. |
Commit Details:
Full Hash: d9203820467665ba19e1956e035de663849e695c
Parent Commit: b29b73a
Lines Changed: +6120, -4116
37 Added Paths:
/intern/opensubdiv/internal/opensubdiv.cc (+99, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_factory.cc (+438, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_factory.h (+37, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_internal.cc (+70, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_internal.h (+50, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_orient.cc (+66, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_orient.h (+50, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_orient_impl.h (+66, -0) (View)
/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc (+226, -0) (View)
/intern/opensubdiv/internal/opensubdiv_device_context_cuda.h (+54, -0) (View)
/intern/opensubdiv/internal/opensubdiv_device_context_opencl.cc (+269, -0) (View)
/intern/opensubdiv/internal/opensubdiv_device_context_opencl.h (+52, -0) (View)
/intern/opensubdiv/internal/opensubdiv_evaluator.cc (+154, -0) (View)
/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc (+734, -0) (View)
/intern/opensubdiv/internal/opensubdiv_evaluator_internal.h (+134, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc (+287, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh_draw.cc (+587, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh_draw.h (+39, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh_fvar.cc (+175, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh_fvar.h (+57, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh_internal.cc (+32, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh_internal.h (+43, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gpu.cc (+788, -0) (View)
/intern/opensubdiv/internal/opensubdiv_internal.h (+38, -0) (View)
/intern/opensubdiv/internal/opensubdiv_topology_refiner.cc (+315, -0) (View)
/intern/opensubdiv/internal/opensubdiv_topology_refiner.h (+41, -0) (View)
/intern/opensubdiv/internal/opensubdiv_topology_refiner_internal.cc (+26, -0) (View)
/intern/opensubdiv/internal/opensubdiv_topology_refiner_internal.h (+47, -0) (View)
/intern/opensubdiv/internal/opensubdiv_util.cc (+61, -0) (View)
/intern/opensubdiv/internal/opensubdiv_util.h (+39, -0) (View)
/intern/opensubdiv/opensubdiv_capi_type.h (+41, -0) (View)
/intern/opensubdiv/opensubdiv_evaluator_capi.h (+117, -0) (View)
/intern/opensubdiv/opensubdiv_gl_mesh_capi.h (+92, -0) (View)
/intern/opensubdiv/opensubdiv_topology_refiner_capi.h (+110, -0) (View)
/intern/opensubdiv/shader/gpu_shader_opensubdiv_fragment.glsl (+172, -0) (View)
/intern/opensubdiv/shader/gpu_shader_opensubdiv_geometry.glsl (+154, -0) (View)
/intern/opensubdiv/shader/gpu_shader_opensubdiv_vertex.glsl (+46, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_factory.cc (+438, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_factory.h (+37, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_internal.cc (+70, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_internal.h (+50, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_orient.cc (+66, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_orient.h (+50, -0) (View)
/intern/opensubdiv/internal/opensubdiv_converter_orient_impl.h (+66, -0) (View)
/intern/opensubdiv/internal/opensubdiv_device_context_cuda.cc (+226, -0) (View)
/intern/opensubdiv/internal/opensubdiv_device_context_cuda.h (+54, -0) (View)
/intern/opensubdiv/internal/opensubdiv_device_context_opencl.cc (+269, -0) (View)
/intern/opensubdiv/internal/opensubdiv_device_context_opencl.h (+52, -0) (View)
/intern/opensubdiv/internal/opensubdiv_evaluator.cc (+154, -0) (View)
/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc (+734, -0) (View)
/intern/opensubdiv/internal/opensubdiv_evaluator_internal.h (+134, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh.cc (+287, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh_draw.cc (+587, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh_draw.h (+39, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh_fvar.cc (+175, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh_fvar.h (+57, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh_internal.cc (+32, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gl_mesh_internal.h (+43, -0) (View)
/intern/opensubdiv/internal/opensubdiv_gpu.cc (+788, -0) (View)
/intern/opensubdiv/internal/opensubdiv_internal.h (+38, -0) (View)
/intern/opensubdiv/internal/opensubdiv_topology_refiner.cc (+315, -0) (View)
/intern/opensubdiv/internal/opensubdiv_topology_refiner.h (+41, -0) (View)
/intern/opensubdiv/internal/opensubdiv_topology_refiner_internal.cc (+26, -0) (View)
/intern/opensubdiv/internal/opensubdiv_topology_refiner_internal.h (+47, -0) (View)
/intern/opensubdiv/internal/opensubdiv_util.cc (+61, -0) (View)
/intern/opensubdiv/internal/opensubdiv_util.h (+39, -0) (View)
/intern/opensubdiv/opensubdiv_capi_type.h (+41, -0) (View)
/intern/opensubdiv/opensubdiv_evaluator_capi.h (+117, -0) (View)
/intern/opensubdiv/opensubdiv_gl_mesh_capi.h (+92, -0) (View)
/intern/opensubdiv/opensubdiv_topology_refiner_capi.h (+110, -0) (View)
/intern/opensubdiv/shader/gpu_shader_opensubdiv_fragment.glsl (+172, -0) (View)
/intern/opensubdiv/shader/gpu_shader_opensubdiv_geometry.glsl (+154, -0) (View)
/intern/opensubdiv/shader/gpu_shader_opensubdiv_vertex.glsl (+46, -0) (View)
15 Deleted Paths:
/intern/opensubdiv/gpu_shader_opensubdiv_fragment.glsl (+0, -172)
/intern/opensubdiv/gpu_shader_opensubdiv_geometry.glsl (+0, -154)
/intern/opensubdiv/gpu_shader_opensubdiv_vertex.glsl (+0, -46)
/intern/opensubdiv/opensubdiv_capi.cc (+0, -441)
/intern/opensubdiv/opensubdiv_converter.cc (+0, -764)
/intern/opensubdiv/opensubdiv_device_context_cuda.cc (+0, -237)
/intern/opensubdiv/opensubdiv_device_context_cuda.h (+0, -54)
/intern/opensubdiv/opensubdiv_device_context_opencl.cc (+0, -251)
/intern/opensubdiv/opensubdiv_device_context_opencl.h (+0, -58)
/intern/opensubdiv/opensubdiv_evaluator_capi.cc (+0, -516)
/intern/opensubdiv/opensubdiv_gl_mesh.h (+0, -40)
/intern/opensubdiv/opensubdiv_gpu_capi.cc (+0, -788)
/intern/opensubdiv/opensubdiv_intern.h (+0, -46)
/intern/opensubdiv/opensubdiv_topology_refiner.h (+0, -41)
/intern/opensubdiv/opensubdiv_utils_capi.cc (+0, -88)
/intern/opensubdiv/gpu_shader_opensubdiv_geometry.glsl (+0, -154)
/intern/opensubdiv/gpu_shader_opensubdiv_vertex.glsl (+0, -46)
/intern/opensubdiv/opensubdiv_capi.cc (+0, -441)
/intern/opensubdiv/opensubdiv_converter.cc (+0, -764)
/intern/opensubdiv/opensubdiv_device_context_cuda.cc (+0, -237)
/intern/opensubdiv/opensubdiv_device_context_cuda.h (+0, -54)
/intern/opensubdiv/opensubdiv_device_context_opencl.cc (+0, -251)
/intern/opensubdiv/opensubdiv_device_context_opencl.h (+0, -58)
/intern/opensubdiv/opensubdiv_evaluator_capi.cc (+0, -516)
/intern/opensubdiv/opensubdiv_gl_mesh.h (+0, -40)
/intern/opensubdiv/opensubdiv_gpu_capi.cc (+0, -788)
/intern/opensubdiv/opensubdiv_intern.h (+0, -46)
/intern/opensubdiv/opensubdiv_topology_refiner.h (+0, -41)
/intern/opensubdiv/opensubdiv_utils_capi.cc (+0, -88)
7 Modified Paths:
/intern/opensubdiv/CMakeLists.txt (+34, -14) (Diff)
/intern/opensubdiv/opensubdiv_capi.h (+29, -149) (Diff)
/intern/opensubdiv/opensubdiv_converter_capi.h (+132, -131) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf.c (+4, -2) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf_intern.h (+2, -2) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c (+65, -74) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c (+48, -48) (Diff)
/intern/opensubdiv/opensubdiv_capi.h (+29, -149) (Diff)
/intern/opensubdiv/opensubdiv_converter_capi.h (+132, -131) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf.c (+4, -2) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf_intern.h (+2, -2) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c (+65, -74) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c (+48, -48) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021