Commit Graph

1025 Commits

Author SHA1 Message Date
manuelk
c76e6623d7 Fix crash bug triggered by hole-tagged extraordinary faces
note 1 : this fix is somewhat delicate and may trigger other problems that
         i did not notice with superficial testing
note 2 : extraordinary faces surrounded by holes still break in adaptive mode
2014-10-23 12:56:11 -07:00
manuelk
787a80ce7f Merge branch 'release/v2_6_1' 2014-09-05 10:58:29 -07:00
manuelk
5ede429f2f Release 2.6.1 2014-09-05 10:57:30 -07:00
Manuel Kraemer
102f2465c3 Merge pull request #347 from nathan-at-digitalfish/digitalfish
Minor change to NOTICE.txt
2014-08-22 13:18:52 -07:00
Nathan Litke
d080b42fdf Corrected spelling of "DigitalFish". 2014-08-22 12:37:52 -07:00
manuelk
5bdf5a85cc Add Digital Fish to NOTICE.txt to reflect file contributions 2014-08-19 14:46:31 -07:00
manuelk
8657713945 Merge branch 'release/v2_6_0' 2014-08-19 11:57:43 -07:00
manuelk
942957a5e7 Update release notes for release 2.6.0 2014-08-19 11:41:16 -07:00
manuelk
e55dca0ef0 Update NOTICE.txt to reflect Google's contribution 2014-08-19 11:13:05 -07:00
Manuel Kraemer
d14ec1cf5e Merge pull request #346 from nathan-at-digitalfish/no_neon
Allow NEON to be disabled on Android.
2014-08-07 13:29:17 -07:00
Nathan Litke
0128417447 Allow NEON to be disabled on Android. Works similar to GCD on Mac OS X. 2014-08-07 13:10:54 -07:00
Sergey Sharybin
b836a31a22 Add basic functions to work with FV data via evaluator API
Currently supports clearing and pushing FV name and data.
2014-08-07 10:39:55 -07:00
manuelk
105919159d Fix glfw 3 Linux dependencies (add Xcursor and -lrt) 2014-08-07 10:20:03 -07:00
Manuel Kraemer
cf8f5a97a8 Merge pull request #345 from RachidElGuerrab/neon_kernels
Added subdivision kernels for ARM NEON
2014-08-07 10:07:48 -07:00
Manuel Kraemer
5d6496b8e4 Merge pull request #344 from nathan-at-digitalfish/fix_vertex_split
Fix for OsdUtilVertexSplit
2014-08-06 19:05:49 -07:00
Rachid El Guerrab
035e58f44a Added subdivision kernels for ARM NEON
* assembler kernels are based on the C implementation in neonKernel.cpp
* enable assembler kernel functions in neonComputeController.cpp with #define USE_ASM_KERNELS 1
2014-08-05 22:09:12 -07:00
Nathan Litke
22d4939563 Fixes a bug in OsdUtilVertexSplit that occurs when getting the address of the end of a std::vector. 2014-08-05 18:14:45 -07:00
Manuel Kraemer
df719eb9ed Revert "added memcpyasync and streams to cuda backend"
This reverts commit 84212cd725.
2014-08-02 12:40:08 -07:00
Manuel Kraemer
8c9096cdc8 Merge pull request #334 from nathan-at-digitalfish/fix_quad_face_factory
Fix for CATMARK_QUAD_FACE_VERTEX kernel in FarCatmarkSubdivisionTablesFactory
2014-07-24 17:52:46 -07:00
Manuel Kraemer
f987bf7b9f Merge pull request #333 from nathan-at-digitalfish/vertex_splitting
Vertex splitting
2014-07-24 17:52:23 -07:00
Manuel Kraemer
ae4ecf5bf9 Merge pull request #340 from adityaatluri/dev
added memcpyasync and streams to cuda backend
2014-07-24 17:42:41 -07:00
Frost
84212cd725 added memcpyasync and streams to cuda backend 2014-07-24 10:18:09 -04:00
Nathan Litke
9446270011 Fixes a bug in FarCatmarkSubdivisionTablesFactory that prevented the CATMARK_QUAD_FACE_VERTEX kernel from being selected for subdivision level 2 or greater. 2014-07-08 15:28:55 -07:00
Nathan Litke
21adceb4ec Added OsdUtilVertexSplit which creates a vertex-varying data table by duplicating vertices in a FarMesh. Catmark subdivision is supported.
* added public functions to `FarMeshFactory` that duplicate, rearrange, and split vertices
* added supporting protected functions to `FarCatmarkSubdivisionTablesFactory` and `FarPatchTablesFactory`
2014-07-08 14:20:37 -07:00
Manuel Kraemer
a9fb44a14a Merge pull request #332 from Nazg-Gul/dev
Support different subdivision schemes for OsdUtilMesh
2014-07-04 08:25:27 -07:00
Sergey Sharybin
6e3bad7224 Make C-API evaluator aware of different subdivisions
This makes it possible to use use bilinear subdivisions which
corresponds to Blender's simple subdivisions.

Most of the changes doesn't break any existing API because of
using default values. it's only C-API function which now expects
an extra argument.

This doesn't entirely work because it uses adaptive evaluator
which gives some unwanted curvatures when using bilinear scheme.
2014-07-04 21:23:50 +06:00
Sergey Sharybin
4a8bd50633 Support different subdivision schemes for OsdUtilMesh
Basically title says it all, now it's possible to pass
subdivision scheme to the OsdUtilMesh::Initialize().

