mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-06-30 21:36:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fixes:

Browse Source 
--Cleaner exit on some failures.
--Better reporting of OpenCL errors.
This commit is contained in:
Person
2017-08-27 21:24:33 -07:00
parent 4749a7aec4
commit 5da944f589
3 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Ember/Renderer.cpp
View File

@ -446,7 +446,13 @@ eRenderStatus Renderer<T, bucketT>::Run(vector<v4F>& finalImage, double time, si
}
if (!resume)
ResetBuckets(true, false);//Only reset hist here and do accum when needed later on.
{
if (!ResetBuckets(true, false))//Only reset hist here and do accum when needed later on.
{
success = eRenderStatus::RENDER_ERROR;
goto Finish;
}
}
deTime = T(time) + *m_TemporalFilter->Deltas();
@ -587,7 +593,12 @@ FilterAndAccum:
else
m_K2 = bucketT((Supersample() * Supersample()) / (area * m_ScaledQuality * m_TemporalFilter->SumFilt()));
ResetBuckets(false, true);//Only the histogram was reset above, now reset the density filtering buffer.
if (!ResetBuckets(false, true))//Only the histogram was reset above, now reset the density filtering buffer.
{
success = eRenderStatus::RENDER_ERROR;
goto Finish;
}
//t.Tic();
//Make sure a density filter was created with the latest values.
ClampGteRef<T>(m_Ember.m_MinRadDE, 0);
@ -616,8 +627,11 @@ FilterAndAccum:
//Take special action if filtering exited prematurely.
if (fullRun != eRenderStatus::RENDER_OK)
{
ResetBuckets(false, true);//Reset the accumulator, come back and try again on the next call.
success = fullRun;
if (!ResetBuckets(false, true))//Reset the accumulator, come back and try again on the next call.
success = eRenderStatus::RENDER_ERROR;
else
success = fullRun;
goto Finish;
}