Commit Graph

1619 Commits

Author SHA1 Message Date
David G Yu
c65995b834 Merge pull request #541 from barfowl/mask_interface
Moved Vtr::MaskInterface into Far::PrimvarRefiner
2015-05-28 13:50:30 -07:00
David G Yu
41bfae3156 Merge pull request #543 from takahito-tejima/mac
Mac build and shader compiler error fix.
2015-05-28 12:11:10 -07:00
Takahito Tejima
9cfdb6c5c1 Mac build and shader compiler error fix. 2015-05-28 10:27:23 -07:00
David G Yu
7d51c1d2e9 Merge pull request #539 from takahito-tejima/osdapi
Add GPU stencil/patch derivative kernels
2015-05-28 10:04:26 -07:00
Jeremy Cowles
30fb3260ec Merge pull request #540 from barfowl/boundary_none
Fixed refinement when using BoundaryInterpolation mode "None"
2015-05-27 21:02:55 -07:00
barfowl
6ce3292576 Moved Vtr::MaskInterface into Far::PrimvarRefiner:
- updated PrimvarRefiner to make use of now-local Mask class
    - renamed vtr/maskInterfaces.h to vtr/componentInterfaces.h
    - updated usage of renamed header file and CMakeLists.txt
2015-05-27 20:44:06 -07:00
barfowl
9cd082fde1 Tag faces as holes when using BoundaryInterpolation setting of "none" 2015-05-27 19:42:27 -07:00
Takahito Tejima
9dcbaee147 Add GPU stencil/patch derivative kernels
implements cuda, CL, GLXFB and GLCompute kernels of derivative
evaluation for both limit stencils and patches.
2015-05-27 17:23:36 -07:00
Takahito Tejima
e35e66789c Merge pull request #538 from davidgyu/texFix
Fixed allocation of texture buffers resources
2015-05-27 17:12:56 -07:00
Takahito Tejima
2e788a5250 Merge pull request #537 from barfowl/bilinear_derivs
Added missing scaling to derivatives of Bilinear patches
2015-05-27 17:12:50 -07:00
David G Yu
de286e07a6 Fixed allocation of texture buffers resources 2015-05-27 15:23:26 -07:00
barfowl
9a14bf72d4 Added missing scaling to derivatives of Bilinear patches 2015-05-27 15:11:35 -07:00
David G Yu
89544eec9c Merge pull request #536 from takahito-tejima/examples
Fix far_tutorial_6 to use gregory basis endcaps.
2015-05-27 15:36:05 -04:00
David G Yu
7f03b864b7 Merge pull request #534 from barfowl/face_uniform
Moved base-face propagation to Far::PrimvarRefiner
2015-05-27 15:32:01 -04:00
Takahito Tejima
7782c53ea2 Fix far_tutorial_6 to use gregory basis endcaps. 2015-05-27 11:44:42 -07:00
David G Yu
f4a9a1f431 Merge pull request #535 from takahito-tejima/dev
A workaround for the GLSL compute kernel crash on some nvidia drivers
2015-05-27 12:34:57 -04:00
Takahito Tejima
49a16539dd A workaround for the GLSL compute crash on some nvidia drivers
It looks like there's a compiler bug in some earlier nvidia driver 340/346 releases.
It has been fixed in 348.07 (win) as far as I can tell.

Following code behaves incorrectly.

void f(int a) {
  for (int i=0; i<3; ++i) doSomething(a, i);
}
void g() {
  for (int i=0; i<100; ++i) f(i);
}

The workaround is to use different identifiers for each function.
2015-05-27 08:57:47 -07:00
barfowl
0a86d6fe44 Moved base-face propagation to Far::PrimvarRefiner:
- removed TopologyRefiner options to propagate base face in Refinememt
    - removed all Vtr storage and management of base face
    - added PrimvarRefiner methods to "interpolate" per-face primvar data
2015-05-26 19:56:39 -07:00
David G Yu
22936eff56 Merge pull request #533 from c64kernal/dev_internal
Lower-case Internal namespace to match convention.
2015-05-26 21:27:28 -04:00
Takahito Tejima
cc86a5668d Merge pull request #532 from davidgyu/macbuildfix
Added a missing ';' for glViewer w/o GLEW
2015-05-26 18:21:21 -07:00
George ElKoura
a8568fc983 Lower-case Internal namespace to match convention.
Renamed "Internal" namespace to "internal" to match the convention in the rest
of the library.
2015-05-26 18:19:45 -07:00
George ElKoura
e9507b9fd6 Merge pull request #525 from barfowl/vtr_internal
Moved Vtr classes within internal namespace:
2015-05-26 18:09:41 -07:00
David G Yu
cdf95e0477 Added a missing ';' for glViewer w/o GLEW 2015-05-26 17:48:14 -07:00
David G Yu
36f682c471 Merge pull request #531 from takahito-tejima/dev
glEvalLimit: Fix an assertion failure when rand() takes RAND_MAX
2015-05-26 20:06:13 -04:00
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