mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-11-04 02:00:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

This is commit of Simon Detheridge's pull request "osx-opencl" with a few modifications.

Browse Source 
-If we change OpenCLWrapper to capture build log errors, we don't need to manually concat them in RendererCL because the overridden ErrorReport() function already concatenates the errors from both classes.

-Do not define T in OpenCL programs. We already have real_t to handle this.

-Do keep the casting to real_t. However this should not be necessary because there is a command line option to do this automatically which we already use: -cl-single-precision-constant. The only reason we do this is because the Apple OpenCL compiler does not follow the standard and obviously ignores this option. Absolutely awful.

-Fix a few improper casts in the CircleTrans1 and GlynnSim1 variations.

-Add an automated OpenCL program build tester to EmberTester, as well as a cast checker.
This commit is contained in:
mfeemster
2015-03-22 12:46:10 -07:00
parent fa6ec63447
commit ef01380e6d
8 changed files with 193 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/EmberCL/RendererCL.cpp
View File

@ -501,8 +501,8 @@ string RendererCL<T>::ErrorReportString()
template <typename T>
vector<string> RendererCL<T>::ErrorReport()
{
vector<string> ours = EmberReport::ErrorReport();
vector<string> wrappers = m_Wrapper.ErrorReport();
auto ours = EmberReport::ErrorReport();
auto wrappers = m_Wrapper.ErrorReport();
ours.insert(ours.end(), wrappers.begin(), wrappers.end());
return ours;
@ -759,12 +759,7 @@ bool RendererCL<T>::BuildIterProgramForEmber(bool doAccum)
}
else
{
//m_ErrorReport.push_back(string(loc) + "():\nBuilding the following program failed: \n" + m_IterKernel + "\n");
std::vector<std::string> errors = m_Wrapper.ProgramBuildErrors();
m_ErrorReport.insert(m_ErrorReport.end(), errors.begin(), errors.end());
m_ErrorReport.push_back(loc);
m_ErrorReport.push_back(string(loc) + "():\nBuilding the following program failed: \n" + m_IterKernel + "\n");
return false;
}
@ -1272,7 +1267,6 @@ int RendererCL<T>::MakeAndGetDensityFilterProgram(size_t ss, uint filterWidth)
else
{
m_ErrorReport.push_back(string(loc) + "():\nBuilding the following program failed: \n" + kernel + "\n");
//cout << m_ErrorReport.back();
}
}
@ -1302,11 +1296,7 @@ int RendererCL<T>::MakeAndGetFinalAccumProgram(T& alphaBase, T& alphaScale)
if (b)
kernelIndex = m_Wrapper.FindKernelIndex(finalAccumEntryPoint);//Try to find it again, it will be present if successfully built.
else
{
std::vector<std::string> errors = m_Wrapper.ProgramBuildErrors();
m_ErrorReport.insert(m_ErrorReport.end(), errors.begin(), errors.end());
m_ErrorReport.push_back(loc);
}
}
return kernelIndex;