2014-12-08 05:18:16 -05:00
|
|
|
TEMPLATE = 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
|
|
|
CONFIG += plugin
|
2014-12-08 05:18:16 -05:00
|
|
|
CONFIG += shared
|
|
|
|
|
CONFIG -= app_bundle
|
|
|
|
|
CONFIG -= qt
|
|
|
|
|
|
2015-12-08 06:49:19 -05:00
|
|
|
include(../defaults.pri)
|
2014-12-08 05:18:16 -05:00
|
|
|
|
2015-12-08 06:49:19 -05:00
|
|
|
PRJ_DIR = $$SRC_DIR/Ember
|
2014-12-14 23:25:46 -05:00
|
|
|
|
2015-12-08 06:49:19 -05:00
|
|
|
target.path = $$LIB_INSTALL_DIR
|
|
|
|
|
INSTALLS += target
|
|
|
|
|
|
|
|
|
|
!macx:PRECOMPILED_HEADER = $$PRJ_DIR/EmberPch.h
|
|
|
|
|
|
|
|
|
|
QMAKE_CXXFLAGS += -D_USRDLL
|
2014-12-08 05:18:16 -05:00
|
|
|
QMAKE_CXXFLAGS += -D_CONSOLE
|
2015-06-29 23:13:53 -04:00
|
|
|
QMAKE_CXXFLAGS += -BUILDING_EMBER
|
2016-01-12 23:51:13 -05:00
|
|
|
win32: DEFINES += BUILDING_EMBER
|
2014-12-08 05:18:16 -05:00
|
|
|
SOURCES += \
|
2015-12-08 06:49:19 -05:00
|
|
|
$$PRJ_DIR/Affine2D.cpp \
|
|
|
|
|
$$PRJ_DIR/DllMain.cpp \
|
|
|
|
|
$$PRJ_DIR/Ember.cpp \
|
|
|
|
|
$$PRJ_DIR/EmberPch.cpp \
|
|
|
|
|
$$PRJ_DIR/RendererBase.cpp \
|
2016-02-18 21:58:24 -05:00
|
|
|
$$PRJ_DIR/Renderer.cpp \
|
|
|
|
|
$$PRJ_DIR/VariationList.cpp
|
2014-12-08 05:18:16 -05:00
|
|
|
|
|
|
|
|
include(deployment.pri)
|
|
|
|
|
qtcAddDeployment()
|
|
|
|
|
|
|
|
|
|
HEADERS += \
|
2015-12-08 06:49:19 -05:00
|
|
|
$$PRJ_DIR/Affine2D.h \
|
|
|
|
|
$$PRJ_DIR/CarToRas.h \
|
|
|
|
|
$$PRJ_DIR/Curves.h \
|
|
|
|
|
$$PRJ_DIR/DensityFilter.h \
|
|
|
|
|
$$PRJ_DIR/EmberDefines.h \
|
|
|
|
|
$$PRJ_DIR/Ember.h \
|
|
|
|
|
$$PRJ_DIR/EmberMotion.h \
|
|
|
|
|
$$PRJ_DIR/EmberPch.h \
|
|
|
|
|
$$PRJ_DIR/EmberToXml.h \
|
|
|
|
|
$$PRJ_DIR/Interpolate.h \
|
|
|
|
|
$$PRJ_DIR/Isaac.h \
|
|
|
|
|
$$PRJ_DIR/Iterator.h \
|
|
|
|
|
$$PRJ_DIR/Palette.h \
|
|
|
|
|
$$PRJ_DIR/PaletteList.h \
|
|
|
|
|
$$PRJ_DIR/Point.h \
|
|
|
|
|
$$PRJ_DIR/RendererBase.h \
|
|
|
|
|
$$PRJ_DIR/Renderer.h \
|
|
|
|
|
$$PRJ_DIR/SheepTools.h \
|
|
|
|
|
$$PRJ_DIR/SpatialFilter.h \
|
|
|
|
|
$$PRJ_DIR/TemporalFilter.h \
|
|
|
|
|
$$PRJ_DIR/Timing.h \
|
|
|
|
|
$$PRJ_DIR/Utils.h \
|
|
|
|
|
$$PRJ_DIR/Variation.h \
|
|
|
|
|
$$PRJ_DIR/VariationList.h \
|
|
|
|
|
$$PRJ_DIR/Variations01.h \
|
|
|
|
|
$$PRJ_DIR/Variations02.h \
|
|
|
|
|
$$PRJ_DIR/Variations03.h \
|
|
|
|
|
$$PRJ_DIR/Variations04.h \
|
|
|
|
|
$$PRJ_DIR/Variations05.h \
|
|
|
|
|
$$PRJ_DIR/Variations06.h \
|
--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
|
|
|
$$PRJ_DIR/Variations07.h \
|
2015-12-08 06:49:19 -05:00
|
|
|
$$PRJ_DIR/VariationsDC.h \
|
2016-01-02 09:46:34 -05:00
|
|
|
$$PRJ_DIR/VarFuncs.h \
|
2015-12-08 06:49:19 -05:00
|
|
|
$$PRJ_DIR/Xform.h \
|
|
|
|
|
$$PRJ_DIR/XmlToEmber.h
|
2014-12-08 05:18:16 -05:00
|
|
|
|