2015-12-08 06:49:19 -05:00
|
|
|
VERSION = 0.9.9.2
|
2016-01-04 08:45:40 -05:00
|
|
|
win32:CONFIG += skip_target_version_ext
|
2016-01-02 09:46:34 -05:00
|
|
|
message(PWD: $$(PWD))
|
2015-12-08 06:49:19 -05:00
|
|
|
|
2015-12-10 13:03:04 -05:00
|
|
|
# TODO: win32 install dirs?
|
|
|
|
|
|
|
|
|
|
unix|macx {
|
|
|
|
|
LIB_INSTALL_DIR = /usr/lib
|
|
|
|
|
BIN_INSTALL_DIR = /usr/bin
|
|
|
|
|
SHARE_INSTALL_DIR = /usr/share/fractorium
|
|
|
|
|
}
|
--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-01-02 09:46:34 -05:00
|
|
|
# When loaded by QtCreator
|
|
|
|
|
EMBER_ROOT = $$(PWD)/../../..
|
|
|
|
|
|
|
|
|
|
# When compiling from project root
|
|
|
|
|
autobuild {
|
|
|
|
|
EMBER_ROOT = $$(PWD)/../..
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-04 08:45:40 -05:00
|
|
|
win32:{
|
|
|
|
|
EMBER_ROOT = $$(PWD)../../..
|
|
|
|
|
EXTERNAL_DIR = $$(PWD)../../../../External
|
|
|
|
|
EXTERNAL_LIB = $$(PWD)../../../External/libs
|
|
|
|
|
# EXTERNAL_DIR which contains Third Party Codes is in the parent folder of "fractorium"
|
|
|
|
|
# EXTERNAL_LIB is in EXTERNAL_DIR actually, but it is strange that EXTERNAL_DIR must go
|
|
|
|
|
# one more step upper than EXTERNAL_LIB to get it work
|
|
|
|
|
LIB_INSTALL_DIR = $$(PWD)../../../Install/lib
|
|
|
|
|
BIN_INSTALL_DIR = $$(PWD)../../../Install/bin
|
|
|
|
|
SHARE_INSTALL_DIR = $$(PWD)../../../Install/share/fractorium
|
|
|
|
|
# INSTALL_DIRs Don't work?
|
|
|
|
|
message(EMBER_ROOT: $$absolute_path($$EMBER_ROOT))
|
|
|
|
|
message(EXTERNAL: $$absolute_path($$EXTERNAL_DIR))
|
|
|
|
|
message(EXTERNAL_LIB:$$absolute_path($$EXTERNAL_LIB) )
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-02 09:46:34 -05:00
|
|
|
message(EMBER_ROOT: $$EMBER_ROOT)
|
|
|
|
|
|
2015-12-31 16:55:24 -05:00
|
|
|
SRC_DIR = $$EMBER_ROOT/Source
|
|
|
|
|
SRC_COMMON_DIR = $$EMBER_ROOT/Source/EmberCommon
|
|
|
|
|
ASSETS_DIR = $$EMBER_ROOT/Data
|
|
|
|
|
LOCAL_LIB_DIR = $$(PWD)/../../lib
|
|
|
|
|
LOCAL_INCLUDE_DIR = $$(PWD)/../../include
|
|
|
|
|
|
2016-01-04 08:45:40 -05:00
|
|
|
win32:{
|
|
|
|
|
LOCAL_LIB_DIR = $$(PWD)../../lib
|
|
|
|
|
LOCAL_INCLUDE_DIR = $$(PWD)../../include
|
|
|
|
|
}
|
--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(release, debug|release) {
|
2015-12-08 06:49:19 -05:00
|
|
|
CONFIG += warn_off
|
|
|
|
|
DESTDIR = $$(PWD)/../../../Bin/release
|
2016-01-04 08:45:40 -05:00
|
|
|
win32:DESTDIR = $$(PWD)../../../Bin/release
|
--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(debug, debug|release) {
|
2015-12-08 06:49:19 -05:00
|
|
|
DESTDIR = $$(PWD)/../../../Bin/debug
|
2016-01-04 08:45:40 -05:00
|
|
|
win32:DESTDIR = $$(PWD)../../../Bin/debug
|
--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 {
|
|
|
|
|
LIBS += -framework OpenGL
|
|
|
|
|
LIBS += -framework OpenCL
|
2015-01-26 12:17:51 -05:00
|
|
|
|
2015-01-26 12:23:41 -05:00
|
|
|
# homebrew installs into /usr/local
|
|
|
|
|
LIBS += -L/usr/local/lib
|
|
|
|
|
|
|
|
|
|
INCLUDEPATH += /usr/local/include
|
|
|
|
|
|
2015-12-09 11:14:33 -05:00
|
|
|
QMAKE_MAC_SDK = macosx10.11
|
2015-01-26 12:23:41 -05:00
|
|
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
|
2015-12-09 11:14:33 -05:00
|
|
|
|
|
|
|
|
QMAKE_CXXFLAGS += -mmacosx-version-min=10.9 -arch x86_64
|
2015-01-26 12:23:41 -05:00
|
|
|
QMAKE_CXXFLAGS += -stdlib=libc++
|
2015-12-15 11:22:51 -05:00
|
|
|
}
|
|
|
|
|
|
2016-01-04 08:45:40 -05:00
|
|
|
!macx:!win32 {
|
2015-01-26 12:23:41 -05:00
|
|
|
CONFIG += precompile_header
|
2015-12-15 11:22:51 -05:00
|
|
|
|
2015-12-15 23:28:25 -05:00
|
|
|
LIBS += -L/usr/lib/x86_64-linux-gnu -L$$LOCAL_LIB_DIR -lGL
|
|
|
|
|
LIBS += -L/usr/lib/x86_64-linux-gnu -L$$LOCAL_LIB_DIR -lOpenCL
|
2015-01-26 12:17:51 -05:00
|
|
|
|
2015-01-26 12:23:41 -05:00
|
|
|
QMAKE_LFLAGS_RELEASE += -s
|
|
|
|
|
}
|
2016-01-04 08:45:40 -05:00
|
|
|
# Win32: put "GlU32.Lib" "WS2_32.Lib" "OpenGL32.Lib" under "MSVC2013\Windows Kits\8.1\Lib\winv6.3\um\x64\" ,
|
|
|
|
|
# and "CUDA\v7.5\lib\x64\OpenCL.lib" into $$EXTERNAL_LIB
|
|
|
|
|
win32 {
|
|
|
|
|
|
|
|
|
|
LIBS +=$$absolute_path($$EXTERNAL_LIB)/GlU32.Lib
|
|
|
|
|
LIBS +=$$absolute_path($$EXTERNAL_LIB)/OpenGL32.lib
|
|
|
|
|
LIBS +=$$absolute_path($$EXTERNAL_LIB)/WS2_32.lib
|
|
|
|
|
LIBS +=$$absolute_path($$EXTERNAL_LIB)/OpenCL.lib
|
|
|
|
|
}
|
|
|
|
|
!win32 {
|
|
|
|
|
native {
|
|
|
|
|
QMAKE_CXXFLAGS += -march=native
|
|
|
|
|
} else {
|
|
|
|
|
QMAKE_CXXFLAGS += -march=k8
|
|
|
|
|
}
|
2015-01-26 12:50:41 -05:00
|
|
|
}
|
|
|
|
|
|
2015-12-08 06:49:19 -05:00
|
|
|
OBJECTS_DIR = $$PWD/.obj
|
|
|
|
|
MOC_DIR = $$PWD/.moc
|
|
|
|
|
RCC_DIR = $$PWD/.qrc
|
|
|
|
|
UI_DIR = $$PWD/.ui
|
2016-01-04 08:45:40 -05:00
|
|
|
!win32 {
|
|
|
|
|
LIBS += -L/usr/lib -ljpeg
|
|
|
|
|
LIBS += -L/usr/lib -lpng
|
|
|
|
|
LIBS += -L/usr/lib -ltbb
|
|
|
|
|
LIBS += -L/usr/lib -lpthread
|
|
|
|
|
LIBS += -L/usr/lib/x86_64-linux-gnu -lxml2
|
2015-01-26 12:17:51 -05:00
|
|
|
|
2016-01-04 08:45:40 -05:00
|
|
|
CMAKE_CXXFLAGS += -DCL_USE_DEPRECATED_OPENCL_1_1_APIS
|
2015-01-26 12:17:51 -05:00
|
|
|
|
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-01-04 08:45:40 -05:00
|
|
|
INCLUDEPATH += /usr/include
|
|
|
|
|
INCLUDEPATH += /usr/local/include
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-16 09:54:14 -05:00
|
|
|
INCLUDEPATH += $$LOCAL_INCLUDE_DIR/vendor
|
|
|
|
|
INCLUDEPATH += $$LOCAL_INCLUDE_DIR
|
|
|
|
|
|
|
|
|
|
# Using a local version of opencl-headers, to make sure version 1.2.
|
|
|
|
|
#INCLUDEPATH += /usr/include/CL
|
|
|
|
|
#INCLUDEPATH += /usr/local/include/CL
|
2016-01-04 08:45:40 -05:00
|
|
|
!win32 {
|
|
|
|
|
INCLUDEPATH += /usr/include/GL
|
|
|
|
|
INCLUDEPATH += /usr/local/include/GL
|
2015-12-15 11:22:51 -05:00
|
|
|
|
2016-01-04 08:45:40 -05:00
|
|
|
INCLUDEPATH += /usr/include/glm
|
|
|
|
|
INCLUDEPATH += /usr/include/tbb
|
|
|
|
|
INCLUDEPATH += /usr/include/libxml2
|
|
|
|
|
}
|
|
|
|
|
win32 {
|
|
|
|
|
INCLUDEPATH += $$EXTERNAL_DIR/glm
|
|
|
|
|
INCLUDEPATH += $$EXTERNAL_DIR/tbb/include
|
|
|
|
|
INCLUDEPATH += $$EXTERNAL_DIR/libjpeg
|
|
|
|
|
INCLUDEPATH += $$EXTERNAL_DIR/libpng
|
|
|
|
|
INCLUDEPATH += $$EXTERNAL_DIR/libxml2/include
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/libjpeg.lib
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/libpng.lib /NODEFAULTLIB:LIBCMT
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/libxml2.lib
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/tbb.lib
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/tbb_debug.lib
|
|
|
|
|
LIBS += $$absolute_path($$EXTERNAL_LIB)/zlib.lib
|
|
|
|
|
}
|
2015-12-08 06:49:19 -05:00
|
|
|
INCLUDEPATH += $$SRC_DIR/Ember
|
|
|
|
|
INCLUDEPATH += $$SRC_DIR/EmberCL
|
|
|
|
|
INCLUDEPATH += $$SRC_DIR/EmberCommon
|
2015-01-26 12:17:51 -05:00
|
|
|
|
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += -O2
|
2015-01-26 12:23:41 -05:00
|
|
|
QMAKE_CXXFLAGS_RELEASE += -DNDEBUG
|
2016-01-04 08:45:40 -05:00
|
|
|
!win32 {
|
|
|
|
|
QMAKE_CXXFLAGS_RELEASE += -fomit-frame-pointer
|
|
|
|
|
QMAKE_CXXFLAGS += -fPIC
|
|
|
|
|
QMAKE_CXXFLAGS += -fpermissive
|
|
|
|
|
QMAKE_CXXFLAGS += -pedantic
|
|
|
|
|
QMAKE_CXXFLAGS += -std=c++11
|
|
|
|
|
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 += -Wmissing-include-dirs
|
|
|
|
|
QMAKE_CXXFLAGS += -Wswitch-enum
|
|
|
|
|
QMAKE_CXXFLAGS += -Wswitch-default
|
|
|
|
|
QMAKE_CXXFLAGS += -Wmain
|
|
|
|
|
QMAKE_CXXFLAGS += -Wzero-as-null-pointer-constant
|
|
|
|
|
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
|
|
|
|
|
}
|
2015-01-26 12:17:51 -05:00
|
|
|
QMAKE_CXXFLAGS += -D_M_X64
|
|
|
|
|
QMAKE_CXXFLAGS += -D_CONSOLE
|
|
|
|
|
QMAKE_CXXFLAGS += -D_USRDLL
|
2016-01-04 08:45:40 -05:00
|
|
|
win32:QMAKE_CXXFLAGS += -bigobj
|