mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 21:20:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

06/11/2017

Browse Source 
--Code changes
 -Make the OS-specific stylesheets part of the installer.
This commit is contained in:
Person 2017-06-11 15:02:44 -07:00
parent c4e891b18c
commit f66a278c73
2 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Builds/QtCreator/Fractorium/Fractorium.pro
View File

@ -73,7 +73,18 @@ $$ASSETS_DIR/tatasz_pack_03.gradient
INSTALLS += palettes
themes.path = $$SHARE_INSTALL_DIR
themes.files = $$ASSETS_DIR/dark.qss
win32 {
themes.files = $$ASSETS_DIR/dark_windows.qss
}
macx {
themes.files = $$ASSETS_DIR/dark_mac.qss
}
unix:!macx {
themes.files = $$ASSETS_DIR/dark_linux.qss
}
#message(THEMES INSTALL SOURCE: $$themes.files)
INSTALLS += themes

64
Source/EmberTester/EmberTester.cpp
View File

@ -15,6 +15,8 @@
using namespace EmberNs;
using namespace EmberCommon;
//#define DO_NVIDIA 1
template <typename T>
void SaveFinalImage(Renderer<T, T>& renderer, vector<byte>& pixels, char* suffix)
{
@ -1463,14 +1465,14 @@ bool TestAllVarsCLBuild(size_t platform, size_t device, bool printSuccess = true
{
renderer.SetEmber(it);
if (platform != 0 &&
((it.GetXform(0)->GetVariationById(eVariationId::VAR_SYNTH) != nullptr) ||//Nvidia OpenCL driver crashes when building too many synths.
(it.GetXform(0)->GetVariationById(eVariationId::VAR_PRE_SYNTH) != nullptr) ||
(it.GetXform(0)->GetVariationById(eVariationId::VAR_POST_SYNTH) != nullptr)))
{
cout << "Skipping synth.\n";
continue;
}
//if (platform != 0 &&
// ((it.GetXform(0)->GetVariationById(eVariationId::VAR_SYNTH) != nullptr) ||//Nvidia OpenCL driver crashes when building too many synths.
// (it.GetXform(0)->GetVariationById(eVariationId::VAR_PRE_SYNTH) != nullptr) ||
// (it.GetXform(0)->GetVariationById(eVariationId::VAR_POST_SYNTH) != nullptr)))
//{
// cout << "Skipping synth.\n";
// continue;
//}
if (renderer.BuildIterProgramForEmber())
{
@ -1952,8 +1954,6 @@ public:
}
};
#define DO_NVIDIA 1
int _tmain(int argc, _TCHAR* argv[])
{
//int i;
@ -2193,28 +2193,28 @@ int _tmain(int argc, _TCHAR* argv[])
#endif
}
//#ifdef DO_DOUBLE
//
// //t.Tic();
// //TestCpuGpuResults<double>();
// //t.Toc("TestCpuGpuResults<double>()");
// if (b)
// {
// t.Tic();
// TestAllVarsCLBuild<double>(0, 0, true);
// t.Toc("TestAllVarsCLBuild<double>()");
//
// if (b)
// {
//#ifdef DO_NVIDIA
// t.Tic();
// TestAllVarsCLBuild<double>(1, 0, true);
// t.Toc("TestAllVarsCLBuild<double>()");
//#endif
// }
// }
//
//#endif
#ifdef DO_DOUBLE
//t.Tic();
//TestCpuGpuResults<double>();
//t.Toc("TestCpuGpuResults<double>()");
if (b)
{
t.Tic();
b = TestAllVarsCLBuild<double>(0, 0, true);
t.Toc("TestAllVarsCLBuild<double>()");
if (b)
{
#ifdef DO_NVIDIA
t.Tic();
TestAllVarsCLBuild<double>(1, 0, true);
t.Toc("TestAllVarsCLBuild<double>()");
#endif
}
}
#endif
#endif
//PrintAllVars();
//_CrtDumpMemoryLeaks();