From d8b3dd40d6a5560c6eb425b47417edd61e664b9b Mon Sep 17 00:00:00 2001 From: Person Date: Thu, 16 May 2019 20:56:05 -0700 Subject: [PATCH] --Bug fixes -Fix some recently changed calls to fma(). --Code changes -Update version to 1.0.0.16. --- Builds/MSVC/Installer/Product.wxs | 2 +- Builds/MSVC/VS2017/Ember.rc | Bin 4522 -> 4522 bytes Builds/MSVC/VS2017/EmberAnimate.rc | 8 ++++---- Builds/MSVC/VS2017/EmberCL.rc | Bin 4548 -> 4548 bytes Builds/MSVC/VS2017/EmberGenome.rc | 8 ++++---- Builds/MSVC/VS2017/EmberRender.rc | 8 ++++---- Builds/MSVC/VS2017/Fractorium.rc | Bin 4490 -> 4490 bytes Source/EmberCL/EmberCLFunctions.h | 4 ++-- Source/Fractorium/AboutDialog.ui | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs index 5c9b24e..ac023c1 100644 --- a/Builds/MSVC/Installer/Product.wxs +++ b/Builds/MSVC/Installer/Product.wxs @@ -58,7 +58,7 @@ - + diff --git a/Builds/MSVC/VS2017/Ember.rc b/Builds/MSVC/VS2017/Ember.rc index cd1a580ca4834922064b20470275232bf1cab1f6..3c005ce50c70a11057c24e30754ab2d918900b36 100644 GIT binary patch delta 38 scmZ3byh?e)Hx5R#$=^9F8O=5uavo;_aum76Hw*C0U<8V+wH(%o3#>i;4xs#WX1pq!< B4DJ8` delta 46 zcmeBD?o!@xj)T#3@_7zRR#OIE2Cm8doT8hRIA<^c1q->wH(%o3#>i;8xs#WX1pqz% B4C(*? diff --git a/Source/EmberCL/EmberCLFunctions.h b/Source/EmberCL/EmberCLFunctions.h index aa81a50..c21998e 100644 --- a/Source/EmberCL/EmberCLFunctions.h +++ b/Source/EmberCL/EmberCLFunctions.h @@ -179,7 +179,7 @@ static const char* RandFunctionString = "\n" "inline real_t MwcNext01(uint2* s)\n" "{\n" - " return MwcNext(s) * (1.0 / 4294967296.0);\n" + " return MwcNext(s) * (real_t)(1.0 / 4294967296.0);\n" "}\n" "\n" "inline real_t MwcNextFRange(uint2* s, real_t lower, real_t upper)\n" @@ -191,7 +191,7 @@ static const char* RandFunctionString = "inline real_t MwcNextNeg1Pos1(uint2* s)\n" "{\n" " real_t f = (real_t)MwcNext(s) / (real_t)UINT_MAX;\n" - " return fma(f, 2.0, -1.0);\n" + " return fma(f, (real_t)2.0, (real_t)-1.0);\n" "}\n" "\n" "inline real_t MwcNext0505(uint2* s)\n" diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui index e08ba83..798910d 100644 --- a/Source/Fractorium/AboutDialog.ui +++ b/Source/Fractorium/AboutDialog.ui @@ -58,7 +58,7 @@ QFrame::NoFrame - <html><head/><body><p align="center" style=" font-size:10pt;">Fractorium 1.0.0.15</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"><a href="http://fractorium.com"><span style=" text-decoration: underline; color:#0000ff; font-size:10pt;">fractorium.com</span></a></p></body></html> + <html><head/><body><p align="center"><span style=" font-size:10pt;">Fractorium 1.0.0.16</span></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"><a href="http://fractorium.com"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">fractorium.com</span></a></p></body></html> Qt::RichText