AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-12-01 15:50:07 +00:00
Code Issues Releases Wiki Activity
227 Commits 18 Branches 72 Tags 102 MiB
2b12ffc447
Commit Graph

227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Kraemer
2b12ffc447 build fixes : 
- remove ptexViewer from the build on OSX (doesnt work)
- remove maya plugins from the build on OSX (until we have a compatible version available)

glViewer fixes :
- fix incorrect GLFW version check in #ifdefs (now done in cmake)
- fix default program GL version (downgraded to 1.5 where necessary)
- remove non core-profile GL calls (triggering errors)

this should allow OSX 10.7 builds to produce a functional, if restricted, glViewer.

fixes #111
 2013-02-04 18:37:25 -08:00
Manuel Kraemer
626b8c40bf Update README.md 2013-02-04 11:49:30 -08:00
Dirk Van Gelder
eed2d98a39 Merge of in-progress Eval API test code to the mainline. Not much 
here yet.
 2013-02-04 09:35:43 -08:00
gelder
687cedfb68 Merge pull request #108 from aras-p/regression_tests 
Improvements to osd_regression
 2013-02-03 11:04:41 -08:00
Aras Pranckevicius
660fd15e3b osd_regression: implement raw CPU and CPU with GL VBO backing tests. Actually count test failures; they were not counted before ;) 2013-02-03 19:25:22 +02:00
Aras Pranckevicius
e0b231424f osd_regression: towards running all test cases per backend (checkBackend function) 2013-02-03 19:07:04 +02:00
Aras Pranckevicius
1fbdf77bb4 osd_regression: towards testing multiple backends; adding cmdline arg parsing 2013-02-03 19:00:28 +02:00
gelder
9e643a1ee3 Merge pull request #106 from aras-p/gcd 
Implement Apple GCD dispatcher
 2013-02-03 08:54:41 -08:00
gelder
4818e65228 Merge pull request #105 from aras-p/master 
Fix GLFW finding on OSX when location is in environment variable
 2013-02-03 08:50:26 -08:00
Aras Pranckevicius
52ad4b2028 mention regression test executables in the readme 2013-02-03 18:45:10 +02:00
Aras Pranckevicius
2d00699c8d osd_regression does not need GLEW on OSX 2013-02-03 18:34:41 +02:00
Aras Pranckevicius
a379ec2b9a gcd: cleanup 2013-02-03 10:15:31 +02:00
Aras Pranckevicius
8b59d99d20 gcd: cleanup CMakeLists 2013-02-03 10:12:29 +02:00
Aras Pranckevicius
e8ceaba176 gcd: convert face loop to work in 32 item size batches. 
MBP6,2 (2 core 4 thread), catmark_car Lv4: 31.2ms CPU, 15.8ms GCD (was 22ms)
 2013-02-03 10:05:58 +02:00
Aras Pranckevicius
00728050de fix GLFW location finding on OSX when location is in environment variable 2013-02-03 09:43:12 +02:00
Aras Pranckevicius
c4b463668a gcd: convert most of loops to submit work in 32 item size batches. 
MBP6,2 (2 core 4 thread), catmark_car Lv3: 6.9ms CPU, 5.2ms GCD; Lv4: 31.2ms CPU, 22.ms GCD
 2013-02-03 09:38:33 +02:00
Aras Pranckevicius
b556e9d6cd gcd: naive implementation using dispatch_apply for all loops. Not faster, dispatch overhead too high 2013-02-02 23:22:04 +02:00
Aras Pranckevicius
54c7329ba4 gcd: files for GCD dispatcher (right now just copy of OMP one), add items to glViewer 2013-02-02 22:53:33 +02:00
gelder
9332dda3c5 Merge pull request #104 from aras-p/master 
Fix OSX build of examples that use GLFW
 2013-02-02 12:24:14 -08:00
Aras Pranckevicius
84d91323ac fix linking with GLFW link on OSX 2013-02-02 22:11:34 +02:00
gelder
4c13eb0ed5 Merge pull request #102 from aras-p/master 
update readme about GLFW
 2013-02-01 12:02:56 -08:00
