diff options
author | Ray Molenkamp <github@lazydodo.com> | 2018-08-14 04:08:28 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2018-08-14 04:08:28 +0300 |
commit | fee32abee977c3d44c0ea7d098441d6261f51d3d (patch) | |
tree | d42c08444b7c6d6cb843a1cbce92c95833bf3c1a /build_files/build_environment/patches | |
parent | b993e8a17a077ae23b909a9da425e72e1b16bf1a (diff) |
build_environment: opensubdiv 3.3.3 with PR975 + TBB 2018_U5
Diffstat (limited to 'build_files/build_environment/patches')
-rw-r--r-- | build_files/build_environment/patches/opensubdiv.diff | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/build_files/build_environment/patches/opensubdiv.diff b/build_files/build_environment/patches/opensubdiv.diff index 9e9cf7ad554..3fc78bf3c18 100644 --- a/build_files/build_environment/patches/opensubdiv.diff +++ b/build_files/build_environment/patches/opensubdiv.diff @@ -1,16 +1,13 @@ - opensubdiv/osd/d3d11VertexBuffer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/opensubdiv/osd/d3d11VertexBuffer.cpp b/opensubdiv/osd/d3d11VertexBuffer.cpp -index 603cbf4..07e7e0a 100644 ---- a/opensubdiv/osd/d3d11VertexBuffer.cpp -+++ b/opensubdiv/osd/d3d11VertexBuffer.cpp -@@ -81,7 +81,7 @@ D3D11VertexBuffer::UpdateData(const float *src, int startVertex, int numVertices +diff --git a/opensubdiv/far/topologyRefiner.cpp b/opensubdiv/far/topologyRefiner.cpp +index 3754b36e..7fe42bcc 100644 +--- a/opensubdiv/far/topologyRefiner.cpp ++++ b/opensubdiv/far/topologyRefiner.cpp +@@ -263,7 +263,7 @@ namespace internal { + bool IsEmpty() const { return *((int_type*)this) == 0; } - deviceContext->Unmap(_uploadBuffer, 0); + FeatureMask() { Clear(); } +- FeatureMask(Options const & options, Sdc::SchemeType sType) { InitializeFeatures(options, sType); } ++ FeatureMask(Options const & options, Sdc::SchemeType sType) { Clear(); InitializeFeatures(options, sType); } -- D3D11_BOX srcBox = { 0, 0, 0, size, 1, 1 }; -+ D3D11_BOX srcBox = { 0, 0, 0, (UINT) size, 1, 1 }; - deviceContext->CopySubresourceRegion(_buffer, 0, 0, 0, 0, - _uploadBuffer, 0, &srcBox); - } + // These are the two primary methods intended for use -- intialization via a set of Options + // and reduction of the subsequent feature set (which presumes prior initialization with the
\ No newline at end of file |