It's a last argument with default to CATMARK so it doesn't
break existing code.
2014-07-04 17:28:18 +06:00
Manuel Kraemer
fc048bfb63 Merge pull request #331 from Nazg-Gul/dev
Fix mismatch in declaration and usage of OsdCudaComputeRestrictedVertexA
2014-07-03 09:51:25 -07:00
Sergey Sharybin
1ebf2449dd Fix mismatch in declaration and usage of OsdCudaComputeRestrictedVertexA
Unused argument `pass` was defined in the CUDA kernel and it was never
passed to this function from the C++ code. This argument is also wasn't
used by the function itself.
2014-07-03 16:54:15 +06:00
Manuel Kraemer
e3a19b25d8 Merge pull request #330 from Nazg-Gul/dev
Fix crashes when using rather low-end cards like Intel ones
2014-07-02 10:12:34 -07:00
Sergey Sharybin
7ac06db165 Fix crashes when using rather low-end cards like Intel ones
Solved by checking on run-time whether texture buffer objects
are supported.

When building with GLEW library doing compile-time check is
not enough, because actual information about existing features
is only known on runtime.

This only makes ti so CPU backend works, GLSL backends still
requires some work if we want them to make working. Not sure
it worth doing this now.
2014-07-02 22:17:58 +06:00
Manuel Kraemer
25b655e777 Merge pull request #329 from nathan-at-digitalfish/fix_osd_mesh
Fixed omissions in osd/mesh.h
2014-06-27 07:15:30 -07:00
Manuel Kraemer
87d9b2814b Merge pull request #328 from nathan-at-digitalfish/fix_compare_vertices
Fix for FarCatmarkSubdivisionTablesFactory::CompareVertices function
2014-06-27 07:14:13 -07:00
Nathan Litke
e4d7f3d495 Fixed omissions in osd/mesh.h.
* added `OsdMeshInterface::GetFarMesh` and `OsdMesh::GetFarMesh` to match `OsdGLMesh` and `OsdD3D11Mesh`
* added `interleaved` argument to `OsdMesh::Refine` to match `OsdMeshInterface::Refine`
2014-06-27 02:15:27 -07:00
Nathan Litke
8af05a57c5 Fixed a bug in the vertex order for restricted Catmark vertex-vertex kernel batches. 2014-06-27 02:09:03 -07:00
Nicholas Yue
4d36cf8c3c Fix duplicate variables with identical name 2014-06-25 14:52:33 -07:00
Manuel Kraemer
8e7d79c4ae Merge pull request #326 from nathan-at-digitalfish/fix_style
Style fixes
2014-06-25 11:58:12 -07:00
Nathan Litke
7763ffcb3d Style fixes for changes from v2_5_0..ad84f06. 2014-06-25 11:16:36 -07:00
Manuel Kraemer
ad84f06c60 Merge pull request #320 from nathan-at-digitalfish/new_vertex_vertex_kernels
Added the CATMARK_RESTRICTED_VERT_VERTEX_A, CATMARK_RESTRICTED_VERT_VERT...
2014-06-25 10:52:08 -07:00
Manuel Kraemer
e46e804131 Merge pull request #323 from nathan-at-digitalfish/fix_create_cl_buffer
Fix for createCLBuffer
2014-06-24 12:38:06 -07:00
Nathan Litke
299966fd5c Fixed an error in createCLBuffer that occurs when the buffer size is zero. 2014-06-24 12:14:41 -07:00
Nathan Litke
73c29a0002 Fixed an error in createCLBuffer that occurs when the buffer size is zero. 2014-06-24 12:12:00 -07:00
Manuel Kraemer
0c6c17e4bb Merge pull request #322 from nathan-at-digitalfish/fix_edge_vertex_kernel_batch
Fix for edge-vertex kernel batch
2014-06-24 12:01:32 -07:00
Nathan Litke
5d00c37637 Fixed a bug in the creation of an edge-vertex kernel batch. 2014-06-24 11:58:12 -07:00
Nathan Litke
a23c8e05bd Fixed a bug in the creation of an edge-vertex kernel batch. 2014-06-24 11:55:25 -07:00
David G. Yu
ccdffb5855 Fixed cmake diagnostic messsage. 2014-06-23 22:14:57 -07:00
David G. Yu
54207ce79b Fixed build errors. 2014-06-23 22:07:50 -07:00
Nathan Litke
b7a763853c Added the CATMARK_RESTRICTED_VERT_VERTEX_A, CATMARK_RESTRICTED_VERT_VERTEX_B1, and CATMARK_RESTRICTED_VERT_VERTEX_B2 kernels which compute vertices resulting from the refinement of a smooth or (fully) sharp vertex.
* CATMARK_RESTRICTED_VERT_VERTEX_A handles k_Crease and k_Corner rules
* CATMARK_RESTRICTED_VERT_VERTEX_B1 handles regular k_Smooth and k_Dart rules
* CATMARK_RESTRICTED_VERT_VERTEX_B2 handles irregular k_Smooth and k_Dart rules
2014-06-23 15:59:43 -07:00
Manuel Kraemer
af3424e1da Merge pull request #310 from nathan-at-digitalfish/new_edge_vertex_kernel
New edge vertex kernel
2014-06-23 15:05:49 -07:00
Nathan Litke
634187f6c5 Fixed a bug in the CUDA kernel. 2014-06-23 14:49:10 -07:00