2017-12-22 00:13:13 -05:00
|
|
|
VERSION = 1.0.0.7
|
2016-01-04 08:45:40 -05:00
|
|
|
win32:CONFIG += skip_target_version_ext
|
--User changes
-Add a palette editor.
-Add support for reading .ugr/.gradient/.gradients palette files.
-Allow toggling on spinners whose minimum value is not zero.
-Allow toggling display of image, affines and grid.
-Add new variations: cylinder2, circlesplit, tile_log, truchet_fill, waves2_radial.
--Bug fixes
-cpow2 was wrong.
-Palettes with rapid changes in color would produce slightly different outputs from Apo/Chaotica. This was due to a long standing bug from flam3.
-Use exec() on Apple and show() on all other OSes for dialog boxes.
-Trying to render a sequence with no frames would crash.
-Selecting multiple xforms and rotating them would produce the wrong rotation.
-Better handling when parsing flames using different encoding, such as unicode and UTF-8.
-Switching between SP/DP didn't reselect the selected flame in the Library tab.
--Code changes
-Make all types concerning palettes be floats, including PaletteTableWidgetItem.
-PaletteTableWidgetItem is no longer templated because all palettes are float.
-Include the source colors for user created gradients.
-Change parallel_for() calls to work with very old versions of TBB which are lingering on some systems.
-Split conditional out of accumulation loop on the CPU for better performance.
-Vectorize summing when doing density filter for better performance.
-Make all usage of palettes be of type float, double is pointless.
-Allow palettes to reside in multiple folders, while ensuring only one of each name is added.
-Refactor some palette path searching code.
-Make ReadFile() throw and catch an exception if the file operation fails.
-A little extra safety in foci and foci3D with a call to Zeps().
-Cast to (real_t) in the OpenCL string for the w variation, which was having trouble compiling on Mac.
-Fixing missing comma between paths in InitPaletteList().
-Move Xml and PaletteList classes into cpp to shorten build times when working on them.
-Remove default param values for IterOpenCLKernelCreator<T>::SharedDataIndexDefines in cpp file.
-Change more NULL to nullptr.
2017-02-26 03:02:21 -05:00
|
|
|
CONFIG += c++14
|
2017-07-22 16:43:35 -04:00
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
#message(PWD: $$absolute_path($$PWD))
|
2015-12-08 06:49:19 -05:00
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
#1) Declare the root of all files in this project, everything else will be
|
|
|
|
|
# defined in terms of this.
|
|
|
|
|
EMBER_ROOT = ./../..
|
2015-12-10 13:03:04 -05:00
|
|
|
|
2016-01-02 09:46:34 -05:00
|
|
|
# When compiling from project root
|
|
|
|
|
autobuild {
|
--User changes
-Allow for pausing the renderer in the main window. This makes is more efficient when entering many parameters, such as when following a tutorial.
-Add support for new variations: erf, gamma, jac_cn, jac_dn, jac_sn, logDB, pressure_wave, pRose3D, splits3D, w, waves2b, x, xerf, y, z.
-Inform user of the start and stop of file parsing in EmberAnimate because the files could potentially be very large.
-Move the follwing fields to a new table called Animation: Interpolation, Affine Interpolation, Temporal Samples, Temporal Filter Width, Temporal Filter Type.
-These currently have no effect on the interactive renderer and instead are used when running flames through EmberGenome to generate sequences, and then animating them in Fractorium or EmberAnimate.
-Add new parameter overrides for EmberRender and EmberAnimate which directly assign values to all flames being rendered, rather than scale:
--quality
--demin
--demax
--Bug fixes
-Left pad instead of right pad names of sequence outputs from EmberGenome.
-Unique file naming was broken for files which already had an underscore in them.
-Properly report that png is the default format of EmberRender and EmberAnimate output instead of erroneously claiming it was jpg.
-Make command line programs search these folders in this order for the palette file:
./
~/.fractorium
~/.config/fractorium
/usr/share/fractorium
/usr/local/share/fractorium
-Fix possible bad values in hexes.
-Better assignment of Z variables.
-Fix boarders due to use of poorly implemented rint() function from flam3. Use std::rint() now.
-wedge_sph was completely wrong due to having accidentally swapped the mapping of two parameters.
-Make juliascope juliascope_power parameter be of type REAL_NONZERO since it's used as a denominator.
-Make Z assignment compatible with the originals in:
-arch, bcircle, bCollide, bent, bent2, bisplit, blob, blur_linear, blur_square, bMod, boarders, boarders2, bSwirl, bTransform, butterfly, cardioid, cell, circleblur, circlize, circlize2, circus, collideoscope, cos, cosine, cosh, coth, cpow, cpow2, crescents, cropn, csc, csch, curl, curve, dc_gridout, deltaa, diamond, disc2, eclipse, eCollide, edisc, eJulia, elliptic, eMod, eMotion, ennepers, epispiral, ePush, eRotate, eScale, eSwirl, ex, exp, expo, exponential, fan, fdisc, fibonacci, fibonacci2, fisheye, flipcircle, flipy, flower, flux, funnel, glynnia, GlynnSim1, GlynnSim2, GlynnSim3, gridout, handkerchief, heart, hole, idisc, julia, julian2, juliaNab, kaleidoscope, lazyTravis, Lissajous, mask, MobiusN, mobius_strip, modulus, murl, murl2, npolar, ortho, oscilloscope, parabola, perspective, petal, phoenix_julia, pie (was also inconsistent between cpu and gpu), poincare, popcorn, popcorn2, power, pow_block, rational3, rays, rblur, rings, rippled, roundspher, sec, secant2, sigmoid, sin, sineblur, sinh, sinusgrid, sphericaln, spiralwing, spirograph, split, squarize, squirrel, squish, sschecks, starblur, stripes, stwin, super_shape, tan, tancos, tangent, tanh, TwinTrian, twoface, unpolar, waves, wavesn, wedge_julia, whorl, xheart, zblur, zscale.
--Code changes
-Generalize Variation::PrecalcHelper() and rename to PrePostPrecalcHelper().
--Do the same for the OpenCL version and rename it PrePostPrecalcOpenCLString().
-Rename Variation::m_AssignType to m_PrePostAssignType since it's only relevant to pre/post variations.
2016-01-29 20:02:15 -05:00
|
|
|
# EMBER_ROOT = $$(PWD)/../..
|
2016-01-02 09:46:34 -05:00
|
|
|
}
|
|
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
#2) Declare where dependency folders are.
|
|
|
|
|
# Point to local copy of OpenCL includes to ensure we have the right ones.
|
|
|
|
|
LOCAL_INCLUDE_DIR = $$absolute_path($$EMBER_ROOT/Builds/include/vendor)
|
|
|
|
|
# Parent folders for third party dependencies and their compiled outputs.
|
|
|
|
|
win32: {
|
|
|
|
|
EXTERNAL_DIR = $$absolute_path($$EMBER_ROOT/..)
|
|
|
|
|
EXTERNAL_LIB = $$absolute_path($$EMBER_ROOT/Deps)
|
2016-01-04 08:45:40 -05:00
|
|
|
}
|
|
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
#3) Declare where our source, data and resource files are.
|
2015-12-31 16:55:24 -05:00
|
|
|
SRC_DIR = $$EMBER_ROOT/Source
|
2016-03-01 20:26:45 -05:00
|
|
|
SRC_COMMON_DIR = $$absolute_path($$EMBER_ROOT/Source/EmberCommon)
|
|
|
|
|
ASSETS_DIR = $$absolute_path($$EMBER_ROOT/Data)
|
|
|
|
|
QTCREATOR_DIR = $$absolute_path($$EMBER_ROOT/Builds/QtCreator)
|
2017-12-22 20:22:54 -05:00
|
|
|
win32:RCPATH=$$absolute_path($$QTCREATOR_DIR/../MSVC/VS2017)
|
2016-03-01 20:26:45 -05:00
|
|
|
|
|
|
|
|
#4) Add up all include paths.
|
|
|
|
|
INCLUDEPATH += $$LOCAL_INCLUDE_DIR
|
|
|
|
|
INCLUDEPATH += $$absolute_path($$SRC_DIR/Ember)
|
|
|
|
|
INCLUDEPATH += $$absolute_path($$SRC_DIR/EmberCL)
|
|
|
|
|
INCLUDEPATH += $$absolute_path($$SRC_DIR/EmberCommon)
|
2015-12-31 16:55:24 -05:00
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
win32 {
|
|
|
|
|
INCLUDEPATH += $$EXTERNAL_DIR/glm
|
|
|
|
|
INCLUDEPATH += $$EXTERNAL_DIR/libjpeg
|
|
|
|
|
INCLUDEPATH += $$EXTERNAL_DIR/libpng
|
|
|
|
|
INCLUDEPATH += $$EXTERNAL_DIR/libxml2/include
|
|
|
|
|
INCLUDEPATH += $$EXTERNAL_DIR/tbb/include
|
|
|
|
|
INCLUDEPATH += $$EXTERNAL_DIR/zlib
|
2017-07-22 16:43:35 -04:00
|
|
|
INCLUDEPATH += $$absolute_path($$EXTERNAL_LIB)/include/OpenEXR
|
2016-01-04 08:45:40 -05:00
|
|
|
}
|
2016-03-01 20:26:45 -05:00
|
|
|
|
|
|
|
|
!win32 {
|
|
|
|
|
#If your global includes are stored elsewhere, add them here.
|
|
|
|
|
INCLUDEPATH += /usr/include
|
|
|
|
|
INCLUDEPATH += /usr/local/include
|
|
|
|
|
INCLUDEPATH += /usr/include/GL
|
|
|
|
|
INCLUDEPATH += /usr/local/include/GL
|
|
|
|
|
INCLUDEPATH += /usr/include/glm
|
|
|
|
|
INCLUDEPATH += /usr/include/tbb
|
2017-07-22 16:43:35 -04:00
|
|
|
INCLUDEPATH += /usr/include/OpenEXR
|
2017-03-12 21:34:45 -04:00
|
|
|
|
|
|
|
|
unix:!macx {
|
|
|
|
|
INCLUDEPATH += /usr/include/libxml2
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
INCLUDEPATH += /usr/local/opt/libxml2/include/libxml2
|
|
|
|
|
}
|
--User changes
-Add a palette editor.
-Add support for reading .ugr/.gradient/.gradients palette files.
-Allow toggling on spinners whose minimum value is not zero.
-Allow toggling display of image, affines and grid.
-Add new variations: cylinder2, circlesplit, tile_log, truchet_fill, waves2_radial.
--Bug fixes
-cpow2 was wrong.
-Palettes with rapid changes in color would produce slightly different outputs from Apo/Chaotica. This was due to a long standing bug from flam3.
-Use exec() on Apple and show() on all other OSes for dialog boxes.
-Trying to render a sequence with no frames would crash.
-Selecting multiple xforms and rotating them would produce the wrong rotation.
-Better handling when parsing flames using different encoding, such as unicode and UTF-8.
-Switching between SP/DP didn't reselect the selected flame in the Library tab.
--Code changes
-Make all types concerning palettes be floats, including PaletteTableWidgetItem.
-PaletteTableWidgetItem is no longer templated because all palettes are float.
-Include the source colors for user created gradients.
-Change parallel_for() calls to work with very old versions of TBB which are lingering on some systems.
-Split conditional out of accumulation loop on the CPU for better performance.
-Vectorize summing when doing density filter for better performance.
-Make all usage of palettes be of type float, double is pointless.
-Allow palettes to reside in multiple folders, while ensuring only one of each name is added.
-Refactor some palette path searching code.
-Make ReadFile() throw and catch an exception if the file operation fails.
-A little extra safety in foci and foci3D with a call to Zeps().
-Cast to (real_t) in the OpenCL string for the w variation, which was having trouble compiling on Mac.
-Fixing missing comma between paths in InitPaletteList().
-Move Xml and PaletteList classes into cpp to shorten build times when working on them.
-Remove default param values for IterOpenCLKernelCreator<T>::SharedDataIndexDefines in cpp file.
-Change more NULL to nullptr.
2017-02-26 03:02:21 -05:00
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
#libjpeg and libpng aren't in separate folders, so nothing to add here for them.
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-02 22:17:37 -05:00
|
|
|
#5) Add up all library paths. Ember and EmberCL don't need libjpeb, libpng or zlib and
|
|
|
|
|
# Ember doesn't need OpenCL. But just place them all here in the common file for ease of maintenance.
|
|
|
|
|
# Unneeded libs will just be ignored.
|
2016-03-01 20:26:45 -05:00
|
|
|
win32 {
|
|
|
|
|
LIBS = ""
|
|
|
|
|
LIBS += OpenGL32.lib
|
|
|
|
|
LIBS += WS2_32.lib
|
2016-12-05 22:04:33 -05:00
|
|
|
_AMDAPPSDK = $$(AMDAPPSDKROOT)
|
|
|
|
|
|
|
|
|
|
isEmpty(_AMDAPPSDK) {
|
|
|
|
|
LIBS += $$(CUDA_PATH)/lib/x64/OpenCL.lib
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
LIBS += $$(AMDAPPSDKROOT)/lib/x86_64/OpenCL.lib
|
|
|
|
|
}
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/libjpeg.lib
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/libpng.lib
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/libxml2.lib
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/tbb.lib
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/zlib.lib
|
2017-07-22 16:43:35 -04:00
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/Half.lib
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/Iex.lib
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/IlmImf.lib
|
--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
|
|
|
}
|
|
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
!win32 {
|
2016-03-02 22:17:37 -05:00
|
|
|
LIBS += -ljpeg
|
|
|
|
|
LIBS += -lpng
|
|
|
|
|
LIBS += -ltbb
|
|
|
|
|
LIBS += -lpthread
|
2017-07-22 16:43:35 -04:00
|
|
|
LIBS += -lHalf
|
|
|
|
|
LIBS += -lIex
|
|
|
|
|
LIBS += -lIlmImf
|
2017-03-12 21:34:45 -04:00
|
|
|
|
|
|
|
|
unix:!macx {
|
|
|
|
|
LIBS += -lxml2
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
LIBS += -L/usr/local/opt/libxml2/lib -lxml2
|
|
|
|
|
}
|
--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
|
|
|
}
|
|
|
|
|
|
2015-01-26 12:23:41 -05:00
|
|
|
macx {
|
2016-03-01 20:26:45 -05:00
|
|
|
LIBS += -framework OpenGL
|
|
|
|
|
LIBS += -framework OpenCL
|
|
|
|
|
LIBS += -L/usr/local/lib# homebrew installs into /usr/local
|
|
|
|
|
}
|
2015-01-26 12:23:41 -05:00
|
|
|
|
--User changes
-Add a palette editor.
-Add support for reading .ugr/.gradient/.gradients palette files.
-Allow toggling on spinners whose minimum value is not zero.
-Allow toggling display of image, affines and grid.
-Add new variations: cylinder2, circlesplit, tile_log, truchet_fill, waves2_radial.
--Bug fixes
-cpow2 was wrong.
-Palettes with rapid changes in color would produce slightly different outputs from Apo/Chaotica. This was due to a long standing bug from flam3.
-Use exec() on Apple and show() on all other OSes for dialog boxes.
-Trying to render a sequence with no frames would crash.
-Selecting multiple xforms and rotating them would produce the wrong rotation.
-Better handling when parsing flames using different encoding, such as unicode and UTF-8.
-Switching between SP/DP didn't reselect the selected flame in the Library tab.
--Code changes
-Make all types concerning palettes be floats, including PaletteTableWidgetItem.
-PaletteTableWidgetItem is no longer templated because all palettes are float.
-Include the source colors for user created gradients.
-Change parallel_for() calls to work with very old versions of TBB which are lingering on some systems.
-Split conditional out of accumulation loop on the CPU for better performance.
-Vectorize summing when doing density filter for better performance.
-Make all usage of palettes be of type float, double is pointless.
-Allow palettes to reside in multiple folders, while ensuring only one of each name is added.
-Refactor some palette path searching code.
-Make ReadFile() throw and catch an exception if the file operation fails.
-A little extra safety in foci and foci3D with a call to Zeps().
-Cast to (real_t) in the OpenCL string for the w variation, which was having trouble compiling on Mac.
-Fixing missing comma between paths in InitPaletteList().
-Move Xml and PaletteList classes into cpp to shorten build times when working on them.
-Remove default param values for IterOpenCLKernelCreator<T>::SharedDataIndexDefines in cpp file.
-Change more NULL to nullptr.
2017-02-26 03:02:21 -05:00
|
|
|
unix:!macx {
|
2016-03-01 20:26:45 -05:00
|
|
|
LIBS += -lGL
|
|
|
|
|
LIBS += -lOpenCL
|
2015-12-15 11:22:51 -05:00
|
|
|
}
|
|
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
#6) Declare intermediate paths.
|
2015-12-15 11:22:51 -05:00
|
|
|
|
2015-01-26 12:17:51 -05:00
|
|
|
|
2016-01-04 08:45:40 -05:00
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
#7) Declare output paths for each configuration.
|
|
|
|
|
CONFIG(release, debug|release) {
|
|
|
|
|
CONFIG += warn_off
|
|
|
|
|
DESTDIR = $$absolute_path($$EMBER_ROOT/Bin/release)
|
2016-01-04 08:45:40 -05:00
|
|
|
}
|
2016-03-01 20:26:45 -05:00
|
|
|
|
|
|
|
|
CONFIG(debug, debug|release) {
|
|
|
|
|
DESTDIR = $$absolute_path($$EMBER_ROOT/Bin/debug)
|
2015-01-26 12:50:41 -05:00
|
|
|
}
|
|
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
#8) Set compiler options.
|
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += -O2
|
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += -DNDEBUG
|
|
|
|
|
QMAKE_CXXFLAGS += -D_M_X64
|
|
|
|
|
QMAKE_CXXFLAGS += -D_CONSOLE
|
|
|
|
|
QMAKE_CXXFLAGS += -D_USRDLL
|
2015-01-26 12:17:51 -05:00
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
win32 {
|
|
|
|
|
QMAKE_CXXFLAGS += -bigobj #Allow for very large object files.
|
|
|
|
|
QMAKE_CXXFLAGS += /MP #Enable multi-processor compilation.
|
|
|
|
|
QMAKE_CXXFLAGS += /Zc:wchar_t #Treat wchar_t as builtin type (we don't use wchar_t anyway).
|
|
|
|
|
QMAKE_CXXFLAGS += /Zi #Debug information format: program database.
|
|
|
|
|
QMAKE_CXXFLAGS += /Gm- #Disable minimal rebuild, needed to allow /MP.
|
|
|
|
|
QMAKE_CXXFLAGS += /fp:precise #Precise floating point model.
|
|
|
|
|
QMAKE_CXXFLAGS += /fp:except- #Disable floating point exceptions.
|
|
|
|
|
QMAKE_CXXFLAGS += /D "WIN32"
|
|
|
|
|
QMAKE_CXXFLAGS += /D "_WINDOWS"
|
|
|
|
|
QMAKE_CXXFLAGS += /D "_USRDLL"
|
|
|
|
|
QMAKE_CXXFLAGS += /D "_WINDLL" #Build as a DLL.
|
|
|
|
|
QMAKE_CXXFLAGS += /D "_MBCS" #Use multi-byte character set.
|
|
|
|
|
QMAKE_CXXFLAGS += /errorReport:prompt #Internal compiler error reporting, prompt immediately.
|
|
|
|
|
QMAKE_CXXFLAGS += /GF #Enable string pooling.
|
|
|
|
|
QMAKE_CXXFLAGS += /WX- #Don't treat warnings as errors.
|
|
|
|
|
QMAKE_CXXFLAGS += /Zc:forScope #Force conformance in for loop scope.
|
|
|
|
|
QMAKE_CXXFLAGS += /Gd #Calling convention: __cdecl.
|
|
|
|
|
QMAKE_CXXFLAGS += /EHsc #Enable C++ exceptions.
|
|
|
|
|
QMAKE_CXXFLAGS += /nologo #Suppress compiler startup banner.
|
|
|
|
|
|
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += /GS- #Disable security check.
|
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += /MD #Link to multi-threaded DLL.
|
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += /Gy #Enable function level linking.
|
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += /O2 #Maximize speed.
|
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += /Ot #Favor fast code.
|
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += /D "NDEBUG" #Release mode.
|
|
|
|
|
|
|
|
|
|
QMAKE_CXXFLAGS_DEBUG += /W3 #Error warning level to 3.
|
|
|
|
|
QMAKE_CXXFLAGS_DEBUG += /GS #Enable security check.
|
|
|
|
|
QMAKE_CXXFLAGS_DEBUG += /MDd #Link to multi-threaded debug DLL.
|
|
|
|
|
QMAKE_CXXFLAGS_DEBUG += /Od #Optimization disabled.
|
|
|
|
|
QMAKE_CXXFLAGS_DEBUG += /D "_DEBUG" #Debug mode.
|
|
|
|
|
QMAKE_CXXFLAGS_DEBUG += /RTC1 #Basic runtime checks: stack frames and uninitialized variables.
|
--User changes
-Add a palette editor.
-Add support for reading .ugr/.gradient/.gradients palette files.
-Allow toggling on spinners whose minimum value is not zero.
-Allow toggling display of image, affines and grid.
-Add new variations: cylinder2, circlesplit, tile_log, truchet_fill, waves2_radial.
--Bug fixes
-cpow2 was wrong.
-Palettes with rapid changes in color would produce slightly different outputs from Apo/Chaotica. This was due to a long standing bug from flam3.
-Use exec() on Apple and show() on all other OSes for dialog boxes.
-Trying to render a sequence with no frames would crash.
-Selecting multiple xforms and rotating them would produce the wrong rotation.
-Better handling when parsing flames using different encoding, such as unicode and UTF-8.
-Switching between SP/DP didn't reselect the selected flame in the Library tab.
--Code changes
-Make all types concerning palettes be floats, including PaletteTableWidgetItem.
-PaletteTableWidgetItem is no longer templated because all palettes are float.
-Include the source colors for user created gradients.
-Change parallel_for() calls to work with very old versions of TBB which are lingering on some systems.
-Split conditional out of accumulation loop on the CPU for better performance.
-Vectorize summing when doing density filter for better performance.
-Make all usage of palettes be of type float, double is pointless.
-Allow palettes to reside in multiple folders, while ensuring only one of each name is added.
-Refactor some palette path searching code.
-Make ReadFile() throw and catch an exception if the file operation fails.
-A little extra safety in foci and foci3D with a call to Zeps().
-Cast to (real_t) in the OpenCL string for the w variation, which was having trouble compiling on Mac.
-Fixing missing comma between paths in InitPaletteList().
-Move Xml and PaletteList classes into cpp to shorten build times when working on them.
-Remove default param values for IterOpenCLKernelCreator<T>::SharedDataIndexDefines in cpp file.
-Change more NULL to nullptr.
2017-02-26 03:02:21 -05:00
|
|
|
QMAKE_CXXFLAGS_DEBUG += /Ob2 #Inline function expansion: any suitable.
|
2016-03-01 20:26:45 -05:00
|
|
|
}
|
2015-01-26 12:17:51 -05:00
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
!win32 {
|
|
|
|
|
native {
|
|
|
|
|
QMAKE_CXXFLAGS += -march=native
|
|
|
|
|
} else {
|
|
|
|
|
QMAKE_CXXFLAGS += -march=k8
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CMAKE_CXXFLAGS += -DCL_USE_DEPRECATED_OPENCL_1_1_APIS # Not sure if this is needed. We remove it if all systems we build on support 1.2.
|
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += -fomit-frame-pointer
|
|
|
|
|
QMAKE_CXXFLAGS += -fPIC
|
|
|
|
|
QMAKE_CXXFLAGS += -fpermissive
|
|
|
|
|
QMAKE_CXXFLAGS += -pedantic
|
2016-04-03 21:55:12 -04:00
|
|
|
QMAKE_CXXFLAGS += -std=c++14
|
2016-03-01 20:26:45 -05:00
|
|
|
QMAKE_CXXFLAGS += -Wnon-virtual-dtor
|
|
|
|
|
QMAKE_CXXFLAGS += -Wshadow
|
|
|
|
|
QMAKE_CXXFLAGS += -Winit-self
|
|
|
|
|
QMAKE_CXXFLAGS += -Wredundant-decls
|
|
|
|
|
QMAKE_CXXFLAGS += -Wcast-align
|
|
|
|
|
QMAKE_CXXFLAGS += -Winline
|
|
|
|
|
QMAKE_CXXFLAGS += -Wunreachable-code
|
|
|
|
|
QMAKE_CXXFLAGS += -Wswitch-enum
|
|
|
|
|
QMAKE_CXXFLAGS += -Wswitch-default
|
|
|
|
|
QMAKE_CXXFLAGS += -Wmain
|
|
|
|
|
QMAKE_CXXFLAGS += -Wfatal-errors
|
|
|
|
|
QMAKE_CXXFLAGS += -Wall -fpermissive
|
|
|
|
|
QMAKE_CXXFLAGS += -Wold-style-cast
|
|
|
|
|
QMAKE_CXXFLAGS += -Wno-unused-parameter
|
|
|
|
|
QMAKE_CXXFLAGS += -Wno-unused-function
|
|
|
|
|
QMAKE_CXXFLAGS += -Wold-style-cast
|
|
|
|
|
|
|
|
|
|
QMAKE_CXXFLAGS_DEBUG += -Wmissing-include-dirs
|
|
|
|
|
QMAKE_CXXFLAGS_DEBUG += -Wzero-as-null-pointer-constant
|
2015-12-15 11:22:51 -05:00
|
|
|
# NOTE: last path will be the first to search. gcc -I and -L appends to the
|
|
|
|
|
# beginning of the path list.
|
|
|
|
|
|
|
|
|
|
# NOTE: qmake will resolve symlinks. If /usr/local/include/CL is a symlink to
|
|
|
|
|
# /usr/include/nvidia-352/CL, qmake will generate Makefiles using the latter.
|
2016-03-01 20:26:45 -05:00
|
|
|
}
|
2015-12-15 11:22:51 -05:00
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
macx {
|
|
|
|
|
QMAKE_MAC_SDK = macosx10.11
|
|
|
|
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
|
|
|
|
|
QMAKE_CXXFLAGS += -mmacosx-version-min=10.9 -arch x86_64
|
|
|
|
|
QMAKE_CXXFLAGS += -stdlib=libc++
|
2016-01-04 08:45:40 -05:00
|
|
|
}
|
|
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
unix {
|
|
|
|
|
CONFIG += precompile_header
|
|
|
|
|
QMAKE_LFLAGS_RELEASE += -s
|
|
|
|
|
}
|
2015-12-16 09:54:14 -05:00
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
#9) Declare !win32 install dirs.
|
|
|
|
|
win32 {#For Windows, the install folder is just the output folder.
|
|
|
|
|
LIB_INSTALL_DIR = $$DESTDIR
|
|
|
|
|
BIN_INSTALL_DIR = $$DESTDIR
|
|
|
|
|
SHARE_INSTALL_DIR = $$DESTDIR
|
|
|
|
|
LAUNCHER_INSTALL_DIR = $$DESTDIR
|
|
|
|
|
}
|
2015-12-15 11:22:51 -05:00
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
!win32 {
|
|
|
|
|
LIB_INSTALL_DIR = /usr/lib
|
|
|
|
|
BIN_INSTALL_DIR = /usr/bin
|
|
|
|
|
SHARE_INSTALL_DIR = /usr/share/fractorium
|
|
|
|
|
LAUNCHER_INSTALL_DIR = /usr/share/applications
|
2016-01-04 08:45:40 -05:00
|
|
|
}
|
2016-03-01 20:26:45 -05:00
|
|
|
|
|
|
|
|
#10) Add third party libraries to install dir.
|
2016-01-04 08:45:40 -05:00
|
|
|
win32 {
|
2016-03-01 20:26:45 -05:00
|
|
|
libxml.path = $$BIN_INSTALL_DIR
|
|
|
|
|
libxml.files = $$absolute_path($$EMBER_ROOT/Deps/libxml2.dll)
|
|
|
|
|
INSTALLS += libxml
|
|
|
|
|
|
|
|
|
|
tbb.path = $$BIN_INSTALL_DIR
|
|
|
|
|
tbb.files = $$absolute_path($$EMBER_ROOT/Deps/tbb.dll)
|
|
|
|
|
INSTALLS += tbb
|
2017-07-22 16:43:35 -04:00
|
|
|
|
|
|
|
|
half.path = $$BIN_INSTALL_DIR
|
|
|
|
|
half.files = $$absolute_path($$EMBER_ROOT/Deps/Half.dll)
|
|
|
|
|
INSTALLS += half
|
|
|
|
|
|
|
|
|
|
iex.path = $$BIN_INSTALL_DIR
|
|
|
|
|
iex.files = $$absolute_path($$EMBER_ROOT/Deps/Iex-2_2.dll)
|
|
|
|
|
INSTALLS += iex
|
|
|
|
|
|
|
|
|
|
imath.path = $$BIN_INSTALL_DIR
|
|
|
|
|
imath.files = $$absolute_path($$EMBER_ROOT/Deps/Imath-2_2.dll)
|
|
|
|
|
INSTALLS += imath
|
|
|
|
|
|
|
|
|
|
ilmthread.path = $$BIN_INSTALL_DIR
|
|
|
|
|
ilmthread.files = $$absolute_path($$EMBER_ROOT/Deps/IlmThread-2_2.dll)
|
|
|
|
|
INSTALLS += ilmthread
|
|
|
|
|
|
|
|
|
|
ilmimf.path = $$BIN_INSTALL_DIR
|
|
|
|
|
ilmimf.files = $$absolute_path($$EMBER_ROOT/Deps/IlmImf-2_2.dll)
|
|
|
|
|
INSTALLS += ilmimf
|
2016-03-01 20:26:45 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#11) Print values of relevant variables for debugging.
|
|
|
|
|
#message(CONFIG: $(CONFIG))
|
|
|
|
|
#message(EMBER_ROOT: $$absolute_path($$EMBER_ROOT))
|
|
|
|
|
#message(EXTERNAL_DIR: $$absolute_path($$EXTERNAL_DIR))
|
|
|
|
|
#message(EXTERNAL_LIB: $$absolute_path($$EXTERNAL_LIB))
|
|
|
|
|
#message(SRC_DIR: $$absolute_path($$SRC_DIR))
|
|
|
|
|
#message(SRC_COMMON_DIR: $$SRC_COMMON_DIR)
|
|
|
|
|
#message(ASSETS_DIR: $$absolute_path($$ASSETS_DIR))
|
|
|
|
|
#message(LOCAL_INCLUDE_DIR: $$absolute_path($$LOCAL_INCLUDE_DIR))
|
|
|
|
|
#message(QTCREATOR_DIR: $$absolute_path($$QTCREATOR_DIR))
|
|
|
|
|
#message(LIBS: $$absolute_path($$LIBS))
|
|
|
|
|
#message(DESTDIR: $$absolute_path($$DESTDIR))
|
|
|
|
|
#message(DEPENDPATH: $$absolute_path($$DEPENDPATH))
|
|
|
|
|
#message(AMDAPPSDKROOT: $$(AMDAPPSDKROOT))
|
|
|
|
|
#message(CUDA_PATH: $$(CUDA_PATH))
|
2015-01-26 12:17:51 -05:00
|
|
|
|
2016-03-01 20:26:45 -05:00
|
|
|
win32 {
|
|
|
|
|
#message(RCPATH: $$RCPATH)
|
2016-01-04 08:45:40 -05:00
|
|
|
}
|
2016-03-01 20:26:45 -05:00
|
|
|
|
|
|
|
|
#message(LIB_INSTALL_DIR: $$absolute_path($$LIB_INSTALL_DIR))
|
|
|
|
|
#message(BIN_INSTALL_DIR: $$absolute_path($$BIN_INSTALL_DIR))
|
|
|
|
|
#message(SHARE_INSTALL_DIR: $$absolute_path($$SHARE_INSTALL_DIR))
|
|
|
|
|
#message(LAUNCHER_INSTALL_DIR: $$absolute_path($$LAUNCHER_INSTALL_DIR))
|