mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-12 03:04:51 -04:00
--User changes
-Add support for multiple GPU devices. --These options are present in the command line and in Fractorium. -Change scheme of specifying devices from platform,device to just total device index. --Single number on the command line. --Change from combo boxes for device selection to a table of all devices in Fractorium. -Temporal samples defaults to 100 instead of 1000 which was needless overkill. --Bug fixes -EmberAnimate, EmberRender, FractoriumSettings, FinalRenderDialog: Fix wrong order of arguments to Clamp() when assigning thread priority. -VariationsDC.h: Fix NVidia OpenCL compilation error in DCTriangleVariation. -FractoriumXformsColor.cpp: Checking for null pixmap pointer is not enough, must also check if the underlying buffer is null via call to QPixmap::isNull(). --Code changes -Ember.h: Add case for FLAME_MOTION_NONE and default in ApplyFlameMotion(). -EmberMotion.h: Call base constructor. -EmberPch.h: #pragma once only on Windows. -EmberToXml.h: --Handle different types of exceptions. --Add default cases to ToString(). -Isaac.h: Remove unused variable in constructor. -Point.h: Call base constructor in Color(). -Renderer.h/cpp: --Add bool to Alloc() to only allocate memory for the histogram. Needed for multi-GPU. --Make CoordMap() return a const ref, not a pointer. -SheepTools.h: --Use 64-bit types like the rest of the code already does. --Fix some comment misspellings. -Timing.h: Make BeginTime(), EndTime(), ElapsedTime() and Format() be const functions. -Utils.h: --Add new functions Equal() and Split(). --Handle more exception types in ReadFile(). --Get rid of most legacy blending of C and C++ argument parsing. -XmlToEmber.h: --Get rid of most legacy blending of C and C++ code from flam3. --Remove some unused variables. -EmberAnimate: --Support multi-GPU processing that alternates full frames between devices. --Use OpenCLInfo instead of OpenCLWrapper for --openclinfo option. --Remove bucketT template parameter, and hard code float in its place. --If a render fails, exit since there is no point in continuing an animation with a missing frame. --Pass variables to threaded save better, which most likely fixes a very subtle bug that existed before. --Remove some unused variables. -EmberGenome, EmberRender: --Support multi-GPU processing that alternates full frames between devices. --Use OpenCLInfo instead of OpenCLWrapper for --openclinfo option. --Remove bucketT template parameter, and hard code float in its place. -EmberRender: --Support multi-GPU processing that alternates full frames between devices. --Use OpenCLInfo instead of OpenCLWrapper for --openclinfo option. --Remove bucketT template parameter, and hard code float in its place. --Only print values when not rendering with OpenCL, since they're always 0 in that case. -EmberCLPch.h: --#pragma once only on Windows. --#include <atomic>. -IterOpenCLKernelCreator.h: Add new kernel for summing two histograms. This is needed for multi-GPU. -OpenCLWrapper.h: --Move all OpenCL info related code into its own class OpenCLInfo. --Add members to cache the values of global memory size and max allocation size. -RendererCL.h/cpp: --Redesign to accomodate multi-GPU. --Constructor now takes a vector of devices. --Remove DumpErrorReport() function, it's handled in the base. --ClearBuffer(), ReadPoints(), WritePoints(), ReadHist() and WriteHist() now optionally take a device index as a parameter. --MakeDmap() override and m_DmapCL member removed because it no longer applies since the histogram is always float since the last commit. --Add new function SumDeviceHist() to sum histograms from two devices by first copying to a temporary on the host, then a temporary on the device, then summing. --m_Calls member removed, as it's now per-device. --OpenCLWrapper removed. --m_Seeds member is now a vector of vector of seeds, to accomodate a separate and different array of seeds for each device. --Added member m_Devices, a vector of unique_ptr of RendererCLDevice. -EmberCommon.h --Added Devices() function to convert from a vector of device indices to a vector of platform,device indices. --Changed CreateRenderer() to accept a vector of devices to create a single RendererCL which will split work across multiple devices. --Added CreateRenderers() function to accept a vector of devices to create multiple RendererCL, each which will render on a single device. --Add more comments to some existing functions. -EmberCommonPch.h: #pragma once only on Windows. -EmberOptions.h: --Remove --platform option, it's just sequential device number now with the --device option. --Make --out be OPT_USE_RENDER instead of OPT_RENDER_ANIM since it's an error condition when animating. It makes no sense to write all frames to a single image. --Add Devices() function to parse comma separated --device option string and return a vector of device indices. --Make int and uint types be 64-bit, so intmax_t and size_t. --Make better use of macros. -JpegUtils.h: Make string parameters to WriteJpeg() and WritePng() be const ref. -All project files: Turn off buffer security check option in Visual Studio (/Gs-) -deployment.pri: Remove the line OTHER_FILES +=, it's pointless and was causing problems. -Ember.pro, EmberCL.pro: Add CONFIG += plugin, otherwise it wouldn't link. -EmberCL.pro: Add new files for multi-GPU support. -build_all.sh: use -j4 and QMAKE=${QMAKE:/usr/bin/qmake} -shared_settings.pri: -Add version string. -Remove old DESTDIR definitions. -Add the following lines or else nothing would build: CONFIG(release, debug|release) { CONFIG += warn_off DESTDIR = ../../../Bin/release } CONFIG(debug, debug|release) { DESTDIR = ../../../Bin/debug } QMAKE_POST_LINK += $$quote(cp --update ../../../Data/flam3-palettes.xml $${DESTDIR}$$escape_expand(\n\t)) LIBS += -L/usr/lib -lpthread -AboutDialog.ui: Another futile attempt to make it look correct on Linux. -FinalRenderDialog.h/cpp: --Add support for multi-GPU. --Change from combo boxes for device selection to a table of all devices. --Ensure device selection makes sense. --Remove "FinalRender" prefix of various function names, it's implied given the context. -FinalRenderEmberController.h/cpp: --Add support for multi-GPU. --Change m_FinishedImageCount to be atomic. --Move CancelRender() from the base to FinalRenderEmberController<T>. --Refactor RenderComplete() to omit any progress related functionality or image saving since it can be potentially ran in a thread. --Consolidate setting various renderer fields into SyncGuiToRenderer(). -Fractorium.cpp: Allow for resizing of the options dialog to show the entire device table. -FractoriumCommon.h: Add various functions to handle a table showing the available OpenCL devices on the system. -FractoriumEmberController.h/cpp: Remove m_FinalImageIndex, it's no longer needed. -FractoriumRender.cpp: Scale the interactive sub batch count and quality by the number of devices used. -FractoriumSettings.h/cpp: --Temporal samples defaults to 100 instead of 1000 which was needless overkill. --Add multi-GPU support, remove old device,platform pair. -FractoriumToolbar.cpp: Disable OpenCL toolbar button if there are no devices present on the system. -FractoriumOptionsDialog.h/cpp: --Add support for multi-GPU. --Consolidate more assignments in DataToGui(). --Enable/disable CPU/OpenCL items in response to OpenCL checkbox event. -Misc: Convert almost everything to size_t for unsigned, intmax_t for signed.
This commit is contained in:
@ -44,7 +44,7 @@ enum eCrossMode
|
||||
/// Most functions in this class perform a particular action and return
|
||||
/// a string describing what it did so it can be recorded in an Xml edit doc
|
||||
/// to be saved with the ember when converting to Xml.
|
||||
/// Since it's members can occupy significant memory space and also have
|
||||
/// Since its members can occupy significant memory space and also have
|
||||
/// hefty initialization sequences, it's important to declare one instance
|
||||
/// and reuse it for the duration of the program instead of creating and deleting
|
||||
/// them as local variables.
|
||||
@ -186,11 +186,10 @@ public:
|
||||
/// <param name="sym">The type of symmetry to add if random specified. If 0, it will be added randomly.</param>
|
||||
/// <param name="speed">The speed to multiply the pre affine transforms by if the mutate mode is MUTATE_ALL_COEFS, else ignored.</param>
|
||||
/// <returns>A string describing what was done</returns>
|
||||
string Mutate(Ember<T>& ember, eMutateMode mode, vector<eVariationId>& useVars, int sym, T speed)
|
||||
string Mutate(Ember<T>& ember, eMutateMode mode, vector<eVariationId>& useVars, intmax_t sym, T speed)
|
||||
{
|
||||
bool done = false;
|
||||
size_t modXform;
|
||||
char ministr[32];
|
||||
T randSelect;
|
||||
ostringstream os;
|
||||
Ember<T> mutation;
|
||||
@ -285,14 +284,13 @@ public:
|
||||
else if (mode == MUTATE_POST_XFORMS)
|
||||
{
|
||||
bool same = (m_Rand.Rand() & 3) > 0;//25% chance of using the same post for all of them.
|
||||
uint b = 1 + m_Rand.Rand() % 6;
|
||||
size_t b = 1 + m_Rand.Rand() % 6;
|
||||
|
||||
sprintf_s(ministr, 32, "(%d%s)", b, same ? " same" : "");
|
||||
os << "mutate post xforms " << ministr;
|
||||
os << "mutate post xforms " << b << (same ? " same" : "");
|
||||
|
||||
for (size_t i = 0; i < ember.TotalXformCount(); i++)
|
||||
{
|
||||
int copy = (i > 0) && same;
|
||||
bool copy = (i > 0) && same;
|
||||
Xform<T>* xform = ember.GetTotalXform(i);
|
||||
|
||||
if (copy)//Copy the post from the first xform to the rest of them.
|
||||
@ -605,7 +603,7 @@ public:
|
||||
{
|
||||
vector<eVariationId> useVars;
|
||||
|
||||
Random(ember, useVars, static_cast<int>(m_Rand.Frand<T>(-2, 2)), 0);
|
||||
Random(ember, useVars, static_cast<intmax_t>(m_Rand.Frand<T>(-2, 2)), 0);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -615,7 +613,7 @@ public:
|
||||
/// <param name="useVars">A list of variations to use. If empty, any variation can be used.</param>
|
||||
/// <param name="sym">The symmetry type to use from -2 to 2</param>
|
||||
/// <param name="specXforms">The number of xforms to use. If 0, a quasi random count is used.</param>
|
||||
void Random(Ember<T>& ember, vector<eVariationId>& useVars, int sym, size_t specXforms)
|
||||
void Random(Ember<T>& ember, vector<eVariationId>& useVars, intmax_t sym, size_t specXforms)
|
||||
{
|
||||
bool postid, addfinal = false;
|
||||
int var, samed, multid, samepost;
|
||||
@ -806,9 +804,9 @@ public:
|
||||
/// <param name="tries">The number of test renders to try before giving up</param>
|
||||
/// <param name="changePalette">Change palette if true, else keep trying with the same palette.</param>
|
||||
/// <param name="colorResolution">The resolution of the test histogram. This value ^ 3 will be used for the total size. Common value is 10.</param>
|
||||
void ImproveColors(Ember<T>& ember, int tries, bool changePalette, int colorResolution)
|
||||
void ImproveColors(Ember<T>& ember, size_t tries, bool changePalette, size_t colorResolution)
|
||||
{
|
||||
int i;
|
||||
size_t i;
|
||||
T best, b;
|
||||
Ember<T> bestEmber = ember;
|
||||
|
||||
@ -847,7 +845,7 @@ public:
|
||||
/// <param name="ember">The ember to render</param>
|
||||
/// <param name="colorResolution">The resolution of the test histogram. This value ^ 3 will be used for the total size. Common value is 10.</param>
|
||||
/// <returns>The number of histogram cells that weren't black</returns>
|
||||
T TryColors(Ember<T>& ember, int colorResolution)
|
||||
T TryColors(Ember<T>& ember, size_t colorResolution)
|
||||
{
|
||||
byte* p;
|
||||
size_t i, hits = 0, res = colorResolution;
|
||||
@ -903,7 +901,7 @@ public:
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Change around color coordinates. Optionall change out the entire palette.
|
||||
/// Change around color coordinates. Optionally change out the entire palette.
|
||||
/// </summary>
|
||||
/// <param name="ember">The ember whose xform's color coordinates will be changed</param>
|
||||
/// <param name="changePalette">Change palette if true, else don't</param>
|
||||
@ -1071,7 +1069,7 @@ public:
|
||||
/// <param name="result">The result of the spin</param>
|
||||
/// <param name="frame">The frame in the sequence to be stored in the m_Time member of result</param>
|
||||
/// <param name="blend">The interpolation time</param>
|
||||
void Spin(Ember<T>& parent, Ember<T>* templ, Ember<T>& result, int frame, T blend)
|
||||
void Spin(Ember<T>& parent, Ember<T>* templ, Ember<T>& result, size_t frame, T blend)
|
||||
{
|
||||
char temp[50];
|
||||
|
||||
@ -1112,7 +1110,7 @@ public:
|
||||
/// <param name="frame">The frame in the sequence to be stored in the m_Time member of result</param>
|
||||
/// <param name="seqFlag">True if embers points to the first or last ember in the entire sequence, else false.</param>
|
||||
/// <param name="blend">The interpolation time</param>
|
||||
void SpinInter(Ember<T>* parents, Ember<T>* templ, Ember<T>& result, int frame, bool seqFlag, T blend)
|
||||
void SpinInter(Ember<T>* parents, Ember<T>* templ, Ember<T>& result, size_t frame, bool seqFlag, T blend)
|
||||
{
|
||||
char temp[50];
|
||||
|
||||
@ -1286,8 +1284,8 @@ public:
|
||||
m_Samples.resize(samples);
|
||||
params.m_Count = samples;
|
||||
params.m_Skip = 20;
|
||||
//params.m_OneColDiv2 = m_Renderer->CoordMap()->OneCol() / 2;
|
||||
//params.m_OneRowDiv2 = m_Renderer->CoordMap()->OneRow() / 2;
|
||||
//params.m_OneColDiv2 = m_Renderer->CoordMap().OneCol() / 2;
|
||||
//params.m_OneRowDiv2 = m_Renderer->CoordMap().OneRow() / 2;
|
||||
|
||||
size_t bv = m_Iterator->Iterate(ember, params, m_Samples.data(), m_Rand);//Use a special fuse of 20, all other calls to this will use 15, or 100.
|
||||
|
||||
@ -1349,7 +1347,7 @@ public:
|
||||
/// <param name="comment">The comment to include</param>
|
||||
/// <param name="sheepGen">The sheep generation used if > 0. Default: 0.</param>
|
||||
/// <param name="sheepId">The sheep id used if > 0. Default: 0.</param>
|
||||
void SetSpinParams(bool smooth, T stagger, T offsetX, T offsetY, string nick, string url, string id, string comment, int sheepGen, int sheepId)
|
||||
void SetSpinParams(bool smooth, T stagger, T offsetX, T offsetY, const string& nick, const string& url, const string& id, const string& comment, intmax_t sheepGen, intmax_t sheepId)
|
||||
{
|
||||
m_Smooth = smooth;
|
||||
m_SheepGen = sheepGen;
|
||||
@ -1365,8 +1363,8 @@ public:
|
||||
|
||||
private:
|
||||
bool m_Smooth;
|
||||
int m_SheepGen;
|
||||
int m_SheepId;
|
||||
intmax_t m_SheepGen;
|
||||
intmax_t m_SheepId;
|
||||
T m_Stagger;
|
||||
T m_OffsetX;
|
||||
T m_OffsetY;
|
||||
|
Reference in New Issue
Block a user