Commit Graph

2266 Commits

Author SHA1 Message Date
David G Yu
d34f167ee5 Merge pull request #809 from thomthom/dev-iso646-fix-gl
iso-646 fix for GLEW and GLFW projects
2016-06-25 13:54:22 -07:00
Thomas Thomassen
b1e1ff31b4 Clean up DX, example and tutorials. 2016-06-25 10:30:50 +02:00
Thomas Thomassen
72610a3043 Glean up GLEW and GLFW. 2016-06-25 10:29:59 +02:00
David G Yu
0e4a8b424a Merge pull request #790 from thomthom/dev-iso646-fix-base
Rename and, or and not to &&, || and ! etc. Ref #779
2016-06-24 14:59:52 -07:00
Thomas Thomassen
aa0599b4bc Merge branch 'dev'
Conflicts:
	opensubdiv/far/patchTableFactory.cpp
2016-06-24 23:30:44 +02:00
George ElKoura
5f643ee30d Merge pull request #806 from davidgyu/devFixTBB
Added TBB support for MSVC14 / Visual Studio 2015
2016-06-23 20:23:05 -07:00
David G. Yu
50e8cee18e Added TBB support for MSVC14 / Visual Studio 2015 2016-06-23 14:04:49 -07:00
David G Yu
90e8b58145 Merge pull request #804 from c64kernal/dev_cmake
Use cmake's folder feature on platforms that support it.
2016-06-23 12:56:01 -07:00
David G Yu
15a40ecc68 Merge pull request #803 from c64kernal/dev_hud
Fixed two issues with HUD sliders.
2016-06-23 09:54:33 -07:00
George ElKoura
923d60ca74 Use cmake's folder feature on platforms that support it.
We now make use of folders where they are supported.  In particular, on Visual Studio, this produces much nicer solutions to navigate.
2016-06-09 17:04:26 -07:00
George ElKoura
bd4ee29144 Fixed two issues with HUD sliders.
- Capping was broken (thanks to fakebits for pointing it out).  Fixes #801.
- Slides where min != 0 were also broken.
2016-05-01 13:43:21 -07:00
David G Yu
12a623ff81 Merge pull request #799 from barfowl/far_regression
Improvements to far_regression
2016-04-18 12:07:12 -07:00
David G Yu
1b564a53a5 Merge pull request #798 from barfowl/chaikin_bug
Fixed Chaikin-related bug causing crashes in debug for MSVC and others
2016-04-18 11:56:02 -07:00
barfowl
f00d69ae55 Improvements to far_regression:
- overloaded utilities in regression/common to take existing Shape
    - updated init_shapes.h to include all from regression/shapes
    - all Shapes now created and refined regardless of content
    - only "Hbr compatible" Shapes compared to Hbr, else print warning
2016-04-04 19:49:27 -07:00
barfowl
4808b50785 Fixed Chaikin-related bug subdividing edge sharpness:
- child sharpness should retain parent sharpness when not semi-sharp
2016-03-30 18:32:55 -07:00
David G Yu
76137e5cc1 Merge pull request #788 from manuelk/dev
Improved Ptex configuration and DX compatibility
2016-03-29 12:20:59 -07:00
David G Yu
0e8fa5edf1 Merge branch 'release/v3_0_5' into dev 2016-03-25 15:18:10 -07:00
David G Yu
799b26bba3 Release 3.0.5 2016-03-25 15:15:29 -07:00
Takahito Tejima
a4f4357110 Merge pull request #795 from davidgyu/endCapStorageFix
Fixed residual memory consumed by end cap stencils
2016-03-23 13:44:25 -07:00
David G Yu
100b61b17f Merge pull request #794 from takahito-tejima/ptex
fix ptex lookup shaders to clamp the patchcoord
2016-03-23 09:53:22 -07:00
David G Yu
841f573224 Fixed residual memory consumed by end cap stencils
An earlier change improved transient memory used during the construction
of end cap stencil tables but could leave unused capacity in the internal
containers of the resulting stencil tables. This change adds an additional
internal factory helper method which trims this storage.
2016-03-16 14:44:47 -07:00
Takahito Tejima
7cb13ee4a8 fix ptex lookup shaders to clamp the patchcoord
with MSAA enabled, patchcoord could overrun the guttering pixels.
2016-03-10 12:39:41 -08:00
manuelk
b5cabd2259 More dxPtexViewer improvements:
- fullscreen mode added (-f)
- added usage error message
- added IBL lighting
- matched GUI to glPtexViewer
- removed some ptex HW filter options (missing code is causing crash)

