From 43dcdd4305c46e43578a58e8e2367cac84effe5a Mon Sep 17 00:00:00 2001 From: Person Date: Mon, 28 Aug 2017 20:45:58 -0700 Subject: [PATCH] 1.0.0.5 08/28/2017 Release --- Builds/MSVC/Installer/Product.wxs | 2 +- Data/Version History.txt | 44 +++++++++++++++++++++++++++++++ Source/Ember/Renderer.cpp | 30 +++++++++++++++++---- debian/changelog | 6 +++++ 4 files changed, 76 insertions(+), 6 deletions(-) diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs index c27b3df..0f337ba 100644 --- a/Builds/MSVC/Installer/Product.wxs +++ b/Builds/MSVC/Installer/Product.wxs @@ -13,7 +13,7 @@ - + ::LogScaleDensityFilter(bool forceOutput) } } } - }, static_partitioner()); + } +#if defined(_WIN32) || defined(__APPLE__) + , tbb::static_partitioner() +#endif + ); //t.Toc(__FUNCTION__); return m_Abort ? eRenderStatus::RENDER_ABORT : eRenderStatus::RENDER_OK; } @@ -1064,7 +1068,11 @@ eRenderStatus Renderer::GaussianDensityFilter() } } } - }, static_partitioner()); + } +#if defined(_WIN32) || defined(__APPLE__) + , tbb::static_partitioner() +#endif + ); if (m_Callback && !m_Abort) m_Callback->ProgressFunc(m_Ember, m_ProgressParameter, 100.0, 1, 0); @@ -1123,7 +1131,11 @@ eRenderStatus Renderer::AccumulatorToFinalImage(v4F* pixels, size_t GammaCorrection(*rowStart, background, g, linRange, vibrancy, false, glm::value_ptr(*rowStart));//Write back in place. rowStart++; } - }, static_partitioner()); + } +#if defined(_WIN32) || defined(__APPLE__) + , tbb::static_partitioner() +#endif + ); } if (m_Abort) @@ -1169,7 +1181,11 @@ eRenderStatus Renderer::AccumulatorToFinalImage(v4F* pixels, size_t auto pf = reinterpret_cast(pv4T); GammaCorrection(*(reinterpret_cast*>(&newBucket)), background, g, linRange, vibrancy, true, pf); } - }, static_partitioner()); + } +#if defined(_WIN32) || defined(__APPLE__) + , tbb::static_partitioner() +#endif + ); //Insert the palette into the image for debugging purposes. Not implemented on the GPU. if (m_InsertPalette) @@ -1307,7 +1323,11 @@ EmberStats Renderer::Iterate(size_t iterCount, size_t temporalSample } } } - }, static_partitioner()); + } +#if defined(_WIN32) || defined(__APPLE__) + , tbb::static_partitioner() +#endif + ); stats.m_Iters = std::accumulate(m_SubBatch.begin(), m_SubBatch.end(), 0ULL);//Sum of iter count of all threads. stats.m_Badvals = std::accumulate(m_BadVals.begin(), m_BadVals.end(), 0ULL); stats.m_IterMs = m_IterTimer.Toc(); diff --git a/debian/changelog b/debian/changelog index 9a61d42..61e81de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fractorium (1.0.0.5-0ubuntu1) xenial; urgency=low + + * release 1.0.0.5 + + -- Matt Feemster Mon, 28 Aug 2017 19:42:25 -0700 + fractorium (1.0.0.4-0ubuntu1) xenial; urgency=low * release 1.0.0.4