diff --git a/Builds/MSVC/Installer/FractoriumInstaller.wixproj b/Builds/MSVC/Installer/FractoriumInstaller.wixproj
index 67ea487..04a648f 100644
--- a/Builds/MSVC/Installer/FractoriumInstaller.wixproj
+++ b/Builds/MSVC/Installer/FractoriumInstaller.wixproj
@@ -6,7 +6,7 @@
3.7
{c8096c47-e358-438c-a520-146d46b0637d}
2.0
- Fractorium_Beta_0.9.9.2
+ Fractorium_Beta_0.9.9.3
Package
$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets
$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets
diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs
index cf148d1..59bba7f 100644
--- a/Builds/MSVC/Installer/Product.wxs
+++ b/Builds/MSVC/Installer/Product.wxs
@@ -1,6 +1,6 @@
-
+
@@ -13,7 +13,7 @@
-
+
::epsilon()//Apoplugin.h uses -20, but it's more mathematically correct to do it this way.
#define ISAAC_SIZE 4
diff --git a/Source/Ember/Variations06.h b/Source/Ember/Variations06.h
index 5d9669d..fb50af5 100644
--- a/Source/Ember/Variations06.h
+++ b/Source/Ember/Variations06.h
@@ -3918,7 +3918,7 @@ template
class EMBER_API PostSmartcropVariation : public ParametricVariation
{
public:
- PostSmartcropVariation(T weight = 1.0) : ParametricVariation("post_smartcrop", eVariationId::VAR_POST_SMARTCROP, weight, true)
+ PostSmartcropVariation(T weight = 1.0) : ParametricVariation("post_smartcrop", eVariationId::VAR_POST_SMARTCROP, weight)
{
m_AssignType = eVariationAssignType::ASSIGNTYPE_SET;
m_VarType = eVariationType::VARTYPE_POST;//Very special usage, post only.
diff --git a/Source/Ember/VariationsDC.h b/Source/Ember/VariationsDC.h
index 476b27b..4375b4f 100644
--- a/Source/Ember/VariationsDC.h
+++ b/Source/Ember/VariationsDC.h
@@ -1249,7 +1249,7 @@ public:
virtual vector OpenCLGlobalFuncNames() const override
{
- return vector { "Zeps", "SimplexNoise3D", "PerlinNoise3D" };
+ return vector { "Zeps", "Sqr", "SimplexNoise3D", "PerlinNoise3D" };
}
virtual vector OpenCLGlobalDataNames() const override
diff --git a/Source/EmberAnimate/EmberAnimate.rc b/Source/EmberAnimate/EmberAnimate.rc
index ff4f154..5f65a42 100644
--- a/Source/EmberAnimate/EmberAnimate.rc
+++ b/Source/EmberAnimate/EmberAnimate.rc
@@ -49,8 +49,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,9,2
- PRODUCTVERSION 0,9,9,2
+ FILEVERSION 0,9,9,3
+ PRODUCTVERSION 0,9,9,3
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -67,12 +67,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Open Source"
VALUE "FileDescription", "Renders fractal flames as animations with motion blur"
- VALUE "FileVersion", "0.9.9.2"
+ VALUE "FileVersion", "0.9.9.3"
VALUE "InternalName", "EmberAnimate.exe"
VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2015, GPL v3"
VALUE "OriginalFilename", "EmberAnimate.exe"
VALUE "ProductName", "Ember Animate"
- VALUE "ProductVersion", "0.9.9.2"
+ VALUE "ProductVersion", "0.9.9.3"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/EmberGenome/EmberGenome.rc b/Source/EmberGenome/EmberGenome.rc
index 0cb0868..2699a12 100644
--- a/Source/EmberGenome/EmberGenome.rc
+++ b/Source/EmberGenome/EmberGenome.rc
@@ -49,8 +49,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,9,2
- PRODUCTVERSION 0,9,9,2
+ FILEVERSION 0,9,9,3
+ PRODUCTVERSION 0,9,9,3
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -67,12 +67,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Open Source"
VALUE "FileDescription", "Manipulates fractal flames parameter files"
- VALUE "FileVersion", "0.9.9.2"
+ VALUE "FileVersion", "0.9.9.3"
VALUE "InternalName", "EmberGenome.exe"
VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2015, GPL v3"
VALUE "OriginalFilename", "EmberGenome.exe"
VALUE "ProductName", "Ember Genome"
- VALUE "ProductVersion", "0.9.9.2"
+ VALUE "ProductVersion", "0.9.9.3"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/EmberRender/EmberRender.rc b/Source/EmberRender/EmberRender.rc
index 8196e23..212060f 100644
--- a/Source/EmberRender/EmberRender.rc
+++ b/Source/EmberRender/EmberRender.rc
@@ -49,8 +49,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,9,2
- PRODUCTVERSION 0,9,9,2
+ FILEVERSION 0,9,9,3
+ PRODUCTVERSION 0,9,9,3
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -67,12 +67,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Open Source"
VALUE "FileDescription", "Renders fractal flames as single images"
- VALUE "FileVersion", "0.9.9.2"
+ VALUE "FileVersion", "0.9.9.3"
VALUE "InternalName", "EmberRender.exe"
VALUE "LegalCopyright", "Copyright (C) Matt Feemster 2015, GPL v3"
VALUE "OriginalFilename", "EmberRender.exe"
VALUE "ProductName", "Ember Render"
- VALUE "ProductVersion", "0.9.9.2"
+ VALUE "ProductVersion", "0.9.9.3"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/EmberTester/EmberTester.cpp b/Source/EmberTester/EmberTester.cpp
index 4d19eeb..8816ce1 100644
--- a/Source/EmberTester/EmberTester.cpp
+++ b/Source/EmberTester/EmberTester.cpp
@@ -1495,6 +1495,15 @@ 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 (renderer.BuildIterProgramForEmber())
{
if (printSuccess)
@@ -1954,6 +1963,8 @@ void DistribTester()
}
}
+#define DO_NVIDIA 1
+
int _tmain(int argc, _TCHAR* argv[])
{
//int i;
@@ -2152,16 +2163,17 @@ int _tmain(int argc, _TCHAR* argv[])
//t.Tic();
//TestCpuGpuResults();
//t.Toc("TestCpuGpuResults()");
-
- //t.Tic();
- //b = TestAllVarsCLBuild(0, 0, true);
- //t.Toc("TestAllVarsCLBuild()");
+ t.Tic();
+ b = TestAllVarsCLBuild(0, 0, true);
+ t.Toc("TestAllVarsCLBuild()");
if (b)
{
+#ifdef DO_NVIDIA
t.Tic();
b = TestAllVarsCLBuild(1, 0, true);
t.Toc("TestAllVarsCLBuild()");
+#endif
}
#ifdef DO_DOUBLE
@@ -2177,9 +2189,11 @@ int _tmain(int argc, _TCHAR* argv[])
if (b)
{
+#ifdef DO_NVIDIA
t.Tic();
TestAllVarsCLBuild(1, 0, true);
t.Toc("TestAllVarsCLBuild()");
+#endif
}
}
diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui
index cc16621..fdb0917 100644
--- a/Source/Fractorium/AboutDialog.ui
+++ b/Source/Fractorium/AboutDialog.ui
@@ -58,7 +58,7 @@
QFrame::NoFrame
- <html><head/><body><p align="center"><br/>Fractorium 0.9.9.2 Beta</p><p align="center"><span style=" font-size:10pt;">A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><span style=" font-size:10pt;">Lead: Matt Feemster<br/>Contributors: Simon Detheridge</span></p></body></html>
+ <html><head/><body><p align="center"><br/>Fractorium 0.9.9.3 Beta</p><p align="center"><span style=" font-size:10pt;">A Qt-based fractal flame editor which uses a C++ re-write of the flam3 algorithm named Ember and a GPU capable version named EmberCL which implements a portion of the cuburn algorithm in OpenCL.</span></p><p align="center"><span style=" font-size:10pt;">Lead: Matt Feemster<br/>Contributors: Simon Detheridge</span></p></body></html>
Qt::RichText
diff --git a/Source/Fractorium/Fractorium.rc b/Source/Fractorium/Fractorium.rc
index 92599df..c7e6a4b 100644
Binary files a/Source/Fractorium/Fractorium.rc and b/Source/Fractorium/Fractorium.rc differ