2014-07-08 03:11:14 -04:00
# include "EmberCommonPch.h"
--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
2014-07-08 03:11:14 -04:00
# include "EmberGenome.h"
# include "JpegUtils.h"
/// <summary>
/// Set various default test values on the passed in ember.
/// </summary>
/// <param name="ember">The ember to test</param>
template < typename T >
void SetDefaultTestValues ( Ember < T > & ember )
{
2015-12-31 16:41:59 -05:00
ember . m_Time = 0.0 ;
2015-12-31 19:00:36 -05:00
ember . m_Interp = eInterp : : EMBER_INTERP_LINEAR ;
ember . m_PaletteInterp = ePaletteInterp : : INTERP_HSV ;
2015-12-31 16:41:59 -05:00
ember . m_Background [ 0 ] = 0 ;
ember . m_Background [ 1 ] = 0 ;
ember . m_Background [ 2 ] = 0 ;
ember . m_Background [ 3 ] = 255 ;
ember . m_CenterX = 0 ;
ember . m_CenterY = 0 ;
ember . m_Rotate = 0 ;
ember . m_PixelsPerUnit = 64 ;
ember . m_FinalRasW = 128 ;
ember . m_FinalRasH = 128 ;
ember . m_Supersample = 1 ;
ember . m_SpatialFilterRadius = T ( 0.5 ) ;
2015-12-31 19:00:36 -05:00
ember . m_SpatialFilterType = eSpatialFilterType : : GAUSSIAN_SPATIAL_FILTER ;
2015-12-31 16:41:59 -05:00
ember . m_Zoom = 0 ;
ember . m_Quality = 1 ;
ember . m_TemporalSamples = 1 ;
ember . m_MaxRadDE = 0 ;
ember . m_MinRadDE = 0 ;
ember . m_CurveDE = T ( 0.6 ) ;
2014-07-08 03:11:14 -04:00
}
/// <summary>
/// The core of the EmberGenome.exe program.
/// Template argument expected to be float or double.
/// </summary>
/// <param name="opt">A populated EmberOptions object which specifies all program options to be used</param>
/// <returns>True if success, else false.</returns>
--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
template < typename T >
2014-07-08 03:11:14 -04:00
bool EmberGenome ( EmberOptions & opt )
{
2015-12-31 16:41:59 -05:00
auto info = OpenCLInfo : : Instance ( ) ;
2014-07-08 03:11:14 -04:00
std : : cout . imbue ( std : : locale ( " " ) ) ;
if ( opt . DumpArgs ( ) )
2016-01-04 19:50:15 -05:00
cerr < < opt . GetValues ( eOptionUse : : OPT_USE_GENOME ) < < endl ;
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
if ( opt . OpenCLInfo ( ) )
{
2015-01-21 08:34:34 -05:00
cerr < < " \n OpenCL Info: " < < endl ;
2015-12-31 16:41:59 -05:00
cerr < < info - > DumpInfo ( ) ;
2014-07-08 03:11:14 -04:00
return true ;
}
//Regular variables.
Timing t ;
bool exactTimeMatch , randomMode , didColor , seqFlag ;
--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
size_t i , j , i0 , i1 , rep , val , frame , frameCount , count = 0 ;
size_t ftime , firstFrame , lastFrame ;
2014-10-14 11:53:15 -04:00
size_t n , tot , totb , totw ;
2014-07-08 03:11:14 -04:00
T avgPix , fractionBlack , fractionWhite , blend , spread , mix0 , mix1 ;
string token , filename ;
ostringstream os , os2 ;
vector < Ember < T > > embers , embers2 , templateEmbers ;
vector < eVariationId > vars , noVars ;
2014-12-06 00:05:09 -05:00
vector < byte > finalImage ;
2014-07-08 03:11:14 -04:00
eCrossMode crossMeth ;
eMutateMode mutMeth ;
Ember < T > orig , save , selp0 , selp1 , parent0 , parent1 ;
Ember < T > result , result1 , result2 , result3 , interpolated ;
2014-12-05 21:30:46 -05:00
Ember < T > * aselp0 , * aselp1 , * pTemplate = nullptr ;
2014-07-08 03:11:14 -04:00
XmlToEmber < T > parser ;
EmberToXml < T > emberToXml ;
VariationList < T > varList ;
EmberReport emberReport , emberReport2 ;
--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
const vector < pair < size_t , size_t > > devices = Devices ( opt . Devices ( ) ) ;
2014-10-18 17:07:07 -04:00
unique_ptr < RenderProgress < T > > progress ( new RenderProgress < T > ( ) ) ;
2016-01-04 19:50:15 -05:00
unique_ptr < Renderer < T , float > > renderer ( CreateRenderer < T > ( opt . EmberCL ( ) ? eRendererType : : OPENCL_RENDERER : eRendererType : : CPU_RENDERER , devices , false , 0 , emberReport ) ) ;
2014-07-08 03:11:14 -04:00
QTIsaac < ISAAC_SIZE , ISAAC_INT > rand ( ISAAC_INT ( t . Tic ( ) ) , ISAAC_INT ( t . Tic ( ) * 2 ) , ISAAC_INT ( t . Tic ( ) * 3 ) ) ;
vector < string > errorReport = emberReport . ErrorReport ( ) ;
os . imbue ( std : : locale ( " " ) ) ;
os2 . imbue ( std : : locale ( " " ) ) ;
if ( ! errorReport . empty ( ) )
2015-01-23 21:26:18 -05:00
cerr < < emberReport . ErrorReportString ( ) ;
2014-07-08 03:11:14 -04:00
if ( ! renderer . get ( ) )
{
2015-01-21 08:34:34 -05:00
cerr < < " Renderer creation failed, exiting. " < < endl ;
2014-07-08 03:11:14 -04:00
return false ;
}
if ( ! InitPaletteList < T > ( opt . PalettePath ( ) ) )
return false ;
if ( ! opt . EmberCL ( ) )
{
if ( opt . ThreadCount ( ) ! = 0 )
2014-12-05 21:30:46 -05:00
renderer - > ThreadCount ( opt . ThreadCount ( ) , opt . IsaacSeed ( ) ! = " " ? opt . IsaacSeed ( ) . c_str ( ) : nullptr ) ;
2014-07-08 03:11:14 -04:00
}
else
{
2015-01-21 08:34:34 -05:00
cerr < < " Using OpenCL to render. " < < endl ;
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
if ( opt . Verbose ( ) )
{
--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
for ( auto & device : devices )
{
2015-12-31 16:41:59 -05:00
cerr < < " Platform: " < < info - > PlatformName ( device . first ) < < endl ;
cerr < < " Device: " < < info - > DeviceName ( device . first , device . second ) < < endl ;
--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
}
2014-07-08 03:11:14 -04:00
}
}
//SheepTools will own the created renderer and will take care of cleaning it up.
2016-01-04 19:50:15 -05:00
SheepTools < T , float > tools ( opt . PalettePath ( ) , CreateRenderer < T > ( opt . EmberCL ( ) ? eRendererType : : OPENCL_RENDERER : eRendererType : : CPU_RENDERER , devices , false , 0 , emberReport2 ) ) ;
2014-07-08 03:11:14 -04:00
tools . SetSpinParams ( ! opt . UnsmoothEdge ( ) ,
T ( opt . Stagger ( ) ) ,
T ( opt . OffsetX ( ) ) ,
T ( opt . OffsetY ( ) ) ,
opt . Nick ( ) ,
opt . Url ( ) ,
opt . Id ( ) ,
opt . Comment ( ) ,
opt . SheepGen ( ) ,
opt . SheepId ( ) ) ;
if ( opt . UseVars ( ) ! = " " & & opt . DontUseVars ( ) ! = " " )
{
2015-01-21 08:34:34 -05:00
cerr < < " use_vars and dont_use_vars cannot both be specified. Returning without executing. " < < endl ;
2014-07-08 03:11:14 -04:00
return false ;
}
//Specify reasonable defaults if nothing is specified.
if ( opt . UseVars ( ) = = " " & & opt . DontUseVars ( ) = = " " )
{
2016-01-04 19:50:15 -05:00
noVars . push_back ( eVariationId : : VAR_NOISE ) ;
noVars . push_back ( eVariationId : : VAR_BLUR ) ;
noVars . push_back ( eVariationId : : VAR_GAUSSIAN_BLUR ) ;
noVars . push_back ( eVariationId : : VAR_RADIAL_BLUR ) ;
noVars . push_back ( eVariationId : : VAR_NGON ) ;
noVars . push_back ( eVariationId : : VAR_SQUARE ) ;
noVars . push_back ( eVariationId : : VAR_RAYS ) ;
noVars . push_back ( eVariationId : : VAR_CROSS ) ;
noVars . push_back ( eVariationId : : VAR_PRE_BLUR ) ;
noVars . push_back ( eVariationId : : VAR_SEPARATION ) ;
noVars . push_back ( eVariationId : : VAR_SPLIT ) ;
noVars . push_back ( eVariationId : : VAR_SPLITS ) ;
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
//Loop over the novars and set ivars to the complement.
for ( i = 0 ; i < varList . Size ( ) ; i + + )
{
for ( j = 0 ; j < noVars . size ( ) ; j + + )
{
if ( noVars [ j ] = = varList . GetVariation ( i ) - > VariationId ( ) )
break ;
}
if ( j = = noVars . size ( ) )
vars . push_back ( varList . GetVariation ( i ) - > VariationId ( ) ) ;
}
}
else
{
if ( opt . UseVars ( ) ! = " " ) //Parse comma-separated list of variations to use.
{
istringstream iss ( opt . UseVars ( ) ) ;
while ( std : : getline ( iss , token , ' , ' ) )
{
--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
if ( parser . Aton ( token . c_str ( ) , val ) )
2014-07-08 03:11:14 -04:00
{
if ( val < varList . Size ( ) )
2014-12-07 02:51:44 -05:00
vars . push_back ( static_cast < eVariationId > ( val ) ) ;
2014-07-08 03:11:14 -04:00
}
}
}
else if ( opt . DontUseVars ( ) ! = " " )
{
istringstream iss ( opt . DontUseVars ( ) ) ;
while ( std : : getline ( iss , token , ' , ' ) )
{
--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
if ( parser . Aton ( token . c_str ( ) , val ) )
2014-07-08 03:11:14 -04:00
{
if ( val < varList . Size ( ) )
2014-12-07 02:51:44 -05:00
noVars . push_back ( static_cast < eVariationId > ( val ) ) ;
2014-07-08 03:11:14 -04:00
}
}
//Loop over the novars and set ivars to the complement.
for ( i = 0 ; i < varList . Size ( ) ; i + + )
{
for ( j = 0 ; j < noVars . size ( ) ; j + + )
{
if ( noVars [ j ] = = varList . GetVariation ( i ) - > VariationId ( ) )
break ;
}
if ( j = = noVars . size ( ) )
vars . push_back ( varList . GetVariation ( i ) - > VariationId ( ) ) ;
}
}
}
bool doMutate = opt . Mutate ( ) ! = " " ;
bool doInter = opt . Inter ( ) ! = " " ;
bool doRotate = opt . Rotate ( ) ! = " " ;
bool doClone = opt . Clone ( ) ! = " " ;
bool doStrip = opt . Strip ( ) ! = " " ;
bool doCross0 = opt . Cross0 ( ) ! = " " ;
bool doCross1 = opt . Cross1 ( ) ! = " " ;
count + = ( doMutate ? 1 : 0 ) ;
count + = ( doInter ? 1 : 0 ) ;
count + = ( doRotate ? 1 : 0 ) ;
count + = ( doClone ? 1 : 0 ) ;
count + = ( doStrip ? 1 : 0 ) ;
count + = ( ( doCross0 | | doCross1 ) ? 1 : 0 ) ;
if ( count > 1 )
{
2015-01-21 08:34:34 -05:00
cerr < < " Can only specify one of mutate, clone, cross, rotate, strip, or inter. Returning without executing. " < < endl ;
2014-07-08 03:11:14 -04:00
return false ;
}
2015-01-23 21:26:18 -05:00
if ( doCross0 ! = doCross1 ) //Must both be either true or false.
2014-07-08 03:11:14 -04:00
{
2015-01-21 08:34:34 -05:00
cerr < < " Must specify both crossover arguments. Returning without executing. " < < endl ;
2014-07-08 03:11:14 -04:00
return false ;
}
if ( opt . Method ( ) ! = " " & & ( ! doCross0 & & ! doMutate ) )
{
2015-01-21 08:34:34 -05:00
cerr < < " Cannot specify method unless doing crossover or mutate. Returning without executing. " < < endl ;
2014-07-08 03:11:14 -04:00
return false ;
}
if ( opt . TemplateFile ( ) ! = " " )
{
2015-07-06 23:04:38 -04:00
if ( ! ParseEmberFile ( parser , opt . TemplateFile ( ) , templateEmbers , false ) ) //Do not use defaults here to ensure only present fields get used when applying the template.
2014-07-08 03:11:14 -04:00
return false ;
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
if ( templateEmbers . size ( ) > 1 )
2015-01-21 08:34:34 -05:00
cerr < < " More than one control point in template, ignoring all but first. " < < endl ;
2014-07-08 03:11:14 -04:00
pTemplate = & templateEmbers [ 0 ] ;
}
//Methods for genetic manipulation begin here.
if ( doMutate ) filename = opt . Mutate ( ) ;
else if ( doInter ) filename = opt . Inter ( ) ;
else if ( doRotate ) filename = opt . Rotate ( ) ;
else if ( doClone ) filename = opt . Clone ( ) ;
else if ( doStrip ) filename = opt . Strip ( ) ;
else if ( doCross0 ) filename = opt . Cross0 ( ) ;
else if ( opt . CloneAll ( ) ! = " " ) filename = opt . CloneAll ( ) ;
else if ( opt . Animate ( ) ! = " " ) filename = opt . Animate ( ) ;
else if ( opt . Sequence ( ) ! = " " ) filename = opt . Sequence ( ) ;
else if ( opt . Inter ( ) ! = " " ) filename = opt . Inter ( ) ;
else if ( opt . Rotate ( ) ! = " " ) filename = opt . Rotate ( ) ;
else if ( opt . Strip ( ) ! = " " ) filename = opt . Strip ( ) ;
else if ( opt . Clone ( ) ! = " " ) filename = opt . Clone ( ) ;
else if ( opt . Mutate ( ) ! = " " ) filename = opt . Mutate ( ) ;
2014-11-28 04:37:51 -05:00
if ( ParseEmberFile ( parser , filename , embers ) )
{
if ( opt . SubBatchSize ( ) ! = DEFAULT_SBS )
for ( i = 0 ; i < embers . size ( ) ; i + + )
embers [ i ] . m_SubBatchSize = opt . SubBatchSize ( ) ;
}
else
2014-07-08 03:11:14 -04:00
return false ;
2015-01-21 05:51:26 -05:00
if ( doCross1 )
2014-11-28 04:37:51 -05:00
{
2015-01-21 05:51:26 -05:00
if ( ParseEmberFile ( parser , opt . Cross1 ( ) , embers2 ) )
{
if ( opt . SubBatchSize ( ) ! = DEFAULT_SBS )
for ( i = 0 ; i < embers2 . size ( ) ; i + + )
embers2 [ i ] . m_SubBatchSize = opt . SubBatchSize ( ) ;
}
else
return false ;
2014-11-28 04:37:51 -05:00
}
2014-07-08 03:11:14 -04:00
if ( opt . CloneAll ( ) ! = " " )
{
cout < < " <clone_all version= \" Ember- " < < EmberVersion ( ) < < " \" > " < < endl ;
for ( i = 0 ; i < embers . size ( ) ; i + + )
{
if ( pTemplate )
tools . ApplyTemplate ( embers [ i ] , * pTemplate ) ;
2014-12-05 21:30:46 -05:00
2014-12-07 02:51:44 -05:00
tools . Offset ( embers [ i ] , T ( opt . OffsetX ( ) ) , T ( opt . OffsetY ( ) ) ) ;
2014-07-08 03:11:14 -04:00
cout < < emberToXml . ToString ( embers [ i ] , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
}
cout < < " </clone_all> " < < endl ;
return true ;
}
if ( opt . Animate ( ) ! = " " )
{
for ( i = 0 ; i < embers . size ( ) ; i + + )
{
if ( i > 0 & & embers [ i ] . m_Time < = embers [ i - 1 ] . m_Time )
{
2015-01-21 08:34:34 -05:00
cerr < < " Error: control points must be sorted by time, but " < < embers [ i ] . m_Time < < " <= " < < embers [ i - 1 ] . m_Time < < " , index " < < i < < " . " < < endl ;
2014-07-08 03:11:14 -04:00
return false ;
}
embers [ i ] . DeleteMotionElements ( ) ;
}
--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
firstFrame = size_t ( opt . FirstFrame ( ) = = UINT_MAX ? embers [ 0 ] . m_Time : opt . FirstFrame ( ) ) ;
lastFrame = size_t ( opt . LastFrame ( ) = = UINT_MAX ? embers . back ( ) . m_Time : opt . LastFrame ( ) ) ;
2014-07-08 03:11:14 -04:00
if ( lastFrame < firstFrame )
lastFrame = firstFrame ;
cout < < " <animate version= \" EMBER- " < < EmberVersion ( ) < < " \" > " < < endl ;
for ( ftime = firstFrame ; ftime < = lastFrame ; ftime + + )
{
exactTimeMatch = false ;
for ( i = 0 ; i < embers . size ( ) ; i + + )
{
--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
if ( ftime = = size_t ( embers [ i ] . m_Time ) )
2014-07-08 03:11:14 -04:00
{
interpolated = embers [ i ] ;
exactTimeMatch = true ;
break ;
}
}
if ( ! exactTimeMatch )
{
Interpolater < T > : : Interpolate ( embers , T ( ftime ) , T ( opt . Stagger ( ) ) , interpolated ) ;
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
for ( i = 0 ; i < embers . size ( ) ; i + + )
{
--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
if ( ftime = = size_t ( embers [ i ] . m_Time - 1 ) )
2014-07-08 03:11:14 -04:00
{
exactTimeMatch = true ;
break ;
}
}
if ( ! exactTimeMatch )
2015-12-31 19:00:36 -05:00
interpolated . m_AffineInterp = eAffineInterp : : AFFINE_INTERP_LINEAR ;
2014-07-08 03:11:14 -04:00
}
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
if ( pTemplate )
tools . ApplyTemplate ( interpolated , * pTemplate ) ;
cout < < emberToXml . ToString ( interpolated , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
}
cout < < " </animate> " < < endl ;
return true ;
}
if ( opt . Sequence ( ) ! = " " )
{
frame = std : : max ( opt . Frame ( ) , opt . Time ( ) ) ;
if ( opt . Frames ( ) = = 0 )
{
2015-01-21 08:34:34 -05:00
cerr < < " nframes must be positive and non-zero, not " < < opt . Frames ( ) < < " . " < < endl ;
2014-07-08 03:11:14 -04:00
return false ;
}
if ( opt . Enclosed ( ) )
cout < < " <sequence version= \" EMBER- " < < EmberVersion ( ) < < " \" > " < < endl ;
spread = 1 / T ( opt . Frames ( ) ) ;
frameCount = 0 ;
for ( i = 0 ; i < embers . size ( ) ; i + + )
{
2015-07-06 07:06:20 -04:00
if ( opt . Loops ( ) > 0 )
2014-07-08 03:11:14 -04:00
{
2015-07-06 07:06:20 -04:00
for ( frame = 0 ; frame < round ( T ( opt . Frames ( ) ) * opt . Loops ( ) ) ; frame + + )
2014-07-08 03:11:14 -04:00
{
2014-12-07 02:51:44 -05:00
blend = T ( frame ) / T ( opt . Frames ( ) ) ;
2014-07-08 03:11:14 -04:00
tools . Spin ( embers [ i ] , pTemplate , result , frameCount + + , blend ) ; //Result is cleared and reassigned each time inside of Spin().
cout < < emberToXml . ToString ( result , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
}
}
if ( i < embers . size ( ) - 1 )
{
for ( frame = 0 ; frame < opt . Frames ( ) ; frame + + )
{
seqFlag = ( frame = = 0 | | frame = = opt . Frames ( ) - 1 ) ;
2014-12-07 02:51:44 -05:00
blend = frame / T ( opt . Frames ( ) ) ;
2014-07-08 03:11:14 -04:00
result . Clear ( ) ;
--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
tools . SpinInter ( & embers [ i ] , pTemplate , result , frameCount + + , seqFlag , blend ) ;
2014-07-08 03:11:14 -04:00
cout < < emberToXml . ToString ( result , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
}
}
}
result = embers . back ( ) ;
tools . Spin ( embers . back ( ) , pTemplate , result , frameCount , 0 ) ;
cout < < emberToXml . ToString ( result , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
if ( opt . Enclosed ( ) )
cout < < " </sequence> " < < endl ;
return true ;
}
if ( doInter | | doRotate )
{
frame = std : : max ( opt . Frame ( ) , opt . Time ( ) ) ;
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
if ( opt . Frames ( ) = = 0 )
{
2015-01-21 08:34:34 -05:00
cerr < < " nframes must be positive and non-zero, not " < < opt . Frames ( ) < < " . " < < endl ;
2014-07-08 03:11:14 -04:00
return false ;
}
blend = frame / T ( opt . Frames ( ) ) ;
spread = 1 / T ( opt . Frames ( ) ) ;
if ( opt . Enclosed ( ) )
cout < < " <pick version= \" EMBER- " < < EmberVersion ( ) < < " \" > " < < endl ;
if ( doRotate )
{
if ( embers . size ( ) ! = 1 )
{
2015-01-21 08:34:34 -05:00
cerr < < " rotation requires one control point, not " < < embers . size ( ) < < " . " < < endl ;
2014-07-08 03:11:14 -04:00
return false ;
}
tools . Spin ( embers [ 0 ] , pTemplate , result1 , frame - 1 , blend - spread ) ;
tools . Spin ( embers [ 0 ] , pTemplate , result2 , frame , blend ) ;
tools . Spin ( embers [ 0 ] , pTemplate , result3 , frame + 1 , blend + spread ) ;
cout < < emberToXml . ToString ( result1 , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
cout < < emberToXml . ToString ( result2 , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
cout < < emberToXml . ToString ( result3 , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
}
else
{
if ( embers . size ( ) ! = 2 )
{
2015-01-21 08:34:34 -05:00
cerr < < " interpolation requires two control points, not " < < embers . size ( ) < < " . " < < endl ;
2014-07-08 03:11:14 -04:00
return false ;
}
tools . SpinInter ( embers . data ( ) , pTemplate , result1 , frame - 1 , 0 , blend - spread ) ;
tools . SpinInter ( embers . data ( ) , pTemplate , result2 , frame , 0 , blend ) ;
tools . SpinInter ( embers . data ( ) , pTemplate , result3 , frame + 1 , 0 , blend + spread ) ;
cout < < emberToXml . ToString ( result1 , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
cout < < emberToXml . ToString ( result2 , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
cout < < emberToXml . ToString ( result3 , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
}
if ( opt . Enclosed ( ) )
cout < < " </pick> " < < endl ;
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
return true ;
}
if ( doStrip )
{
if ( opt . Enclosed ( ) )
cout < < " <pick version= \" EMBER- " < < EmberVersion ( ) < < " \" > " < < endl ;
for ( i = 0 ; i < embers . size ( ) ; i + + )
{
T oldX , oldY ;
embers [ i ] . DeleteMotionElements ( ) ;
oldX = embers [ i ] . m_CenterX ;
oldY = embers [ i ] . m_CenterY ;
--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
embers [ i ] . m_FinalRasH = size_t ( T ( embers [ i ] . m_FinalRasH ) / T ( opt . Frames ( ) ) ) ;
2014-07-08 03:11:14 -04:00
embers [ i ] . m_CenterY = embers [ i ] . m_CenterY - ( ( opt . Frames ( ) - 1 ) * embers [ i ] . m_FinalRasH ) /
2015-12-31 16:41:59 -05:00
( 2 * embers [ i ] . m_PixelsPerUnit * pow ( T ( 2.0 ) , embers [ i ] . m_Zoom ) ) ;
2014-07-08 03:11:14 -04:00
embers [ i ] . m_CenterY + = embers [ i ] . m_FinalRasH * opt . Frame ( ) / ( embers [ i ] . m_PixelsPerUnit * pow ( T ( 2.0 ) , embers [ i ] . m_Zoom ) ) ;
tools . RotateOldCenterBy ( embers [ i ] . m_CenterX , embers [ i ] . m_CenterY , oldX , oldY , embers [ i ] . m_Rotate ) ;
if ( pTemplate )
tools . ApplyTemplate ( embers [ i ] , * pTemplate ) ;
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
tools . Offset ( embers [ i ] , T ( opt . OffsetX ( ) ) , T ( opt . OffsetY ( ) ) ) ;
cout < < emberToXml . ToString ( embers [ i ] , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
}
if ( opt . Enclosed ( ) )
cout < < " </pick> " < < endl ;
return true ;
}
//Repeat.
renderer - > EarlyClip ( opt . EarlyClip ( ) ) ;
2014-08-06 00:50:52 -04:00
renderer - > YAxisUp ( opt . YAxisUp ( ) ) ;
renderer - > LockAccum ( opt . LockAccum ( ) ) ;
2014-07-08 03:11:14 -04:00
renderer - > PixelAspectRatio ( T ( opt . AspectRatio ( ) ) ) ;
2014-08-06 00:50:52 -04:00
renderer - > Transparency ( opt . Transparency ( ) ) ;
2014-07-08 03:11:14 -04:00
if ( opt . Repeat ( ) = = 0 )
{
2015-01-21 08:34:34 -05:00
cerr < < " Repeat must be positive, not " < < opt . Repeat ( ) < < endl ;
2014-07-08 03:11:14 -04:00
return false ;
}
if ( opt . Enclosed ( ) )
2015-01-23 21:26:18 -05:00
cout < < " <pick version= \" EMBER- " < < EmberVersion ( ) < < " \" > " < < endl ;
2014-07-08 03:11:14 -04:00
for ( rep = 0 ; rep < opt . Repeat ( ) ; rep + + )
{
count = 0 ;
os . str ( " " ) ;
save . Clear ( ) ;
VerbosePrint ( " Flame = " < < rep + 1 < < " / " < < opt . Repeat ( ) < < " .. " ) ;
if ( opt . Clone ( ) ! = " " )
{
os < < " clone " ; //Action is 'clone' with trunc vars concat.
if ( opt . CloneAction ( ) ! = " " )
os < < " " < < opt . CloneAction ( ) ;
selp0 = embers [ rand . Rand ( ) % embers . size ( ) ] ;
save = selp0 ;
aselp0 = & selp0 ;
2014-12-05 21:30:46 -05:00
aselp1 = nullptr ;
2014-07-08 03:11:14 -04:00
os < < tools . TruncateVariations ( save , 5 ) ;
save . m_Edits = emberToXml . CreateNewEditdoc ( aselp0 , aselp1 , os . str ( ) , opt . Nick ( ) , opt . Url ( ) , opt . Id ( ) , opt . Comment ( ) , opt . SheepGen ( ) , opt . SheepId ( ) ) ;
}
else
{
do
{
randomMode = false ;
didColor = false ;
os . str ( " " ) ;
VerbosePrint ( " . " ) ;
if ( doMutate )
{
selp0 = embers [ rand . Rand ( ) % embers . size ( ) ] ;
orig = selp0 ;
aselp0 = & selp0 ;
2014-12-05 21:30:46 -05:00
aselp1 = nullptr ;
2014-07-08 03:11:14 -04:00
if ( opt . Method ( ) = = " " )
2016-01-04 19:50:15 -05:00
mutMeth = eMutateMode : : MUTATE_NOT_SPECIFIED ;
2014-07-08 03:11:14 -04:00
else if ( opt . Method ( ) = = " all_vars " )
2016-01-04 19:50:15 -05:00
mutMeth = eMutateMode : : MUTATE_ALL_VARIATIONS ;
2014-07-08 03:11:14 -04:00
else if ( opt . Method ( ) = = " one_xform " )
2016-01-04 19:50:15 -05:00
mutMeth = eMutateMode : : MUTATE_ONE_XFORM_COEFS ;
2014-07-08 03:11:14 -04:00
else if ( opt . Method ( ) = = " add_symmetry " )
2016-01-04 19:50:15 -05:00
mutMeth = eMutateMode : : MUTATE_ADD_SYMMETRY ;
2014-07-08 03:11:14 -04:00
else if ( opt . Method ( ) = = " post_xforms " )
2016-01-04 19:50:15 -05:00
mutMeth = eMutateMode : : MUTATE_POST_XFORMS ;
2014-07-08 03:11:14 -04:00
else if ( opt . Method ( ) = = " color_palette " )
2016-01-04 19:50:15 -05:00
mutMeth = eMutateMode : : MUTATE_COLOR_PALETTE ;
2014-07-08 03:11:14 -04:00
else if ( opt . Method ( ) = = " delete_xform " )
2016-01-04 19:50:15 -05:00
mutMeth = eMutateMode : : MUTATE_DELETE_XFORM ;
2014-07-08 03:11:14 -04:00
else if ( opt . Method ( ) = = " all_coefs " )
2016-01-04 19:50:15 -05:00
mutMeth = eMutateMode : : MUTATE_ALL_COEFS ;
2014-07-08 03:11:14 -04:00
else
{
2015-01-21 08:34:34 -05:00
cerr < < " method " < < opt . Method ( ) < < " not defined for mutate. Defaulting to random. " < < endl ;
2016-01-04 19:50:15 -05:00
mutMeth = eMutateMode : : MUTATE_NOT_SPECIFIED ;
2014-07-08 03:11:14 -04:00
}
--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
os < < tools . Mutate ( orig , mutMeth , vars , opt . Symmetry ( ) , T ( opt . Speed ( ) ) , MAX_CL_VARS ) ;
2014-07-08 03:11:14 -04:00
//Scan string returned for 'mutate color'.
if ( strstr ( os . str ( ) . c_str ( ) , " mutate color " ) )
didColor = true ;
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
if ( orig . m_Name ! = " " )
{
os2 . str ( " " ) ;
os2 < < " mutation " < < rep < < " of " < < orig . m_Name ;
orig . m_Name = os2 . str ( ) ;
}
}
else if ( doCross0 )
{
i0 = rand . Rand ( ) % embers . size ( ) ;
i1 = rand . Rand ( ) % embers2 . size ( ) ;
selp0 = embers [ i0 ] ;
selp1 = embers2 [ i1 ] ;
aselp0 = & selp0 ;
aselp1 = & selp1 ;
if ( opt . Method ( ) = = " " )
2016-01-04 19:50:15 -05:00
crossMeth = eCrossMode : : CROSS_NOT_SPECIFIED ;
2014-07-08 03:11:14 -04:00
else if ( opt . Method ( ) = = " union " )
2016-01-04 19:50:15 -05:00
crossMeth = eCrossMode : : CROSS_UNION ;
2014-07-08 03:11:14 -04:00
else if ( opt . Method ( ) = = " interpolate " )
2016-01-04 19:50:15 -05:00
crossMeth = eCrossMode : : CROSS_INTERPOLATE ;
2014-07-08 03:11:14 -04:00
else if ( opt . Method ( ) = = " alternate " )
2016-01-04 19:50:15 -05:00
crossMeth = eCrossMode : : CROSS_ALTERNATE ;
2014-07-08 03:11:14 -04:00
else
{
2015-01-21 08:34:34 -05:00
cerr < < " method ' " < < opt . Method ( ) < < " ' not defined for cross. Defaulting to random. " < < endl ;
2016-01-04 19:50:15 -05:00
crossMeth = eCrossMode : : CROSS_NOT_SPECIFIED ;
2014-07-08 03:11:14 -04:00
}
tools . Cross ( embers [ i0 ] , embers2 [ i1 ] , orig , crossMeth ) ;
if ( embers [ i0 ] . m_Name ! = " " | | embers2 [ i1 ] . m_Name ! = " " )
{
os2 . str ( " " ) ;
os2 < < rep < < " of " < < embers [ i0 ] . m_Name < < " x " < < embers2 [ i1 ] . m_Name ;
orig . m_Name = os2 . str ( ) ;
}
}
else
{
os < < " random " ;
randomMode = true ;
--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
tools . Random ( orig , vars , opt . Symmetry ( ) , 0 , MAX_CL_VARS ) ;
2014-12-05 21:30:46 -05:00
aselp0 = nullptr ;
aselp1 = nullptr ;
2014-07-08 03:11:14 -04:00
}
//Adjust bounding box half the time.
if ( rand . RandBit ( ) | | randomMode )
{
T bmin [ 2 ] , bmax [ 2 ] ;
tools . EstimateBoundingBox ( orig , T ( 0.01 ) , 100000 , bmin , bmax ) ;
if ( rand . Frand01 < T > ( ) < T ( 0.3 ) )
{
orig . m_CenterX = ( bmin [ 0 ] + bmax [ 0 ] ) / 2 ;
orig . m_CenterY = ( bmin [ 1 ] + bmax [ 1 ] ) / 2 ;
os < < " recentered " ;
}
else
{
if ( rand . RandBit ( ) )
{
mix0 = rand . GoldenBit < T > ( ) + rand . Frand11 < T > ( ) / 5 ;
mix1 = rand . GoldenBit < T > ( ) ;
os < < " reframed0 " ;
}
else if ( rand . RandBit ( ) )
{
mix0 = rand . GoldenBit < T > ( ) ;
mix1 = rand . GoldenBit < T > ( ) + rand . Frand11 < T > ( ) / 5 ;
os < < " reframed1 " ;
}
else
{
mix0 = rand . GoldenBit < T > ( ) + rand . Frand11 < T > ( ) / 5 ;
mix1 = rand . GoldenBit < T > ( ) + rand . Frand11 < T > ( ) / 5 ;
os < < " reframed2 " ;
}
orig . m_CenterX = mix0 * bmin [ 0 ] + ( 1 - mix0 ) * bmax [ 0 ] ;
orig . m_CenterY = mix1 * bmin [ 1 ] + ( 1 - mix1 ) * bmax [ 1 ] ;
}
orig . m_PixelsPerUnit = orig . m_FinalRasW / ( bmax [ 0 ] - bmin [ 0 ] ) ;
}
os < < tools . TruncateVariations ( orig , 5 ) ;
if ( ! didColor & & rand . RandBit ( ) )
{
if ( opt . Debug ( ) )
2015-01-21 08:34:34 -05:00
cerr < < " improving colors... " < < endl ;
2014-07-08 03:11:14 -04:00
tools . ImproveColors ( orig , 100 , false , 10 ) ;
os < < " improved colors " ;
}
orig . m_Edits = emberToXml . CreateNewEditdoc ( aselp0 , aselp1 , os . str ( ) , opt . Nick ( ) , opt . Url ( ) , opt . Id ( ) , opt . Comment ( ) , opt . SheepGen ( ) , opt . SheepId ( ) ) ;
save = orig ;
SetDefaultTestValues ( orig ) ;
renderer - > SetEmber ( orig ) ;
2015-12-31 19:00:36 -05:00
if ( renderer - > Run ( finalImage ) ! = eRenderStatus : : RENDER_OK )
2014-07-08 03:11:14 -04:00
{
2015-01-21 08:34:34 -05:00
cerr < < " Error: test image rendering failed, aborting. " < < endl ;
2014-07-08 03:11:14 -04:00
return false ;
}
tot = totb = totw = 0 ;
n = orig . m_FinalRasW * orig . m_FinalRasH ;
for ( i = 0 ; i < 3 * n ; i + = 3 )
{
tot + = ( finalImage [ i ] + finalImage [ i + 1 ] + finalImage [ i + 2 ] ) ;
if ( 0 = = finalImage [ i ] & & 0 = = finalImage [ i + 1 ] & & 0 = = finalImage [ i + 2 ] ) totb + + ;
2015-12-31 16:41:59 -05:00
2014-07-08 03:11:14 -04:00
if ( 255 = = finalImage [ i ] & & 255 = = finalImage [ i + 1 ] & & 255 = = finalImage [ i + 2 ] ) totw + + ;
}
avgPix = ( tot / T ( 3 * n ) ) ;
fractionBlack = totb / T ( n ) ;
fractionWhite = totw / T ( n ) ;
if ( opt . Debug ( ) )
2015-01-21 08:34:34 -05:00
cerr < < " avgPix = " < < avgPix < < " fractionBlack = " < < fractionBlack < < " fractionWhite = " < < fractionWhite < < " n = " < < n < < endl ;
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
orig . Clear ( ) ;
count + + ;
2015-12-31 16:41:59 -05:00
}
while ( ( avgPix < opt . AvgThresh ( ) | |
fractionBlack < opt . BlackThresh ( ) | |
fractionWhite > opt . WhiteLimit ( ) ) & &
count < opt . Tries ( ) ) ;
2014-07-08 03:11:14 -04:00
if ( count = = opt . Tries ( ) )
2015-01-21 08:34:34 -05:00
cerr < < " Warning: reached maximum attempts, giving up. " < < endl ;
2014-07-08 03:11:14 -04:00
}
if ( pTemplate )
tools . ApplyTemplate ( save , * pTemplate ) ;
save . m_Time = T ( rep ) ;
2014-12-05 21:30:46 -05:00
2014-07-08 03:11:14 -04:00
if ( opt . MaxXforms ( ) ! = UINT_MAX )
{
save . m_Symmetry = 0 ;
while ( save . TotalXformCount ( ) > opt . MaxXforms ( ) )
save . DeleteTotalXform ( save . TotalXformCount ( ) - 1 ) ;
}
cout < < emberToXml . ToString ( save , opt . Extras ( ) , opt . PrintEditDepth ( ) , ! opt . NoEdits ( ) , false , opt . HexPalette ( ) ) ;
VerbosePrint ( " \n Done. Action = " < < os . str ( ) < < " \n " ) ;
cout . flush ( ) ;
save . Clear ( ) ;
}
if ( opt . Enclosed ( ) )
cout < < " </pick> \n " ;
return true ;
}
/// <summary>
/// Main program entry point for EmberGenome.exe.
/// </summary>
/// <param name="argc">The number of command line arguments passed</param>
/// <param name="argv">The command line arguments passed</param>
/// <returns>0 if successful, else 1.</returns>
int _tmain ( int argc , _TCHAR * argv [ ] )
{
2014-12-05 21:30:46 -05:00
bool b = false ;
2014-07-08 03:11:14 -04:00
EmberOptions opt ;
//Required for large allocs, else GPU memory usage will be severely limited to small sizes.
//This must be done in the application and not in the EmberCL DLL.
2014-12-05 21:30:46 -05:00
# ifdef WIN32
2014-07-08 03:11:14 -04:00
_putenv_s ( " GPU_MAX_ALLOC_PERCENT " , " 100 " ) ;
2014-12-05 21:30:46 -05:00
# else
2014-12-07 02:51:44 -05:00
putenv ( const_cast < char * > ( " GPU_MAX_ALLOC_PERCENT=100 " ) ) ;
2014-12-05 21:30:46 -05:00
# endif
2014-07-08 03:11:14 -04:00
2016-01-04 19:50:15 -05:00
if ( ! opt . Populate ( argc , argv , eOptionUse : : OPT_USE_GENOME ) )
2014-12-05 21:30:46 -05:00
{
2014-07-08 03:11:14 -04:00
# ifdef DO_DOUBLE
2015-12-31 16:41:59 -05:00
2014-12-05 21:30:46 -05:00
if ( opt . Bits ( ) = = 64 )
{
--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
b = EmberGenome < double > ( opt ) ;
2014-12-05 21:30:46 -05:00
}
else
# endif
2015-12-31 16:41:59 -05:00
if ( opt . Bits ( ) = = 33 )
{
b = EmberGenome < float > ( opt ) ;
}
else if ( opt . Bits ( ) = = 32 )
{
cerr < < " Bits 32/int histogram no longer supported. Using bits == 33 (float). " < < endl ;
b = EmberGenome < float > ( opt ) ;
}
2014-07-08 03:11:14 -04:00
}
return b ? 0 : 1 ;
2014-12-05 21:30:46 -05:00
}
