Commit Graph

1795 Commits

Author SHA1 Message Date
Takahito Tejima
1debcf15ff glEvalLimit: Fix an assertion failure when rand() takes RAND_MAX 2015-05-26 16:05:54 -07:00
David G Yu
96983b1a44 Merge pull request #530 from takahito-tejima/dev
Fix warning in glUtils.cpp
2015-05-26 18:56:47 -04:00
Takahito Tejima
a7abdafe2f Merge pull request #529 from davidgyu/winbuildfix
Added TBB dependencies for glEvalLimit
2015-05-26 15:33:43 -07:00
Takahito Tejima
b1ef25f026 Fix warning in glUtil.cpp 2015-05-26 15:33:05 -07:00
Takahito Tejima
47f79e54fc Merge pull request #528 from davidgyu/memfix
Fixed buffer access into empty container
2015-05-26 14:55:27 -07:00
David G. Yu
20343f9b30 Added TBB dependencies for glEvalLimit 2015-05-26 14:45:42 -07:00
Takahito Tejima
f64fbc7df8 Merge pull request #358 from ielillo/358 2015-05-26 14:44:15 -07:00
Takahito Tejima
22b5d65e46 reverting glewGetExtension with glewIsSupported until we find a better workaround. 2015-05-26 14:41:05 -07:00
Takahito Tejima
62b7197389 Merge branch '358' of https://github.com/ielillo/OpenSubdiv into ielillo-358
Conflicts:
	opensubdiv/far/stencilBuilder.cpp
2015-05-26 14:22:36 -07:00
David G Yu
60c70a2b38 Merge pull request #527 from c64kernal/dev_tut
Small update to far_tutorial 6.
2015-05-26 17:08:04 -04:00
David G Yu
f5008a544e Merge pull request #526 from takahito-tejima/dev
Osd API refactor: EvalStencils and EvalPatches
2015-05-26 17:07:43 -04:00
Takahito Tejima
48ee9bcaa6 glEvalLimit: Fix leaking toplogyRefiner 2015-05-26 11:22:17 -07:00
Takahito Tejima
749bbf4271 Fix OpenCL and CUDA EvalPatches kernels. 2015-05-26 11:13:30 -07:00
David G. Yu
8568370630 Fixed buffer access into empty container
Raised as a run-time error by the VS2013 debug STL implementation.
2015-05-26 11:03:21 -07:00
George ElKoura
0c90532481 Small update to far_tutorial 6.
Removed unneeded use of end cap factory in far_tutorial_6.
2015-05-25 23:19:21 -07:00
Takahito Tejima
541aeddd3a Osd API refactor: EvalStencils and EvalPatches
Add EvalStencils and EvalPatches API for most of CPU and GPU evaluators.

with this change, Eval API in the osd layer consists of following parts:

- Evaluators (Cpu, Omp, Tbb, Cuda, CL, GLXFB, GLCompute, D3D11Compute)
  implements EvalStencils and EvalPatches(*). Both supports derivatives
  (not fully implemented though)

- Interop vertex buffer classes (optional, same as before)
  Note that these classes are not necessary to use Evaluators.
  All evaluators have EvalStencils/Patches which take device-specific
  buffer objects. For example, GLXFBEvaluator can take GLuint directly
  for both stencil tables and input primvars. Although using these
  interop classes makes it easy to integrate osd into relatively
  simple applications.

- device-dependent StencilTable and PatchTable (optional)
  These are also optional, but can be used simply a substitute of
  Far::StencilTable and Far::PatchTable for osd evaluators.

- PatchArray, PatchCoord, PatchParam
  They are tiny structs used for GPU based patch evaluation.

(*) TODO and known issues:
- CLEvaluator and D3D11Evaluator's EvalPatches() have not been implemented.
- GPU Gregory patch evaluation has not been implemented in EvalPatches().
- CudaEvaluator::EvalPatches() is very unstable.
- All patch evaluation kernels have not been well optimized.
- Currently GLXFB kernel doesn't support derivative evaluation.
   There's a technical difficulty for the multi-stream output.
2015-05-25 22:43:43 -07:00
barfowl
85b65bd2ef Moved Vtr classes within internal namespace:
- moved all major Vtr classes within namespace internal
    - updated all Vtr class access with Far
2015-05-25 20:34:50 -07:00
Jeremy Cowles
d335c7249e Merge pull request #522 from barfowl/primvarRefiner
Moved primvar interpolation methods to new Far::PrimvarRefiner class
2015-05-24 22:18:26 -07:00
Jeremy Cowles
4b72d80fe4 Merge pull request #524 from c64kernal/dev_small
Fix build breakage on MSVC due to implicit downcasting.
2015-05-24 07:27:43 -07:00
George ElKoura
670a48fd86 Fix build breakage on MSVC due to implicit downcasting.
Be explicit about the casting from size_t to int in stencilBuilder.cpp.
2015-05-24 01:21:48 -07:00
George ElKoura
6c0e903fbc Merge pull request #523 from jcowles/dev
Add stencilTable.cpp, minor cleanup
2015-05-24 01:07:28 -07:00
Jeremy Cowles
15020c2c4c Fix StencilBuilder copyright (2015) 2015-05-23 20:34:59 -07:00
Jeremy Cowles
befbc282db Add stencilTable.cpp, minor cleanup
* Added stencilTable.cpp
 * Fixed the "off" variable shadow warning
 * Moved constructors to cpp file
 * Made LimitStencilTable constructor private
 * other minor clean up.
