mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 21:20:07 -05:00
018ba26b5f
-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.
152 lines
5.7 KiB
C++
152 lines
5.7 KiB
C++
#pragma once
|
|
|
|
#include "FractoriumSettings.h"
|
|
#include "FractoriumEmberController.h"
|
|
|
|
/// <summary>
|
|
/// FinalRenderEmberControllerBase and FinalRenderEmberController<T> classes.
|
|
/// </summary>
|
|
|
|
/// <summary>
|
|
/// FractoriumEmberController and Fractorium need each other, but each can't include the other.
|
|
/// So Fractorium includes this file, and Fractorium is declared as a forward declaration here.
|
|
/// </summary>
|
|
class Fractorium;
|
|
class FractoriumFinalRenderDialog;
|
|
//class FractoriumEmberControllerBase;
|
|
|
|
/// <summary>
|
|
/// Used to hold the options specified in the current state of the Gui for performing the final render.
|
|
/// </summary>
|
|
struct FinalRenderGuiState
|
|
{
|
|
bool m_EarlyClip;
|
|
bool m_YAxisUp;
|
|
bool m_AlphaChannel;
|
|
bool m_Transparency;
|
|
bool m_OpenCL;
|
|
bool m_Double;
|
|
bool m_SaveXml;
|
|
bool m_DoAll;
|
|
bool m_DoSequence;
|
|
bool m_KeepAspect;
|
|
eScaleType m_Scale;
|
|
QString m_Path;
|
|
QString m_Ext;
|
|
QString m_Prefix;
|
|
QString m_Suffix;
|
|
QList<QVariant> m_Devices;
|
|
uint m_ThreadCount;
|
|
int m_ThreadPriority;
|
|
double m_WidthScale;
|
|
double m_HeightScale;
|
|
double m_Quality;
|
|
uint m_TemporalSamples;
|
|
uint m_Supersample;
|
|
uint m_Strips;
|
|
};
|
|
|
|
/// <summary>
|
|
/// FinalRenderEmberControllerBase serves as a non-templated base class with virtual
|
|
/// functions which will be overridden in a derived class that takes a template parameter.
|
|
/// Although not meant to be used as an interactive renderer, it derives from FractoriumEmberControllerBase
|
|
/// to access a few of its members to avoid having to redefine them here.
|
|
/// </summary>
|
|
class FinalRenderEmberControllerBase : public FractoriumEmberControllerBase
|
|
{
|
|
friend FractoriumFinalRenderDialog;
|
|
|
|
public:
|
|
FinalRenderEmberControllerBase(FractoriumFinalRenderDialog* finalRenderDialog);
|
|
virtual ~FinalRenderEmberControllerBase() { }
|
|
|
|
virtual void SyncCurrentToGui() { }
|
|
virtual void SyncGuiToEmbers(size_t widthOverride = 0, size_t heightOverride = 0) { }
|
|
virtual void SyncCurrentToSizeSpinners(bool scale, bool size) { }
|
|
virtual void ResetProgress(bool total = true) { }
|
|
virtual tuple<size_t, size_t, size_t> SyncAndComputeMemory() { return tuple<size_t, size_t, size_t>(0, 0, 0); }
|
|
virtual double OriginalAspect() { return 1; }
|
|
virtual QString ComposePath(const QString& name) { return ""; }
|
|
virtual void CancelRender() { }
|
|
|
|
bool CreateRendererFromGUI();
|
|
void Output(const QString& s);
|
|
|
|
protected:
|
|
bool m_Run;
|
|
bool m_PreviewRun;
|
|
size_t m_ImageCount;
|
|
std::atomic<size_t> m_FinishedImageCount;
|
|
|
|
QFuture<void> m_Result;
|
|
QFuture<void> m_FinalPreviewResult;
|
|
std::function<void (void)> m_FinalRenderFunc;
|
|
std::function<void (void)> m_FinalPreviewRenderFunc;
|
|
|
|
FractoriumSettings* m_Settings;
|
|
FractoriumFinalRenderDialog* m_FinalRenderDialog;
|
|
FinalRenderGuiState m_GuiState;
|
|
CriticalSection m_PreviewCs, m_ProgressCs;
|
|
Timing m_RenderTimer;
|
|
Timing m_TotalTimer;
|
|
};
|
|
|
|
/// <summary>
|
|
/// Templated derived class which implements all interaction functionality between the embers
|
|
/// of a specific template type and the final render dialog.
|
|
/// </summary>
|
|
template<typename T>
|
|
class FinalRenderEmberController : public FinalRenderEmberControllerBase
|
|
{
|
|
public:
|
|
FinalRenderEmberController(FractoriumFinalRenderDialog* finalRender);
|
|
virtual ~FinalRenderEmberController() { }
|
|
|
|
//Virtual functions overridden from FractoriumEmberControllerBase.
|
|
virtual void SetEmberFile(const EmberFile<float>& emberFile) override;
|
|
virtual void CopyEmberFile(EmberFile<float>& emberFile, std::function<void(Ember<float>& ember)> perEmberOperation/* = [&](Ember<float>& ember) { }*/) override;
|
|
#ifdef DO_DOUBLE
|
|
virtual void SetEmberFile(const EmberFile<double>& emberFile) override;
|
|
virtual void CopyEmberFile(EmberFile<double>& emberFile, std::function<void(Ember<double>& ember)> perEmberOperation/* = [&](Ember<double>& ember) { }*/) override;
|
|
#endif
|
|
virtual void SetEmber(size_t index) override;
|
|
virtual bool Render() override;
|
|
virtual bool CreateRenderer(eRendererType renderType, const vector<pair<size_t, size_t>>& devices, bool shared = true) override;
|
|
virtual int ProgressFunc(Ember<T>& ember, void* foo, double fraction, int stage, double etaMs) override;
|
|
virtual size_t Index() const override { return m_Ember->m_Index; }
|
|
virtual uint SizeOfT() const override { return sizeof(T); }
|
|
|
|
//Virtual functions overridden from FinalRenderEmberControllerBase.
|
|
virtual void SyncCurrentToGui() override;
|
|
virtual void SyncGuiToEmbers(size_t widthOverride = 0, size_t heightOverride = 0) override;
|
|
virtual void SyncCurrentToSizeSpinners(bool scale, bool size) override;
|
|
virtual void ResetProgress(bool total = true) override;
|
|
virtual tuple<size_t, size_t, size_t> SyncAndComputeMemory() override;
|
|
virtual double OriginalAspect() override { return double(m_Ember->m_OrigFinalRasW) / m_Ember->m_OrigFinalRasH; }
|
|
virtual QString Name() const override { return QString::fromStdString(m_Ember->m_Name); }
|
|
virtual QString ComposePath(const QString& name) override;
|
|
virtual void CancelRender() override;
|
|
|
|
//Non Virtual functions.
|
|
EmberNs::Renderer<T, float>* FirstOrDefaultRenderer();
|
|
|
|
protected:
|
|
void CancelPreviewRender();
|
|
void HandleFinishedProgress();
|
|
void SaveCurrentRender(Ember<T>& ember);
|
|
void SaveCurrentRender(Ember<T>& ember, const EmberImageComments& comments, vector<byte>& pixels, size_t width, size_t height, size_t channels, size_t bpc);
|
|
void RenderComplete(Ember<T>& ember);
|
|
void RenderComplete(Ember<T>& ember, const EmberStats& stats, Timing& renderTimer);
|
|
void SyncGuiToEmber(Ember<T>& ember, size_t widthOverride = 0, size_t heightOverride = 0);
|
|
bool SyncGuiToRenderer();
|
|
void SetProgressComplete(int val);
|
|
|
|
Ember<T>* m_Ember;
|
|
Ember<T> m_PreviewEmber;
|
|
EmberFile<T> m_EmberFile;
|
|
EmberToXml<T> m_XmlWriter;
|
|
unique_ptr<EmberNs::Renderer<T, float>> m_FinalPreviewRenderer;
|
|
vector<unique_ptr<EmberNs::Renderer<T, float>>> m_Renderers;
|
|
};
|
|
|