diff --git a/Builds/QtCreator/Fractorium/Fractorium.pro b/Builds/QtCreator/Fractorium/Fractorium.pro index 0ec4700..161f8ab 100644 --- a/Builds/QtCreator/Fractorium/Fractorium.pro +++ b/Builds/QtCreator/Fractorium/Fractorium.pro @@ -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 diff --git a/Source/EmberTester/EmberTester.cpp b/Source/EmberTester/EmberTester.cpp index d23b75d..9050b34 100644 --- a/Source/EmberTester/EmberTester.cpp +++ b/Source/EmberTester/EmberTester.cpp @@ -15,6 +15,8 @@ using namespace EmberNs; using namespace EmberCommon; +//#define DO_NVIDIA 1 + template void SaveFinalImage(Renderer& renderer, vector& 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(); -// //t.Toc("TestCpuGpuResults()"); -// if (b) -// { -// t.Tic(); -// TestAllVarsCLBuild(0, 0, true); -// t.Toc("TestAllVarsCLBuild()"); -// -// if (b) -// { -//#ifdef DO_NVIDIA -// t.Tic(); -// TestAllVarsCLBuild(1, 0, true); -// t.Toc("TestAllVarsCLBuild()"); -//#endif -// } -// } -// -//#endif +#ifdef DO_DOUBLE + + //t.Tic(); + //TestCpuGpuResults(); + //t.Toc("TestCpuGpuResults()"); + if (b) + { + t.Tic(); + b = TestAllVarsCLBuild(0, 0, true); + t.Toc("TestAllVarsCLBuild()"); + + if (b) + { +#ifdef DO_NVIDIA + t.Tic(); + TestAllVarsCLBuild(1, 0, true); + t.Toc("TestAllVarsCLBuild()"); +#endif + } + } + +#endif #endif //PrintAllVars(); //_CrtDumpMemoryLeaks();