Note : the IBL BRDF definitely needs some tweaks...
2016-02-25 17:14:09 -08:00
manuelk
84d0e02fa2 dxPtexViewer code example updates:
- update GUI to match more closely glPtexViewer
- added pipeline stats query for number of triangles tesselated
- matched CPU / GPU compute timers
- added obj animation
- fixed near / far clip planes
2016-02-24 11:38:14 -08:00
Thomas Thomassen
c422a79031 Rename and, or and not to &&, || and ! to address compilers that don't support them out of the box without extra headers. 2016-02-21 15:47:11 +01:00
manuelk
4926fd2c3e Ptex fixes:
- fix build compiling & linking to accomodate recent code churn in Ptex
- fix FindPTex.cmake module to correctly extract version number
- fix dxPtexViewer & glPtexViewer source to compile with new Ptex namespace changes
- add alpha channel padding function to ptexMipmapLoader as a workaround to the absence of 3-channel DXGI formats
- mirror ptex memory limit function from glPtexViewer to dxPtexViewer
2016-02-19 16:58:56 -08:00
David G Yu
a6fe9261ae Merge branch 'release/v3_0_4' into dev 2016-02-10 16:56:35 -08:00
David G Yu
4690519424 Release 3.0.4 2016-02-10 16:50:43 -08:00
Takahito Tejima
72bd9f00ad Merge pull request #777 from davidgyu/refineLevelsFix
Fixed tutorial use of refined levels.
2016-02-05 17:01:31 -08:00
Takahito Tejima
2adef0d2fd Merge pull request #782 from davidgyu/vs2015Fix1
Fixed build warnings (VS2015)
2016-02-05 17:00:48 -08:00
Takahito Tejima
4edcdbc1b7 Merge pull request #781 from davidgyu/perfFix
Tess shader performance fix
2016-02-05 17:00:26 -08:00
David G Yu
108c3a86cc Merge pull request #772 from xiao-deng/dev
Add events control to clVertexBuffer and clEvaluator
2016-02-05 16:56:56 -08:00
David G. Yu
12b53689cf Fixed pointer increment in glStencilViewer.cpp 2016-02-05 16:20:02 -08:00
manuelk
223d756a14 More compile warning fixes (MSVC 2015) 2016-02-05 15:31:16 -08:00
manuelk
20b6dd2aa3 Fix a minor build warning (trips MSVC 2015) 2016-02-05 15:30:59 -08:00
David G. Yu
301496bd3b Additional tess control/hull shader perf fixes
This change make the bspline patch tess control/hull shader revert to
control vertex mirroring for boundary edges when the patch sharpness is
zero. This change helps improve some shader codegen optimization and
L1 cache behavior on (at least) Kepler GPUs with recent drivers.
2016-02-05 14:53:13 -08:00
David G. Yu
71fcb67509 Tessellation shader performance improvement
Re-organized the single-crease patch code path in the tessellation
control/hull shaders to improve performance in the case where no patches
have non-zero crease sharpnesses.
2016-01-29 15:31:48 -08:00
David G. Yu
86026a9fe8 Shader performance workaround
Changed a couple of local 4x4 matrices to global uniforms to
work around a performance problem on recent GL drivers.

There are two local 4x4 float matrices with constant initializers
in the function OsdComputePerPatchVertexBSpline(...). Changing
these from local variables to global initialized uniforms improves
performance dramatically on recent NVIDIA drivers (e.g. 361.48 windows).

There is no such difference with Direct3D, but this change updates
the shader code for both implementations for consistency.
2016-01-29 15:31:38 -08:00
David G Yu
643430105d Fixed far_tutorial_6 refined primvar interpolation
Adaptive refinement will only produce levels of refinement which are
actually needed even if the client specifies a greater max isolation level.

This change fixes the loop control used for primvar interpolation to
interpolate only levels which exist in the refinement.
2016-01-22 17:42:55 -08:00
David G Yu
3aaf491dda Fixed Far::TopologyRefiner::GetNumLevels()
This method now returns the number of _farLevels where previously
it returned the number of _levels. This is primarily a semantic
difference, as the two containers should have equal size. But this
method is intended to accompany Far::TopologyRefiner::GetLevel()
which returns a reference to an element in _farLevels;
2016-01-22 17:38:58 -08:00
manuelk
423d7eff79 Comment out CMake logic that attempts to copy glfw3 dll's, which fails in some cases.
Fixes #774
2016-01-13 11:47:24 -08:00
manuelk
4746ab4bc9 Surround D3D10_SHADER_RESOURCES_MAY_ALIAS with #ifdef to avoid build errors with some versions of D3D SDK
Fixes #773
2016-01-13 11:33:38 -08:00
manuelk
6a19a2aeec Make sure Windows DLL dependencies exist before trying to copy them (some may be static libs)
Fixes #768
2015-12-18 15:12:15 -08:00
Jeremy Cowles
60cf73d550 Merge pull request #766 from davidgyu/localPointStencilFix
Improved fix for stencil table construction
2015-12-11 15:53:53 -08:00
David G. Yu
67a07044d7 Improved fix for stencil table construction
My previous fix added some defensive logic in case the
local point stencil table was empty when attempting to
append local point stencils to an existing stencil table.

This change fixes Far::PatchTableFactory to not return
empty local point stencil tables when there are no local
point stencils. This behavior is now more consistent with
earlier releases.

We will leave the earlier defensive logic in place as well.
2015-12-11 14:37:39 -08:00
Jeremy Cowles
b3213df0a1 Merge pull request #761 from davidgyu/stencilFactoryFix
Fixed potential crash in Far::StencilTableFactory
2015-12-11 10:56:29 -08:00
Jeremy Cowles
0fc0f3c003 Merge pull request #762 from davidgyu/fractionalFix
Disabled fractional spacing w/o screen space tess
2015-12-11 10:55:50 -08:00
xiao-deng
73b5883d02 Add events control to clVertexBuffer and clEvaluator 2015-11-23 17:54:03 +08:00
David G. Yu
d1b9e45c13 Fixed potential crash in Far::StencilTableFactory
Now StencilTableFactory::AppendLocalPointStencilTable() does
nothing when the localPointStencilTable is empty. This avoids
a potential crash (failed assertion) when both the baseStencilTable
and the localPointStencilTable are empty, as is the case for
simple geometry like the all-quads torus regression test shape.
2015-11-18 18:57:47 -08:00
David G. Yu
c588e95e13 Disabled fractional spacing w/o screen space tess
For now, the common patch shader code supports fractional spacing
modes only when screen-space tessellation is also enabled.

It's possible to relax this restriction, but that requires changing
the client shader interface.
2015-11-18 18:54:19 -08:00