2014-09-01 00:25:15 -04:00
|
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
|
|
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
|
|
|
|
<ItemGroup Label="ProjectConfigurations">
|
|
|
|
|
|
<ProjectConfiguration Include="Debug|x64">
|
|
|
|
|
|
<Configuration>Debug</Configuration>
|
|
|
|
|
|
<Platform>x64</Platform>
|
|
|
|
|
|
</ProjectConfiguration>
|
|
|
|
|
|
<ProjectConfiguration Include="Release|x64">
|
|
|
|
|
|
<Configuration>Release</Configuration>
|
|
|
|
|
|
<Platform>x64</Platform>
|
|
|
|
|
|
</ProjectConfiguration>
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<PropertyGroup Label="Globals">
|
|
|
|
|
|
<ProjectGuid>{35285FCF-6FA8-410E-841B-70AE744D38B8}</ProjectGuid>
|
|
|
|
|
|
<Keyword>Win32Proj</Keyword>
|
|
|
|
|
|
<RootNamespace>EmberAnimate</RootNamespace>
|
|
|
|
|
|
<ProjectName>EmberAnimate</ProjectName>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
|
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
|
|
|
|
<UseDebugLibraries>true</UseDebugLibraries>
|
|
|
|
|
|
<CharacterSet>MultiByte</CharacterSet>
|
|
|
|
|
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
|
|
|
|
|
<PlatformToolset>v120</PlatformToolset>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
|
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
|
|
|
|
<UseDebugLibraries>false</UseDebugLibraries>
|
|
|
|
|
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
|
|
|
|
|
<CharacterSet>MultiByte</CharacterSet>
|
|
|
|
|
|
<PlatformToolset>v120</PlatformToolset>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
|
|
|
|
<ImportGroup Label="ExtensionSettings">
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
|
|
|
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
|
|
|
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<PropertyGroup Label="UserMacros" />
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
|
|
|
|
<LinkIncremental>true</LinkIncremental>
|
|
|
|
|
|
<OutDir>$(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\</OutDir>
|
|
|
|
|
|
<IntDir>$(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\</IntDir>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
|
|
|
|
<LinkIncremental>false</LinkIncremental>
|
|
|
|
|
|
<OutDir>$(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\</OutDir>
|
|
|
|
|
|
<IntDir>$(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\</IntDir>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
|
|
|
|
<ClCompile>
|
|
|
|
|
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
|
|
|
|
<WarningLevel>Level3</WarningLevel>
|
|
|
|
|
|
<Optimization>Disabled</Optimization>
|
|
|
|
|
|
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
|
|
|
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
2016-01-13 22:08:25 -05:00
|
|
|
|
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include</AdditionalIncludeDirectories>
|
2016-03-01 20:26:45 -05:00
|
|
|
|
<DisableSpecificWarnings>
|
|
|
|
|
|
</DisableSpecificWarnings>
|
2014-09-01 00:25:15 -04:00
|
|
|
|
<PrecompiledHeaderFile>EmberCommonPch.h</PrecompiledHeaderFile>
|
|
|
|
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
|
|
|
|
<MinimalRebuild>false</MinimalRebuild>
|
|
|
|
|
|
<StringPooling>true</StringPooling>
|
|
|
|
|
|
<FloatingPointExceptions>false</FloatingPointExceptions>
|
|
|
|
|
|
</ClCompile>
|
|
|
|
|
|
<Link>
|
|
|
|
|
|
<SubSystem>Console</SubSystem>
|
|
|
|
|
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
2016-03-01 20:26:45 -05:00
|
|
|
|
<AdditionalDependencies>libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
|
|
|
|
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName)</AdditionalLibraryDirectories>
|
2014-09-01 00:25:15 -04:00
|
|
|
|
</Link>
|
|
|
|
|
|
<PostBuildEvent>
|
2016-03-01 20:26:45 -05:00
|
|
|
|
<Command>xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)"
|
|
|
|
|
|
xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
|
|
|
|
|
|
</Command>
|
2014-09-01 00:25:15 -04:00
|
|
|
|
</PostBuildEvent>
|
|
|
|
|
|
</ItemDefinitionGroup>
|
|
|
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
|
|
|
|
<ClCompile>
|
|
|
|
|
|
<WarningLevel>Level3</WarningLevel>
|
|
|
|
|
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
|
|
|
|
|
<Optimization>MaxSpeed</Optimization>
|
|
|
|
|
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
|
|
|
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
|
|
|
|
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
|
|
|
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
2016-01-13 22:08:25 -05:00
|
|
|
|
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\Source\Ember;$(ProjectDir)..\..\..\Source\EmberCommon;$(ProjectDir)..\..\..\Source\EmberCL;$(ProjectDir)..\..\..\..\glm;$(ProjectDir)..\..\..\..\tbb\include;$(ProjectDir)..\..\..\..\libjpeg;$(ProjectDir)..\..\..\..\libpng;$(ProjectDir)..\..\..\..\libxml2\include;$(AMDAPPSDKROOT)\include;$(CUDA_PATH)\include</AdditionalIncludeDirectories>
|
2016-03-01 20:26:45 -05:00
|
|
|
|
<DisableSpecificWarnings>
|
|
|
|
|
|
</DisableSpecificWarnings>
|
2014-09-01 00:25:15 -04:00
|
|
|
|
<PrecompiledHeaderFile>EmberCommonPch.h</PrecompiledHeaderFile>
|
|
|
|
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
|
|
|
|
<StringPooling>true</StringPooling>
|
|
|
|
|
|
<FloatingPointExceptions>false</FloatingPointExceptions>
|
--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
|
|
|
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
2014-09-01 00:25:15 -04:00
|
|
|
|
</ClCompile>
|
|
|
|
|
|
<Link>
|
|
|
|
|
|
<SubSystem>Console</SubSystem>
|
|
|
|
|
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
|
|
|
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
|
|
|
|
<OptimizeReferences>true</OptimizeReferences>
|
2016-03-01 20:26:45 -05:00
|
|
|
|
<AdditionalDependencies>libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
|
|
|
|
<AdditionalLibraryDirectories>$(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName)</AdditionalLibraryDirectories>
|
2014-09-01 00:25:15 -04:00
|
|
|
|
</Link>
|
|
|
|
|
|
<PostBuildEvent>
|
2016-03-01 20:26:45 -05:00
|
|
|
|
<Command>xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)"
|
|
|
|
|
|
xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)"
|
|
|
|
|
|
</Command>
|
2014-09-01 00:25:15 -04:00
|
|
|
|
</PostBuildEvent>
|
|
|
|
|
|
</ItemDefinitionGroup>
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
<None Include="..\..\..\Source\Fractorium\Icons\Fractorium.ico" />
|
|
|
|
|
|
<None Include="ReadMe.txt" />
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
<ProjectReference Include="Ember.vcxproj">
|
|
|
|
|
|
<Project>{2bdb7a54-bb1a-476b-a6e5-f81e90ad4e67}</Project>
|
|
|
|
|
|
</ProjectReference>
|
|
|
|
|
|
<ProjectReference Include="EmberCL.vcxproj">
|
|
|
|
|
|
<Project>{f6a9102c-69a9-48fb-bc4b-49e49af43236}</Project>
|
|
|
|
|
|
</ProjectReference>
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
<ClInclude Include="..\..\..\Source\EmberAnimate\EmberAnimate.h" />
|
|
|
|
|
|
<ClInclude Include="..\..\..\Source\EmberAnimate\resource.h" />
|
|
|
|
|
|
<ClInclude Include="..\..\..\Source\EmberCommon\EmberCommon.h" />
|
|
|
|
|
|
<ClInclude Include="..\..\..\Source\EmberCommon\EmberCommonPch.h" />
|
|
|
|
|
|
<ClInclude Include="..\..\..\Source\EmberCommon\EmberOptions.h" />
|
|
|
|
|
|
<ClInclude Include="..\..\..\Source\EmberCommon\JpegUtils.h" />
|
|
|
|
|
|
<ClInclude Include="..\..\..\Source\EmberCommon\SimpleGlob.h" />
|
|
|
|
|
|
<ClInclude Include="..\..\..\Source\EmberCommon\SimpleOpt.h" />
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
<ClCompile Include="..\..\..\Source\EmberAnimate\EmberAnimate.cpp" />
|
|
|
|
|
|
<ClCompile Include="..\..\..\Source\EmberCommon\EmberCommonPch.cpp">
|
|
|
|
|
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
|
|
|
|
|
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
|
|
|
|
|
</ClCompile>
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<ItemGroup>
|
2016-03-01 20:26:45 -05:00
|
|
|
|
<ResourceCompile Include="EmberAnimate.rc" />
|
2014-09-01 00:25:15 -04:00
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
|
|
|
|
<ImportGroup Label="ExtensionTargets">
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
</Project>
|