2016-03-01 20:26:45 -05:00
|
|
|
#ifdef _WIN32
|
--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.
2015-09-12 21:33:45 -04:00
|
|
|
#pragma once
|
|
|
|
|
#endif
|
2014-07-08 03:11:14 -04:00
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Precompiled header file. Place all system includes here with appropriate #defines for different operating systems and compilers.
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
|
|
|
|
#define NOMINMAX
|
|
|
|
|
#define _USE_MATH_DEFINES
|
2016-03-01 20:26:45 -05:00
|
|
|
#define __TBB_NO_IMPLICIT_LINKAGE 1//Prevent tbb from automatically looking for tbb_debug.lib. We only care about the release tbb.lib/dll.
|
2014-07-08 03:11:14 -04:00
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
2016-03-01 20:26:45 -05:00
|
|
|
#pragma warning(disable : 4251; disable : 4661; disable : 4100)
|
2014-07-08 03:11:14 -04:00
|
|
|
#define basename(x) _strdup(x)
|
|
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
|
|
|
#define EMBER_OS "WIN"
|
|
|
|
|
|
|
|
|
|
#include <SDKDDKVer.h>
|
|
|
|
|
#include <windows.h>
|
|
|
|
|
#elif __APPLE__
|
|
|
|
|
#define EMBER_OS "OSX"
|
|
|
|
|
#else
|
|
|
|
|
#include <libgen.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#define EMBER_OS "LNX"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
//Standard headers.
|
|
|
|
|
#include <algorithm>
|
2015-12-31 16:41:59 -05:00
|
|
|
#include <array>
|
2014-09-01 00:25:15 -04:00
|
|
|
#include <chrono>
|
2014-07-08 03:11:14 -04:00
|
|
|
#include <complex>
|
2014-09-01 00:25:15 -04:00
|
|
|
#include <cstdint>
|
2014-07-08 03:11:14 -04:00
|
|
|
#include <fstream>
|
|
|
|
|
#include <functional>
|
2014-09-01 00:25:15 -04:00
|
|
|
#include <inttypes.h>
|
2014-07-08 03:11:14 -04:00
|
|
|
#include <iostream>
|
|
|
|
|
#include <iomanip>
|
|
|
|
|
#include <limits>
|
2016-04-03 21:55:12 -04:00
|
|
|
#include <list>
|
2015-01-14 04:40:32 -05:00
|
|
|
#ifdef __APPLE__
|
2015-12-31 16:41:59 -05:00
|
|
|
#include <malloc/malloc.h>
|
2015-01-14 04:40:32 -05:00
|
|
|
#else
|
2015-12-31 16:41:59 -05:00
|
|
|
#include <malloc.h>
|
2015-01-14 04:40:32 -05:00
|
|
|
#endif
|
2015-04-08 21:23:29 -04:00
|
|
|
#include <map>
|
2014-07-08 03:11:14 -04:00
|
|
|
#include <math.h>
|
2014-09-01 00:25:15 -04:00
|
|
|
#include <memory>
|
2016-02-12 00:38:21 -05:00
|
|
|
#include <mutex>
|
2014-07-08 03:11:14 -04:00
|
|
|
#include <numeric>
|
|
|
|
|
#include <ostream>
|
|
|
|
|
#include <sstream>
|
|
|
|
|
#include <sys/types.h>
|
2014-09-01 00:25:15 -04:00
|
|
|
#include <sys/stat.h>
|
|
|
|
|
#include <thread>
|
2014-07-08 03:11:14 -04:00
|
|
|
#include <time.h>
|
2016-01-04 19:50:15 -05:00
|
|
|
#include <type_traits>
|
2014-07-08 03:11:14 -04:00
|
|
|
#include <vector>
|
--User changes
-Add new variations: bubbleT3D, crob, hexaplay3D, hexcrop, hexes, hexnix3D, loonie2, loonie3, nBlur, octapol and synth.
-Allow for pre/post versions of dc_bubble, dc_cylinder and dc_linear whereas before they were omitted.
-When saving a file with multiple embers in it, detect if time values are all the same and if so, start them at zero and increment by 1 for each ember.
-Allow for numerous quality increases to be coalesced into one. It will pick up at the end of the current render.
-Show selection highlight on variations tree in response to mouse hover. This makes it easier to see for which variation or param the current mouse wheel action will apply.
-Make default temporal samples be 100, whereas before it was 1000 which was overkill.
-Require the shift key to be held with delete for deleting an ember to prevent it from triggering when the user enters delete in the edit box.
-This wasn't otherwise fixable without writing a lot more code.
--Bug fixes
-EmberGenome was crashing when generating a sequence from a source file with more than 2 embers in it.
-EmberGenome was improperly handling the first frame of a merge after the last frame of the loop.
-These bugs were due to a previous commit. Revert parts of that commit.
-Prevent a zoom value of less than 0 when reading from xml.
-Slight optimization of the crescents, and mask variations, if the compiler wasn't doing it already.
-Unique file naming was broken because it was looking for _# and the default names ended with -#.
-Disallow renaming of an ember in the library tree to an empty string.
-Severe bug that prevented some variations from being read correctly from params generated outside this program.
-Severe OpenCL randomization bug. The first x coordinates of the first points in the first kernel call of the first ember of a render since the OpenCL renderer object was created were not random and were mostly -1.
-Severe bug when populating xform selection distributions that could sometimes cause a crash due to roundoff error. Fix by using double.
-Limit the max number of variations in a random ember to MAX_CL_VARS, which is 8. This ensures they'll look the same on CPU and GPU.
-Prevent user from saving stylesheet to default.qss, it's a special reserved filename.
--Code changes
-Generalize using the running sum output point inside of a variation for all cases: pre, reg and post.
-Allow for array variables in variations where the address of each element is stored in m_Params.
-Qualify all math functions with std::
-No longer use our own Clamp() in OpenCL, instead use the standard clamp().
-Redesign how functions are used in the variations OpenCL code.
-Add tests to EmberTester to verify some of the new functionality.
-Place more const and override qualifiers on functions where appropriate.
-Add a global rand with a lock to be used very sparingly.
-Use a map instead of a vector for bad param names in Xml parsing.
-Prefix affine interpolation mode defines with "AFFINE_" to make their purpose more clear.
-Allow for variations that change state during iteration by sending a separate copy of the ember to each rendering thread.
-Implement this same functionality with a local struct in OpenCL. It's members are the total of all variables that need to change state within an ember.
-Add Contains() function to Utils.h.
-EmberRender: print names of kernels being printed with --dump_kernel option.
-Clean up EmberTester to handle some of the recent changes.
-Fix various casts.
-Replace % 2 with & 1, even though the compiler was likely doing this already.
-Add new file Variations06.h to accommodate new variations.
-General cleanup.
2015-11-22 17:15:07 -05:00
|
|
|
#include <unordered_map>
|
2014-07-08 03:11:14 -04:00
|
|
|
|
|
|
|
|
//Third party headers.
|
2014-09-01 00:25:15 -04:00
|
|
|
#ifdef _WIN32
|
2015-12-31 16:41:59 -05:00
|
|
|
#include "libxml/parser.h"
|
2014-09-01 00:25:15 -04:00
|
|
|
#else
|
2015-12-31 16:41:59 -05:00
|
|
|
#include "libxml2/libxml/parser.h"
|
2014-09-01 00:25:15 -04:00
|
|
|
#endif
|
2014-07-08 03:11:14 -04:00
|
|
|
|
2020-04-09 18:41:49 -04:00
|
|
|
#if !defined(Q_MOC_RUN)
|
|
|
|
|
//Intel's Threading Building Blocks is what's used for all threading.
|
|
|
|
|
#include <tbb/parallel_for.h>
|
|
|
|
|
#include <tbb/task_scheduler_init.h>
|
|
|
|
|
#endif
|
2014-07-08 03:11:14 -04:00
|
|
|
|
2014-12-11 12:02:42 -05:00
|
|
|
#define GLM_FORCE_RADIANS 1
|
2016-12-05 22:04:33 -05:00
|
|
|
#define GLM_ENABLE_EXPERIMENTAL 1
|
|
|
|
|
|
2015-01-14 04:40:32 -05:00
|
|
|
#ifndef __APPLE__
|
2015-12-31 16:41:59 -05:00
|
|
|
#define GLM_FORCE_INLINE 1
|
2015-01-14 04:40:32 -05:00
|
|
|
#endif
|
2014-07-08 03:11:14 -04:00
|
|
|
|
|
|
|
|
//glm is what's used for matrix math.
|
2015-01-14 04:40:32 -05:00
|
|
|
#include <glm/glm.hpp>
|
2018-09-18 01:16:12 -04:00
|
|
|
#if GLM_VERSION <= 990
|
|
|
|
|
#include <glm/detail/type_int.hpp>
|
|
|
|
|
#endif
|
2015-01-14 04:40:32 -05:00
|
|
|
#include <glm/gtc/matrix_transform.hpp>
|
|
|
|
|
#include <glm/gtc/type_ptr.hpp>
|
|
|
|
|
#include <glm/gtx/string_cast.hpp>
|
2014-07-08 03:11:14 -04:00
|
|
|
|
|
|
|
|
using namespace tbb;
|
|
|
|
|
using namespace std;
|
2014-09-01 00:25:15 -04:00
|
|
|
using namespace std::chrono;
|
2015-03-21 18:27:37 -04:00
|
|
|
using namespace glm;
|
|
|
|
|
using namespace glm::detail;
|
2014-12-06 00:05:09 -05:00
|
|
|
using glm::uint;
|
|
|
|
|
using glm::uint16;
|