Manuel Kraemer
9666fc6a21 Update README.md 2013-02-01 10:21:10 -08:00
manuelk
0a0ff9f9e9 fix the OSD version printout in top CMakeList (now based off the #define in opensubdiv/version.h) 2013-02-01 10:09:55 -08:00
Aras Pranckevicius
3b0ed46ffd docs: GLUT -> GLFW 2013-02-01 13:22:12 +02:00
manuelk
368b8e3271 Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv 2013-01-31 18:21:00 -08:00
manuelk
055ab17357 migrate osd_regression from GLUT to GLFW (this regression still needs work) 
fixes #98
 2013-01-31 18:19:56 -08:00
Manuel Kraemer
af81ecffba add glfw3 to windows section of glfw module 
fixes #101
 2013-01-31 16:26:39 -08:00
manuelk
7a39b0ad7c - add cmake logic to parse package versions and include the correct headers 
- add #ifdefs to work around the different versions of glfw
- add cmake logic to parse other packages versions and set minimum requirements
- fix X11 dependencies for static builds of glfw

- general Find.cmake cleanup

fixes #101
 2013-01-31 15:34:35 -08:00
manuelk
855b177c20 exclude .inc.rule files generated by MSVC 2013-01-31 15:30:32 -08:00
manuelk
a6bd013988 change access permissions on files 2013-01-31 15:29:45 -08:00
manuelk
1ba1f048e6 bail out of Rebuild call if the VBO / VAO have not been allocated yet. 
fixes #100
 2013-01-31 15:27:31 -08:00
manuelk
2f02d8dffa Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv 2013-01-31 15:26:02 -08:00
manuelk
18e5ab5296 bail out of Rebuild call if the VBO / VAO have not been allocated yet. 
fixes #100
 2013-01-31 15:24:38 -08:00
Takahito Tejima
de3c70f96f Merge pull request #99 from njlitke/master 
Fixed a buffer overrun error in OsdCLGLVertexBuffer::UpdateData.
 2013-01-30 08:35:39 -08:00
Nathan Litke
68488d86b0 Fixed a buffer overrun error in OsdCLGLVertexBuffer::UpdateData. 2013-01-30 00:20:37 -08:00
Takahito Tejima
ab4f79c128 Remove deprecated GL calls, comply with 4.2/3.3 core profile. Use VAO, update glsl shaders, remove immediate draws, etc. 
In example code, GLUT has been replaced with GLFW so that glViewer/ptexViewer can run on OSX (10.7 or later).

OSX note: still have some problem with clang, may need to explicitly specify gcc on cmake cmdline
 -DCMAKE_CXX_COMPILE=/usr/bin/g++

fixes #98
 2013-01-29 15:54:18 -08:00
manuelk
d03a04d088 Fix OSD crash bug within CUDA & CL compute modules : 
- remove the GL error check in cudaGLVertexBuffer :
  * unrelated GL errors left on the stack were triggering erroneous
  vertexBuffer allocation errors
  * we should not be checking for GL errors here anyway (as most other
  buffer allocations aren't checked either)

- add some pointer checking in the GL / D3D drawContexts in case the
  vertexBuffer pointers passed are NULL

- add some additional typedefs in OsdError to report some of the new
  CUDA / GL related errors
 2013-01-25 18:31:40 -08:00
manuelk
f22c717e1c Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv 2013-01-24 14:17:25 -08:00
manuelk
48ba78d848 fixing a int->float warning for MSVC 2013-01-24 14:16:45 -08:00
Manuel Kraemer
4bbc42fd52 Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv 2013-01-24 14:09:30 -08:00
Manuel Kraemer
371c95ccef add the license banner to mayaViewer.cpp 
fixes #96
 2013-01-24 14:08:53 -08:00
Manuel Kraemer
8467cad7c5 Update README.md 
Added -DNO_OMP flag description.
 2013-01-24 13:49:38 -08:00
manuelk
c912a284a8 Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv 2013-01-24 13:45:41 -08:00
manuelk
468198e4a8 more cleanup : 
- consolidate cmake compile flags
- turn on -Wall
- suppress hidden overloaded function warning when using Clang
  (part of it is bug, part of it will require code refactoring
  on our end)
- add support for Maya 2013.5 for windows in cmake module
- clean up some glew includes which break builds with MSVC Express
  & Windows SDK
- move the bitmap for font_image into a compiled object
- remove some unused variables and other minor warnings

Note : this is a checkpoint, there are still a few more warnings to clean up...

fixes #96
 2013-01-24 13:40:43 -08:00
Takahito Tejima
516da70e0d Replace deprecated GL api usage from gl_hud. It also supports OpenGLES. 2013-01-24 09:29:35 -08:00
manuelk
9ed6ac7da8 - clean up all unused variables / constructors... 
- add a -Wall flag, but leave it commented out for now until the same is done for other compilers

fixes #96
 2013-01-22 14:47:46 -08:00
manuelk
a2840260d7 Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv 2013-01-18 16:43:06 -08:00
manuelk
97f4c5a7c1 fix linking problems for maya viewer plugins (PLATFORM_LIBRARIES was being reset accidentally) 2013-01-18 16:42:22 -08:00
David G Yu
f3e155a96c Fixed include of cstdio for examples cudaInit.h 2013-01-18 16:03:17 -08:00
manuelk
d529460486 add correct conditional build of cuda modules in maya plugins 
fixes #95
 2013-01-18 14:49:25 -08:00