2015-05-23 20:31:18 -07:00
barfowl
a15edc1f2c Moved primvar interpolation methods to new Far::PrimvarRefiner class
- created new class Far::PrimvarRefiner with interpolation methods
    - removed interpolation and limit methods from Far::TopologyRefiner
    - replaced internal usage in Far::StencilTableFactory
    - replaced usage in regressions, tutorials and examples
2015-05-23 18:56:36 -07:00
Ignacio Lillo
e6733580ba Fixed warning that prevented building the project. 2015-05-23 00:48:58 -03:00
Ignacio Lillo
79eb6d5aeb Merge branch 'dev' into 358 2015-05-23 00:30:03 -03:00
Ignacio Lillo
0a6a47159e Merge branch 'upstream-dev' into dev 2015-05-23 00:29:39 -03:00
Ignacio Lillo
37ccad54a3 Refs #358. Refactored functions to comply with code conventions.
Also deleted bool uses_tesselation_shaders() since it was a duplicate of
bool SupportsAdaptiveTessellation().
2015-05-23 00:28:37 -03:00
George ElKoura
7a97d7be5d Merge pull request #520 from barfowl/vtr_friends
Removing friends from Vtr classes
2015-05-22 18:49:47 -07:00
Takahito Tejima
5ca67a9383 Merge pull request #519 from jcowles/dev
Faster, simpler stencil table construction
2015-05-22 16:42:45 -07:00
jcowles
909757ca9b Faster, simpler stencil table construction.
This is a new implementation of the stencil table construction algorithm found
in protoStencil.h. In local tests with production assets, the new algorithm is
~25% faster and significantly more stable, in terms of average performance

In one asset test, generating stencils for level 10 adaptive refinement of
BuzzLightyear was reduced from 18s to 13s.
2015-05-22 16:36:12 -07:00
barfowl
b64eb5e2e0 Removing friends from Vtr classes and making more accessible internally:
- removed all friend declarations (no more Far declarations with Vtr)
    - all protected methods made public
    - intent is to move these into namespace internal
    - access between Vtr classes is under review
2015-05-22 15:52:47 -07:00
Jeremy Cowles
330dd95e93 Merge pull request #518 from takahito-tejima/rename
Rename PatchTables/StencilTables to PatchTable/StencilTable
2015-05-22 12:57:40 -07:00
Takahito Tejima
a7c5179ef9 renaming (2/2) PatchTables and StencilTables to PatchTable and StencilTable
replace all occurrences reffering PatchTables, StencilTables, and their factories.
2015-05-22 11:50:01 -07:00
Takahito Tejima
e6f951c010 renaming (1/2) PatchTables and StencilTables to PatchTable and StencilTable
this commit just changes filenames (for better diffs)
2015-05-22 11:02:58 -07:00
Takahito Tejima
403268f2aa Merge pull request #517 from jcowles/dev-fix-glsl
Fix sharpness GLSL error for OSX
2015-05-22 08:58:15 -07:00
Takahito Tejima
5df793762b Merge pull request #516 from jcowles/dev-fixmaya
Fix MayaPolySmooth example
2015-05-22 08:56:14 -07:00
Jeremy Cowles
9759012dec Fix sharpness GLSL error on OSX 2015-05-22 00:43:41 -07:00
jcowles
b479851502 Fix MayaPolySmooth example
Fixing some minor fallout after merging #514.
2015-05-22 00:37:25 -07:00
Jeremy Cowles
bec60d5500 Merge pull request #512 from takahito-tejima/dev
remove maximum valence limitation in gregory basis and bspline basis end caps.
2015-05-21 23:38:40 -07:00
Jeremy Cowles
dc8bd1224d Merge pull request #514 from barfowl/far_level
Replacing obsolete TopologyRefiner methods with TopologyLevel
2015-05-21 23:32:05 -07:00
barfowl
54fbbc4538 Removed last remaining occurrences of obsolete methods. 2015-05-21 21:38:10 -07:00
barfowl
3d80cc56f5 Replaced and removed remaining use of TopologyRefiner level methods:
- replaced all remaining usage internal to far with TopologyLevel
    - removed the obsolete methods from TopologyRefiner
2015-05-21 21:26:41 -07:00
barfowl
5dbc1aee0d Fixed issue with exampls/farViewer 2015-05-21 20:42:29 -07:00
barfowl
fd89a1323e Fixed issue with examples/glFVarViewer 2015-05-21 20:33:02 -07:00
barfowl
ff13665a02 Introduced Far::TopologyLevel methods in place of TopologyRefiner in Osd 2015-05-21 20:20:16 -07:00
barfowl
04de3a37d9 Missed a few corrections in the previous commit. 2015-05-21 20:14:46 -07:00
barfowl
6d5b29c2dc Replacing use of old Far::TopologyRefiner methods with Far::TopologyLevel 2015-05-21 19:52:25 -07:00
Ignacio Lillo
d82492dce5 Merge branch 'dev' into 358 2015-05-21 23:49:45 -03:00
David G Yu
2b33de38f8 Merge pull request #513 from takahito-tejima/refactor2
implements Osd::CpuEvaluator::EvalPatches function.
2015-05-21 18:55:09 -07:00