mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-03 14:54:52 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.0.0.4 07/01/2017 Release

Browse Source
This commit is contained in:
Person
2017-07-01 09:18:01 -07:00
parent f66a278c73
commit f192bc7ae4
7 changed files with 74 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/EmberCL/IterOpenCLKernelCreator.cpp
View File

@ -203,6 +203,7 @@ string IterOpenCLKernelCreator<T>::CreateIterKernelString(const Ember<T>& ember,
}
xformFuncs << "\toutPoint->m_ColorX = tempColor + xform->m_DirectColor * (outPoint->m_ColorX - tempColor);\n";
xformFuncs << "\n";
xformFuncs << "\tif (isnan(outPoint->m_ColorX))\n";
xformFuncs << "\t outPoint->m_ColorX = 0.0; \n";
xformFuncs << "}\n"

2
Source/EmberCL/OpenCLWrapper.cpp
View File

@ -1029,7 +1029,7 @@ bool OpenCLWrapper::CreateSPK(const string& name, const string& program, const s
if (doublePrecision)
err = spk.m_Program.build(m_DeviceVec, "-cl-mad-enable -cl-no-signed-zeros -cl-denorms-are-zero");//Tinker with other options later.
else
err = spk.m_Program.build(m_DeviceVec, "-cl-mad-enable -cl-no-signed-zeros -cl-single-precision-constant -cl-denorms-are-zero");
err = spk.m_Program.build(m_DeviceVec, "-cl-mad-enable -cl-no-signed-zeros -cl-denorms-are-zero -cl-single-precision-constant");
//err = spk.m_Program.build(m_DeviceVec, "-cl-single-precision-constant");
//err = spk.m_Program.build(m_DeviceVec, "-cl-mad-enable -cl-single-precision-constant");

56
Source/EmberTester/EmberTester.cpp
View File

@ -1039,18 +1039,20 @@ bool TestConstants()
void TestFuncs()
{
//auto vlf(VariationList<float>::Instance());
//vector<string> stringVec;
//stringVec.push_back("/ (");
////stringVec.push_back("log(");
//for (size_t i = 0; i < vlf->Size(); i++)
//{
// auto var = vlf->GetVariation(i);
// if (SearchVar(var, stringVec, false))
// {
// cout << var->Name() << endl;
// }
//}
auto vlf(VariationList<float>::Instance());
vector<string> stringVec;
stringVec.push_back("M_PI");
//stringVec.push_back("log(");
for (size_t i = 0; i < vlf->Size(); i++)
{
auto var = vlf->GetVariation(i);
if (SearchVar(var, stringVec, false))
{
cout << var->Name() << endl;
}
}
}
bool TestGlobalFuncs()
@ -1963,8 +1965,8 @@ int _tmain(int argc, _TCHAR* argv[])
vector<Ember<double>> dv;
list<Ember<float>> fl;
list<Ember<double>> dl;
/* TestFuncs();
string line = "title=\"cj_aerie\" smooth=no", delim = " =\"";
TestFuncs();
/* string line = "title=\"cj_aerie\" smooth=no", delim = " =\"";
auto vec = Split(line, delim, true);
for (auto& s : vec) cout << s << endl;
@ -1990,25 +1992,25 @@ int _tmain(int argc, _TCHAR* argv[])
return 1;
*/
//MakeTestAllVarsRegPrePostComboFile("testallvarsout.flame");
/* return 0;
return 0;
/*
TestThreadedKernel();
TestThreadedKernel();
auto palf = PaletteList<float>::Instance();
Palette<float>* pal = palf->GetRandomPalette();
auto palf = PaletteList<float>::Instance();
Palette<float>* pal = palf->GetRandomPalette();
cout << pal->Size() << endl;
cout << pal->Size() << endl;
double d = 1;
double d = 1;
for (int i = 0; i < 10; i++)
{
cout << "log10(" << d << ") = " << std::max<uint>(1u, uint(std::log10(d)) + 1u) << endl;
d *= 10;
}
for (int i = 0; i < 10; i++)
{
cout << "log10(" << d << ") = " << std::max<uint>(1u, uint(std::log10(d)) + 1u) << endl;
d *= 10;
}
return 0;*/
return 0;*/
/*
uint i, iters = (uint)10e7;
size_t total = 0;