diff --git a/README.md b/README.md index 4333e32..9f7cbae 100644 --- a/README.md +++ b/README.md @@ -37,13 +37,13 @@ Although DirectX 12 support is included, it hasn't been properly optimized. * AMD Radeon™ GCN-based GPU (HD 7000 series or newer) * Or other DirectX® 11 or DirectX 12 compatible discrete GPU with Shader Model 5 support * 64-bit Windows® 7 (SP1 with the [Platform Update](https://msdn.microsoft.com/en-us/library/windows/desktop/jj863687.aspx)), Windows 8.1, or Windows 10 -* Visual Studio® 2013 or Visual Studio 2015 -* Visual Studio 2015 and Windows 10 required for DirectX 12 +* Visual Studio 2015 or Visual Studio 2017 +* Visual Studio 2015 or 2017, and Windows 10 required for DirectX 12 ### Getting started #### Running the demo -* Visual studio solutions for VS2015, DX11 and DX12, can be found in the `amd_tressfx_sample\build` directory. +* Visual studio solutions for VS2015, VS2017, DX11 and DX12, can be found in the `amd_tressfx_sample\build` directory. * There are also solutions for just the core library in the `amd_tressfx\build` directory. * Change settings such as fullscreen/windowed and enable/disable D3D debug layer in `amd_tressfx_sample\bin\sushi.ini` * Run `SushiD3D11.exe` or `SushiD3D12.exe` in `amd_tressfx_sample\bin`. @@ -56,13 +56,9 @@ Although DirectX 12 support is included, it hasn't been properly optimized. ### Premake -The Visual Studio solutions and projects in this repo were generated with Premake. If you need to regenerate the Visual Studio files, double-click on `gpuopen_tressfx_update_vs_files.bat` in the `premake` directory. +The Visual Studio solutions and projects in this repo were generated with Premake. If you need to regenerate the Visual Studio files, double-click on `gpuopen_geometryfx_update_vs_files.bat` in the `premake` directory. -This version of Premake has been modified from the stock version to use the property sheet technique for the Windows SDK from this [Visual C++ Team blog post](http://blogs.msdn.com/b/vcblog/archive/2012/11/23/using-the-windows-8-sdk-with-visual-studio-2010-configuring-multiple-projects.aspx). The technique was originally described for using the Windows 8.0 SDK with Visual Studio 2010, but it applies more generally to using newer versions of the Windows SDK with older versions of Visual Studio. - -By default, Visual Studio 2013 projects will compile against the Windows 8.1 SDK. However, the VS2013 projects generated with this version of Premake will use the next higher SDK (i.e. the Windows 10 SDK), if the newer SDK exists on the user's machine. - -For Visual Studio 2015, the `systemversion` Premake function is used to add the `WindowsTargetPlatformVersion` element to the project file, to specify which version of the Windows SDK will be used. To change `WindowsTargetPlatformVersion` for Visual Studio 2015, change the value for `WINDOWS_TARGET_SDK` in `amd_tressfx_sample\premake` and regenerate the Visual Studio files. +For Visual Studio 2015 and 2017, this version of Premake adds the `WindowsTargetPlatformVersion` element to the project file to specify which version of the Windows SDK will be used. To change `WindowsTargetPlatformVersion` for Visual Studio 2015 and 2017, change the value for `_AMD_WIN_SDK_VERSION` in `premake\amd_premake_util.lua` and regenerate the Visual Studio files. ### Third-Party Software * TressFX is distributed as source code, licensed under MIT. It contains no third-party code. diff --git a/amd_tressfx/build/AMD_TressFX_2015.vcxproj b/amd_tressfx/build/AMD_TressFX_2015.vcxproj index ff28235..31df199 100644 --- a/amd_tressfx/build/AMD_TressFX_2015.vcxproj +++ b/amd_tressfx/build/AMD_TressFX_2015.vcxproj @@ -48,6 +48,7 @@ Win32Proj AMD_TressFX AMD_TressFX + 8.1 diff --git a/amd_tressfx/build/AMD_TressFX_2015.vcxproj.filters b/amd_tressfx/build/AMD_TressFX_2015.vcxproj.filters index cb1466d..d6d0237 100644 --- a/amd_tressfx/build/AMD_TressFX_2015.vcxproj.filters +++ b/amd_tressfx/build/AMD_TressFX_2015.vcxproj.filters @@ -1,4 +1,4 @@ - + diff --git a/amd_tressfx/build/AMD_TressFX_2013.sln b/amd_tressfx/build/AMD_TressFX_2017.sln similarity index 93% rename from amd_tressfx/build/AMD_TressFX_2013.sln rename to amd_tressfx/build/AMD_TressFX_2017.sln index 8d16f84..13d40d1 100644 --- a/amd_tressfx/build/AMD_TressFX_2013.sln +++ b/amd_tressfx/build/AMD_TressFX_2017.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_TressFX", "AMD_TressFX_2013.vcxproj", "{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}" +# Visual Studio 15 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_TressFX", "AMD_TressFX_2017.vcxproj", "{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/amd_tressfx/build/AMD_TressFX_2013.vcxproj b/amd_tressfx/build/AMD_TressFX_2017.vcxproj similarity index 82% rename from amd_tressfx/build/AMD_TressFX_2013.vcxproj rename to amd_tressfx/build/AMD_TressFX_2017.vcxproj index abfaa20..4458263 100644 --- a/amd_tressfx/build/AMD_TressFX_2013.vcxproj +++ b/amd_tressfx/build/AMD_TressFX_2017.vcxproj @@ -1,5 +1,5 @@  - + DLL_Debug @@ -48,175 +48,166 @@ Win32Proj AMD_TressFX AMD_TressFX + 8.1 DynamicLibrary true Unicode - v120 + v141 DynamicLibrary true Unicode - v120 + v141 DynamicLibrary false Unicode - v120 + v141 DynamicLibrary false Unicode - v120 + v141 StaticLibrary true Unicode - v120 + v141 StaticLibrary true Unicode - v120 + v141 StaticLibrary false Unicode - v120 + v141 StaticLibrary false Unicode - v120 + v141 DynamicLibrary false Unicode - v120 + v141 DynamicLibrary false Unicode - v120 + v141 - - - - - - - - - - true - ..\lib\VS2013\Win32\DLL_Debug\ - VS2013\Win32\DLL_Debug\ + ..\lib\VS2017\Win32\DLL_Debug\ + VS2017\Win32\DLL_Debug\ GPUOpen_TressFX_x86d .dll true - ..\lib\VS2013\x64\DLL_Debug\ - VS2013\x64\DLL_Debug\ + ..\lib\VS2017\x64\DLL_Debug\ + VS2017\x64\DLL_Debug\ GPUOpen_TressFX_x64d .dll false - ..\lib\VS2013\Win32\DLL_Release\ - VS2013\Win32\DLL_Release\ + ..\lib\VS2017\Win32\DLL_Release\ + VS2017\Win32\DLL_Release\ GPUOpen_TressFX_x86 .dll false - ..\lib\VS2013\x64\DLL_Release\ - VS2013\x64\DLL_Release\ + ..\lib\VS2017\x64\DLL_Release\ + VS2017\x64\DLL_Release\ GPUOpen_TressFX_x64 .dll - ..\lib\VS2013\Win32\Lib_Debug\ - VS2013\Win32\Lib_Debug\ + ..\lib\VS2017\Win32\Lib_Debug\ + VS2017\Win32\Lib_Debug\ GPUOpen_TressFX_x86d .lib - ..\lib\VS2013\x64\Lib_Debug\ - VS2013\x64\Lib_Debug\ + ..\lib\VS2017\x64\Lib_Debug\ + VS2017\x64\Lib_Debug\ GPUOpen_TressFX_x64d .lib - ..\lib\VS2013\Win32\Lib_Release\ - VS2013\Win32\Lib_Release\ + ..\lib\VS2017\Win32\Lib_Release\ + VS2017\Win32\Lib_Release\ GPUOpen_TressFX_x86 .lib - ..\lib\VS2013\x64\Lib_Release\ - VS2013\x64\Lib_Release\ + ..\lib\VS2017\x64\Lib_Release\ + VS2017\x64\Lib_Release\ GPUOpen_TressFX_x64 .lib false - ..\lib\VS2013\Win32\DLL_Release_MT\ - VS2013\Win32\DLL_Release_MT\ + ..\lib\VS2017\Win32\DLL_Release_MT\ + VS2017\Win32\DLL_Release_MT\ GPUOpen_TressFX_x86 .dll false - ..\lib\VS2013\x64\DLL_Release_MT\ - VS2013\x64\DLL_Release_MT\ + ..\lib\VS2017\x64\DLL_Release_MT\ + VS2017\x64\DLL_Release_MT\ GPUOpen_TressFX_x64 .dll @@ -234,13 +225,13 @@ Windows true - ..\lib\VS2013\Win32\DLL_Debug\GPUOpen_TressFX_x86d.lib + ..\lib\VS2017\Win32\DLL_Debug\GPUOpen_TressFX_x86d.lib true - copy /b "..\lib\VS2013\Win32\DLL_Debug\$(TargetName).lib" +,, "..\lib\VS2013\Win32\DLL_Debug\" > nul -xcopy "..\lib\VS2013\Win32\DLL_Debug\$(TargetName).dll" "..\lib" /H /R /Y > nul -xcopy "..\lib\VS2013\Win32\DLL_Debug\$(TargetName).lib" "..\lib" /H /R /Y > nul + copy /b "..\lib\VS2017\Win32\DLL_Debug\$(TargetName).lib" +,, "..\lib\VS2017\Win32\DLL_Debug\" > nul +xcopy "..\lib\VS2017\Win32\DLL_Debug\$(TargetName).dll" "..\lib" /H /R /Y > nul +xcopy "..\lib\VS2017\Win32\DLL_Debug\$(TargetName).lib" "..\lib" /H /R /Y > nul Copying build output to lib directory... @@ -251,20 +242,20 @@ xcopy "..\lib\VS2013\Win32\DLL_Debug\$(TargetName).lib" "..\lib" /H /R /Y > true _USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\inc;%(AdditionalIncludeDirectories) - ProgramDatabase + EditAndContinue Disabled /EHsc %(AdditionalOptions) Windows true - ..\lib\VS2013\x64\DLL_Debug\GPUOpen_TressFX_x64d.lib + ..\lib\VS2017\x64\DLL_Debug\GPUOpen_TressFX_x64d.lib true - copy /b "..\lib\VS2013\x64\DLL_Debug\$(TargetName).lib" +,, "..\lib\VS2013\x64\DLL_Debug\" > nul -xcopy "..\lib\VS2013\x64\DLL_Debug\$(TargetName).dll" "..\lib" /H /R /Y > nul -xcopy "..\lib\VS2013\x64\DLL_Debug\$(TargetName).lib" "..\lib" /H /R /Y > nul + copy /b "..\lib\VS2017\x64\DLL_Debug\$(TargetName).lib" +,, "..\lib\VS2017\x64\DLL_Debug\" > nul +xcopy "..\lib\VS2017\x64\DLL_Debug\$(TargetName).dll" "..\lib" /H /R /Y > nul +xcopy "..\lib\VS2017\x64\DLL_Debug\$(TargetName).lib" "..\lib" /H /R /Y > nul Copying build output to lib directory... @@ -275,7 +266,7 @@ xcopy "..\lib\VS2013\x64\DLL_Debug\$(TargetName).lib" "..\lib" /H /R /Y > nu true _USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\inc;%(AdditionalIncludeDirectories) - + None Full true true @@ -288,13 +279,13 @@ xcopy "..\lib\VS2013\x64\DLL_Debug\$(TargetName).lib" "..\lib" /H /R /Y > nu false true true - ..\lib\VS2013\Win32\DLL_Release\GPUOpen_TressFX_x86.lib + ..\lib\VS2017\Win32\DLL_Release\GPUOpen_TressFX_x86.lib true - copy /b "..\lib\VS2013\Win32\DLL_Release\$(TargetName).lib" +,, "..\lib\VS2013\Win32\DLL_Release\" > nul -xcopy "..\lib\VS2013\Win32\DLL_Release\$(TargetName).dll" "..\lib" /H /R /Y > nul -xcopy "..\lib\VS2013\Win32\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y > nul + copy /b "..\lib\VS2017\Win32\DLL_Release\$(TargetName).lib" +,, "..\lib\VS2017\Win32\DLL_Release\" > nul +xcopy "..\lib\VS2017\Win32\DLL_Release\$(TargetName).dll" "..\lib" /H /R /Y > nul +xcopy "..\lib\VS2017\Win32\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y > nul Copying build output to lib directory... @@ -305,7 +296,7 @@ xcopy "..\lib\VS2013\Win32\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y > true _USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\inc;%(AdditionalIncludeDirectories) - + None Full true true @@ -318,13 +309,13 @@ xcopy "..\lib\VS2013\Win32\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y > false true true - ..\lib\VS2013\x64\DLL_Release\GPUOpen_TressFX_x64.lib + ..\lib\VS2017\x64\DLL_Release\GPUOpen_TressFX_x64.lib true - copy /b "..\lib\VS2013\x64\DLL_Release\$(TargetName).lib" +,, "..\lib\VS2013\x64\DLL_Release\" > nul -xcopy "..\lib\VS2013\x64\DLL_Release\$(TargetName).dll" "..\lib" /H /R /Y > nul -xcopy "..\lib\VS2013\x64\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y > nul + copy /b "..\lib\VS2017\x64\DLL_Release\$(TargetName).lib" +,, "..\lib\VS2017\x64\DLL_Release\" > nul +xcopy "..\lib\VS2017\x64\DLL_Release\$(TargetName).dll" "..\lib" /H /R /Y > nul +xcopy "..\lib\VS2017\x64\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y > nul Copying build output to lib directory... @@ -354,7 +345,7 @@ xcopy "..\lib\VS2013\x64\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y > true _LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\inc;%(AdditionalIncludeDirectories) - ProgramDatabase + EditAndContinue Disabled /EHsc %(AdditionalOptions) @@ -373,7 +364,7 @@ xcopy "..\lib\VS2013\x64\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y > true _LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\inc;%(AdditionalIncludeDirectories) - + None Full true true @@ -398,7 +389,7 @@ xcopy "..\lib\VS2013\x64\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y > true _LIB;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=0;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\inc;%(AdditionalIncludeDirectories) - + None Full true true @@ -423,7 +414,7 @@ xcopy "..\lib\VS2013\x64\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y > true _USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\inc;%(AdditionalIncludeDirectories) - + None Full true true @@ -437,13 +428,13 @@ xcopy "..\lib\VS2013\x64\DLL_Release\$(TargetName).lib" "..\lib" /H /R /Y > false true true - ..\lib\VS2013\Win32\DLL_Release_MT\GPUOpen_TressFX_x86.lib + ..\lib\VS2017\Win32\DLL_Release_MT\GPUOpen_TressFX_x86.lib true - copy /b "..\lib\VS2013\Win32\DLL_Release_MT\$(TargetName).lib" +,, "..\lib\VS2013\Win32\DLL_Release_MT\" > nul -xcopy "..\lib\VS2013\Win32\DLL_Release_MT\$(TargetName).dll" "..\lib" /H /R /Y > nul -xcopy "..\lib\VS2013\Win32\DLL_Release_MT\$(TargetName).lib" "..\lib" /H /R /Y > nul + copy /b "..\lib\VS2017\Win32\DLL_Release_MT\$(TargetName).lib" +,, "..\lib\VS2017\Win32\DLL_Release_MT\" > nul +xcopy "..\lib\VS2017\Win32\DLL_Release_MT\$(TargetName).dll" "..\lib" /H /R /Y > nul +xcopy "..\lib\VS2017\Win32\DLL_Release_MT\$(TargetName).lib" "..\lib" /H /R /Y > nul Copying build output to lib directory... @@ -454,7 +445,7 @@ xcopy "..\lib\VS2013\Win32\DLL_Release_MT\$(TargetName).lib" "..\lib" /H /R /Y true _USRDLL;AMD_TRESSFX_COMPILE_DYNAMIC_LIB=1;WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0601;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\inc;%(AdditionalIncludeDirectories) - + None Full true true @@ -468,13 +459,13 @@ xcopy "..\lib\VS2013\Win32\DLL_Release_MT\$(TargetName).lib" "..\lib" /H /R /Y false true true - ..\lib\VS2013\x64\DLL_Release_MT\GPUOpen_TressFX_x64.lib + ..\lib\VS2017\x64\DLL_Release_MT\GPUOpen_TressFX_x64.lib true - copy /b "..\lib\VS2013\x64\DLL_Release_MT\$(TargetName).lib" +,, "..\lib\VS2013\x64\DLL_Release_MT\" > nul -xcopy "..\lib\VS2013\x64\DLL_Release_MT\$(TargetName).dll" "..\lib" /H /R /Y > nul -xcopy "..\lib\VS2013\x64\DLL_Release_MT\$(TargetName).lib" "..\lib" /H /R /Y > nul + copy /b "..\lib\VS2017\x64\DLL_Release_MT\$(TargetName).lib" +,, "..\lib\VS2017\x64\DLL_Release_MT\" > nul +xcopy "..\lib\VS2017\x64\DLL_Release_MT\$(TargetName).dll" "..\lib" /H /R /Y > nul +xcopy "..\lib\VS2017\x64\DLL_Release_MT\$(TargetName).lib" "..\lib" /H /R /Y > nul Copying build output to lib directory... diff --git a/amd_tressfx/build/AMD_TressFX_2013.vcxproj.filters b/amd_tressfx/build/AMD_TressFX_2017.vcxproj.filters similarity index 99% rename from amd_tressfx/build/AMD_TressFX_2013.vcxproj.filters rename to amd_tressfx/build/AMD_TressFX_2017.vcxproj.filters index cb1466d..d6d0237 100644 --- a/amd_tressfx/build/AMD_TressFX_2013.vcxproj.filters +++ b/amd_tressfx/build/AMD_TressFX_2017.vcxproj.filters @@ -1,4 +1,4 @@ - + diff --git a/amd_tressfx/build/Windows10SDKVS13_x64.props b/amd_tressfx/build/Windows10SDKVS13_x64.props deleted file mode 100644 index 7cc1199..0000000 --- a/amd_tressfx/build/Windows10SDKVS13_x64.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - $(ProgramFiles)\Windows Kits\10\bin\x86;$(ExecutablePath) - $(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\winrt;$(IncludePath) - $(ProgramFiles)\Windows Kits\10\lib\10.0.10240.0\um\x64;$(LibraryPath) - $(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\winrt;$(ExcludePath) - - - \ No newline at end of file diff --git a/amd_tressfx/build/Windows10SDKVS13_x86.props b/amd_tressfx/build/Windows10SDKVS13_x86.props deleted file mode 100644 index 3c92ad7..0000000 --- a/amd_tressfx/build/Windows10SDKVS13_x86.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - $(ProgramFiles)\Windows Kits\10\bin\x86;$(ExecutablePath) - $(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\winrt;$(IncludePath) - $(ProgramFiles)\Windows Kits\10\lib\10.0.10240.0\um\x86;$(LibraryPath) - $(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\um;$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\shared;$(ProgramFiles)\Windows Kits\10\Include\10.0.10240.0\winrt;$(ExcludePath) - - - \ No newline at end of file diff --git a/amd_tressfx/premake/premake5.lua b/amd_tressfx/premake/premake5.lua index 5ff8e06..cb761a3 100644 --- a/amd_tressfx/premake/premake5.lua +++ b/amd_tressfx/premake/premake5.lua @@ -36,8 +36,8 @@ project (_AMD_LIBRARY_PROJECT_NAME) --exceptionhandling "Off" --rtti "Off" - -- Specify WindowsTargetPlatformVersion here for VS2015 - --windowstarget (_AMD_WIN_SDK_VERSION) + -- Specify WindowsTargetPlatformVersion here for VS2015 and VS2017 + systemversion (_AMD_WIN_SDK_VERSION) files { "../inc/**.h", "../src/**.h", "../src/**.cpp", "../src/Shaders/**.hlsl" } includedirs { "../inc" } diff --git a/amd_tressfx_sample/build/AMD_TressFX_SampleD3D11_2017.sln b/amd_tressfx_sample/build/AMD_TressFX_SampleD3D11_2017.sln new file mode 100644 index 0000000..91c3fb7 --- /dev/null +++ b/amd_tressfx_sample/build/AMD_TressFX_SampleD3D11_2017.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_TressFX", "..\..\amd_tressfx\build\AMD_TressFX_2017.vcxproj", "{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SuTressFXPluginD3D11", "SuTressFXPluginD3D11_2017.vcxproj", "{481719C3-34A6-A28C-DDC4-B687C932B332}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Debug|x64.ActiveCfg = Lib_Debug|x64 + {252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Debug|x64.Build.0 = Lib_Debug|x64 + {252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Release|x64.ActiveCfg = Lib_Release|x64 + {252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Release|x64.Build.0 = Lib_Release|x64 + {481719C3-34A6-A28C-DDC4-B687C932B332}.Debug|x64.ActiveCfg = Debug|x64 + {481719C3-34A6-A28C-DDC4-B687C932B332}.Debug|x64.Build.0 = Debug|x64 + {481719C3-34A6-A28C-DDC4-B687C932B332}.Release|x64.ActiveCfg = Release|x64 + {481719C3-34A6-A28C-DDC4-B687C932B332}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/amd_tressfx_sample/build/AMD_TressFX_SampleD3D12_2017.sln b/amd_tressfx_sample/build/AMD_TressFX_SampleD3D12_2017.sln new file mode 100644 index 0000000..05e2182 --- /dev/null +++ b/amd_tressfx_sample/build/AMD_TressFX_SampleD3D12_2017.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMD_TressFX", "..\..\amd_tressfx\build\AMD_TressFX_2017.vcxproj", "{252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SuTressFXPluginD3D12", "SuTressFXPluginD3D12_2017.vcxproj", "{491719C3-35A6-A28C-DEC4-B687CA32B332}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Debug|x64.ActiveCfg = Lib_Debug|x64 + {252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Debug|x64.Build.0 = Lib_Debug|x64 + {252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Release|x64.ActiveCfg = Lib_Release|x64 + {252C0AF0-91E1-82E5-1AD6-7CBC868A79E9}.Release|x64.Build.0 = Lib_Release|x64 + {491719C3-35A6-A28C-DEC4-B687CA32B332}.Debug|x64.ActiveCfg = Debug|x64 + {491719C3-35A6-A28C-DEC4-B687CA32B332}.Debug|x64.Build.0 = Debug|x64 + {491719C3-35A6-A28C-DEC4-B687CA32B332}.Release|x64.ActiveCfg = Release|x64 + {491719C3-35A6-A28C-DEC4-B687CA32B332}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/amd_tressfx_sample/build/SuTressFXPluginD3D11_2015.vcxproj.filters b/amd_tressfx_sample/build/SuTressFXPluginD3D11_2015.vcxproj.filters index 440057e..6021785 100644 --- a/amd_tressfx_sample/build/SuTressFXPluginD3D11_2015.vcxproj.filters +++ b/amd_tressfx_sample/build/SuTressFXPluginD3D11_2015.vcxproj.filters @@ -1,4 +1,4 @@ - + diff --git a/amd_tressfx_sample/build/SuTressFXPluginD3D11_2017.vcxproj b/amd_tressfx_sample/build/SuTressFXPluginD3D11_2017.vcxproj new file mode 100644 index 0000000..db30f7d --- /dev/null +++ b/amd_tressfx_sample/build/SuTressFXPluginD3D11_2017.vcxproj @@ -0,0 +1,187 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {481719C3-34A6-A28C-DDC4-B687C932B332} + true + Win32Proj + SuTressFXPluginD3D11 + SuTressFXPluginD3D11 + 8.1 + + + + DynamicLibrary + true + MultiByte + v141 + + + DynamicLibrary + false + MultiByte + v141 + + + + + + + + + + + + + true + VS2017\x64\ + VS2017\d3d11\x64\Debug\ + SuTressFXPluginD3D11_d + .dll + + + false + VS2017\x64\ + VS2017\d3d11\x64\Release\ + SuTressFXPluginD3D11 + .dll + + + + NotUsing + Level3 + WIN32;WINDOWS;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;SU_3D_API_D3D11;SUSHI_DLL_IMPORT;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions) + ..\..\amd_tressfx\inc;..\premake;..\prebuilt\include\Common\include;..\prebuilt\include\PluginManager\include;..\prebuilt\include\ObjectManager\include;..\prebuilt\include\ObjectManager;..\prebuilt\include\ParticleSystem;..\prebuilt\include\ParticleSystem\include;..\prebuilt\include\WindowManager\include;..\prebuilt\include\EffectManager\include;..\prebuilt\include\ScriptManager\include;..\prebuilt\include\RenderManager\include;..\prebuilt\include\GPUResourceManager\include;..\prebuilt\include\GUI\include;..\prebuilt\include\Thirdparty\toluapp-master\include;..\prebuilt\include\Thirdparty\lua-5.1.5\src;..\src;..;..\src\Lights;%(AdditionalIncludeDirectories) + EditAndContinue + Disabled + false + true + + + Windows + true + SushiCoreD3D11_d.lib;tolualibD3D11_d.lib;luaD3D11_d.lib;%(AdditionalDependencies) + \Lib\x64;..\prebuilt\bin\VS2015\x64;%(AdditionalLibraryDirectories) + VS2017\x64\SuTressFXPluginD3D11_d.lib + + + IF EXIST VS2017\x64\SuTressFXPluginD3D11_d.dll\ (xcopy /Q /E /Y /I VS2017\x64\SuTressFXPluginD3D11_d.dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I VS2017\x64\SuTressFXPluginD3D11_d.dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\build\VS2017\x64\$(TargetName).dll\ (xcopy /Q /E /Y /I ..\build\VS2017\x64\$(TargetName).dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\build\VS2017\x64\$(TargetName).dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\prebuilt\bin\VS2015\x64\SushiCoreD3D11_d.dll\ (xcopy /Q /E /Y /I ..\prebuilt\bin\VS2015\x64\SushiCoreD3D11_d.dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\prebuilt\bin\VS2015\x64\SushiCoreD3D11_d.dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\prebuilt\bin\VS2015\x64\luaD3D11_d.dll\ (xcopy /Q /E /Y /I ..\prebuilt\bin\VS2015\x64\luaD3D11_d.dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\prebuilt\bin\VS2015\x64\luaD3D11_d.dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\prebuilt\bin\VS2015\x64\SushiD3D11_d.exe\ (xcopy /Q /E /Y /I ..\prebuilt\bin\VS2015\x64\SushiD3D11_d.exe ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\prebuilt\bin\VS2015\x64\SushiD3D11_d.exe ..\..\amd_tressfx_sample\bin\ > nul) + Copying SuTressFXPlugin to Rel + + + + + NotUsing + Level3 + WIN32;WINDOWS;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;SU_3D_API_D3D11;SUSHI_DLL_IMPORT;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions) + ..\..\amd_tressfx\inc;..\premake;..\prebuilt\include\Common\include;..\prebuilt\include\PluginManager\include;..\prebuilt\include\ObjectManager\include;..\prebuilt\include\ObjectManager;..\prebuilt\include\ParticleSystem;..\prebuilt\include\ParticleSystem\include;..\prebuilt\include\WindowManager\include;..\prebuilt\include\EffectManager\include;..\prebuilt\include\ScriptManager\include;..\prebuilt\include\RenderManager\include;..\prebuilt\include\GPUResourceManager\include;..\prebuilt\include\GUI\include;..\prebuilt\include\Thirdparty\toluapp-master\include;..\prebuilt\include\Thirdparty\lua-5.1.5\src;..\src;..;..\src\Lights;%(AdditionalIncludeDirectories) + ProgramDatabase + MaxSpeed + true + true + false + true + true + + + Windows + true + true + true + SushiCoreD3D11.lib;tolualibD3D11.lib;luaD3D11.lib;%(AdditionalDependencies) + \Lib\x64;..\prebuilt\bin\VS2015\x64;%(AdditionalLibraryDirectories) + VS2017\x64\SuTressFXPluginD3D11.lib + + + IF EXIST VS2017\x64\SuTressFXPluginD3D11.dll\ (xcopy /Q /E /Y /I VS2017\x64\SuTressFXPluginD3D11.dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I VS2017\x64\SuTressFXPluginD3D11.dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\build\VS2017\x64\$(TargetName).dll\ (xcopy /Q /E /Y /I ..\build\VS2017\x64\$(TargetName).dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\build\VS2017\x64\$(TargetName).dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\prebuilt\bin\VS2015\x64\SushiCoreD3D11.dll\ (xcopy /Q /E /Y /I ..\prebuilt\bin\VS2015\x64\SushiCoreD3D11.dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\prebuilt\bin\VS2015\x64\SushiCoreD3D11.dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\prebuilt\bin\VS2015\x64\luaD3D11.dll\ (xcopy /Q /E /Y /I ..\prebuilt\bin\VS2015\x64\luaD3D11.dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\prebuilt\bin\VS2015\x64\luaD3D11.dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\prebuilt\bin\VS2015\x64\SushiD3D11.exe\ (xcopy /Q /E /Y /I ..\prebuilt\bin\VS2015\x64\SushiD3D11.exe ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\prebuilt\bin\VS2015\x64\SushiD3D11.exe ..\..\amd_tressfx_sample\bin\ > nul) + Copying SuTressFXPlugin to Rel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {252C0AF0-91E1-82E5-1AD6-7CBC868A79E9} + + + + + + \ No newline at end of file diff --git a/amd_tressfx_sample/build/SuTressFXPluginD3D11_2017.vcxproj.filters b/amd_tressfx_sample/build/SuTressFXPluginD3D11_2017.vcxproj.filters new file mode 100644 index 0000000..6021785 --- /dev/null +++ b/amd_tressfx_sample/build/SuTressFXPluginD3D11_2017.vcxproj.filters @@ -0,0 +1,195 @@ + + + + + {6A15847C-564C-850D-FF38-6B10EB4E010F} + + + {24239CD4-90D8-14CA-19CD-0EA185810BCE} + + + {76B87FF9-62B1-9E4B-8BE3-83D0773B7E57} + + + {2DAB880B-99B4-887C-2230-9F7C8E38947C} + + + + + src + + + src + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + Demo\Lua Binding + + + src + + + src + + + src + + + src + + + + + src + + + src + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + Demo\Lua Binding + + + src + + + src + + + src + + + src + + + \ No newline at end of file diff --git a/amd_tressfx_sample/build/SuTressFXPluginD3D12_2015.vcxproj b/amd_tressfx_sample/build/SuTressFXPluginD3D12_2015.vcxproj index 1b841fe..5442e31 100644 --- a/amd_tressfx_sample/build/SuTressFXPluginD3D12_2015.vcxproj +++ b/amd_tressfx_sample/build/SuTressFXPluginD3D12_2015.vcxproj @@ -16,7 +16,7 @@ Win32Proj SuTressFXPluginD3D12 SuTressFXPluginD3D12 - 10.0.10240.0 + 8.1 diff --git a/amd_tressfx_sample/build/SuTressFXPluginD3D12_2015.vcxproj.filters b/amd_tressfx_sample/build/SuTressFXPluginD3D12_2015.vcxproj.filters index 440057e..6021785 100644 --- a/amd_tressfx_sample/build/SuTressFXPluginD3D12_2015.vcxproj.filters +++ b/amd_tressfx_sample/build/SuTressFXPluginD3D12_2015.vcxproj.filters @@ -1,4 +1,4 @@ - + diff --git a/amd_tressfx_sample/build/SuTressFXPluginD3D12_2017.vcxproj b/amd_tressfx_sample/build/SuTressFXPluginD3D12_2017.vcxproj new file mode 100644 index 0000000..b9e338a --- /dev/null +++ b/amd_tressfx_sample/build/SuTressFXPluginD3D12_2017.vcxproj @@ -0,0 +1,187 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {491719C3-35A6-A28C-DEC4-B687CA32B332} + true + Win32Proj + SuTressFXPluginD3D12 + SuTressFXPluginD3D12 + 8.1 + + + + DynamicLibrary + true + MultiByte + v141 + + + DynamicLibrary + false + MultiByte + v141 + + + + + + + + + + + + + true + VS2017\x64\ + VS2017\d3d12\x64\Debug\ + SuTressFXPluginD3D12_d + .dll + + + false + VS2017\x64\ + VS2017\d3d12\x64\Release\ + SuTressFXPluginD3D12 + .dll + + + + NotUsing + Level3 + WIN32;WINDOWS;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;SU_3D_API_D3D12;SUSHI_DLL_IMPORT;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions) + ..\..\amd_tressfx\inc;..\premake;..\prebuilt\include\Common\include;..\prebuilt\include\PluginManager\include;..\prebuilt\include\ObjectManager\include;..\prebuilt\include\ObjectManager;..\prebuilt\include\ParticleSystem;..\prebuilt\include\ParticleSystem\include;..\prebuilt\include\WindowManager\include;..\prebuilt\include\EffectManager\include;..\prebuilt\include\ScriptManager\include;..\prebuilt\include\RenderManager\include;..\prebuilt\include\GPUResourceManager\include;..\prebuilt\include\GUI\include;..\prebuilt\include\Thirdparty\toluapp-master\include;..\prebuilt\include\Thirdparty\lua-5.1.5\src;..\src;..;..\src\Lights;%(AdditionalIncludeDirectories) + EditAndContinue + Disabled + false + true + + + Windows + true + SushiCoreD3D12_d.lib;tolualibD3D12_d.lib;luaD3D12_d.lib;%(AdditionalDependencies) + \Lib\x64;..\prebuilt\bin\VS2015\x64;%(AdditionalLibraryDirectories) + VS2017\x64\SuTressFXPluginD3D12_d.lib + + + IF EXIST VS2017\x64\SuTressFXPluginD3D12_d.dll\ (xcopy /Q /E /Y /I VS2017\x64\SuTressFXPluginD3D12_d.dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I VS2017\x64\SuTressFXPluginD3D12_d.dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\build\VS2017\x64\$(TargetName).dll\ (xcopy /Q /E /Y /I ..\build\VS2017\x64\$(TargetName).dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\build\VS2017\x64\$(TargetName).dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\prebuilt\bin\VS2015\x64\SushiCoreD3D12_d.dll\ (xcopy /Q /E /Y /I ..\prebuilt\bin\VS2015\x64\SushiCoreD3D12_d.dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\prebuilt\bin\VS2015\x64\SushiCoreD3D12_d.dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\prebuilt\bin\VS2015\x64\luaD3D12_d.dll\ (xcopy /Q /E /Y /I ..\prebuilt\bin\VS2015\x64\luaD3D12_d.dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\prebuilt\bin\VS2015\x64\luaD3D12_d.dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\prebuilt\bin\VS2015\x64\SushiD3D12_d.exe\ (xcopy /Q /E /Y /I ..\prebuilt\bin\VS2015\x64\SushiD3D12_d.exe ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\prebuilt\bin\VS2015\x64\SushiD3D12_d.exe ..\..\amd_tressfx_sample\bin\ > nul) + Copying SuTressFXPlugin to Rel + + + + + NotUsing + Level3 + WIN32;WINDOWS;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;SU_3D_API_D3D12;SUSHI_DLL_IMPORT;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions) + ..\..\amd_tressfx\inc;..\premake;..\prebuilt\include\Common\include;..\prebuilt\include\PluginManager\include;..\prebuilt\include\ObjectManager\include;..\prebuilt\include\ObjectManager;..\prebuilt\include\ParticleSystem;..\prebuilt\include\ParticleSystem\include;..\prebuilt\include\WindowManager\include;..\prebuilt\include\EffectManager\include;..\prebuilt\include\ScriptManager\include;..\prebuilt\include\RenderManager\include;..\prebuilt\include\GPUResourceManager\include;..\prebuilt\include\GUI\include;..\prebuilt\include\Thirdparty\toluapp-master\include;..\prebuilt\include\Thirdparty\lua-5.1.5\src;..\src;..;..\src\Lights;%(AdditionalIncludeDirectories) + ProgramDatabase + MaxSpeed + true + true + false + true + true + + + Windows + true + true + true + SushiCoreD3D12.lib;tolualibD3D12.lib;luaD3D12.lib;%(AdditionalDependencies) + \Lib\x64;..\prebuilt\bin\VS2015\x64;%(AdditionalLibraryDirectories) + VS2017\x64\SuTressFXPluginD3D12.lib + + + IF EXIST VS2017\x64\SuTressFXPluginD3D12.dll\ (xcopy /Q /E /Y /I VS2017\x64\SuTressFXPluginD3D12.dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I VS2017\x64\SuTressFXPluginD3D12.dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\build\VS2017\x64\$(TargetName).dll\ (xcopy /Q /E /Y /I ..\build\VS2017\x64\$(TargetName).dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\build\VS2017\x64\$(TargetName).dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\prebuilt\bin\VS2015\x64\SushiCoreD3D12.dll\ (xcopy /Q /E /Y /I ..\prebuilt\bin\VS2015\x64\SushiCoreD3D12.dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\prebuilt\bin\VS2015\x64\SushiCoreD3D12.dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\prebuilt\bin\VS2015\x64\luaD3D12.dll\ (xcopy /Q /E /Y /I ..\prebuilt\bin\VS2015\x64\luaD3D12.dll ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\prebuilt\bin\VS2015\x64\luaD3D12.dll ..\..\amd_tressfx_sample\bin\ > nul) +IF EXIST ..\prebuilt\bin\VS2015\x64\SushiD3D12.exe\ (xcopy /Q /E /Y /I ..\prebuilt\bin\VS2015\x64\SushiD3D12.exe ..\..\amd_tressfx_sample\bin\ > nul) ELSE (xcopy /Q /Y /I ..\prebuilt\bin\VS2015\x64\SushiD3D12.exe ..\..\amd_tressfx_sample\bin\ > nul) + Copying SuTressFXPlugin to Rel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {252C0AF0-91E1-82E5-1AD6-7CBC868A79E9} + + + + + + \ No newline at end of file diff --git a/amd_tressfx_sample/build/SuTressFXPluginD3D12_2017.vcxproj.filters b/amd_tressfx_sample/build/SuTressFXPluginD3D12_2017.vcxproj.filters new file mode 100644 index 0000000..6021785 --- /dev/null +++ b/amd_tressfx_sample/build/SuTressFXPluginD3D12_2017.vcxproj.filters @@ -0,0 +1,195 @@ + + + + + {6A15847C-564C-850D-FF38-6B10EB4E010F} + + + {24239CD4-90D8-14CA-19CD-0EA185810BCE} + + + {76B87FF9-62B1-9E4B-8BE3-83D0773B7E57} + + + {2DAB880B-99B4-887C-2230-9F7C8E38947C} + + + + + src + + + src + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + Demo\Lua Binding + + + src + + + src + + + src + + + src + + + + + src + + + src + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + Demo\Lights + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + Demo\Lua Binding + + + src + + + src + + + src + + + src + + + \ No newline at end of file diff --git a/amd_tressfx_sample/premake/premake5.lua b/amd_tressfx_sample/premake/premake5.lua index 4b4b404..7eb9dcf 100644 --- a/amd_tressfx_sample/premake/premake5.lua +++ b/amd_tressfx_sample/premake/premake5.lua @@ -14,11 +14,9 @@ if not _OPTIONS["gfxapi"] then _OPTIONS["gfxapi"] = "d3d12" end -WINDOWS_TARGET_SDK = "10.0.10240.0" API_SUFFIX = "D3D12" if _OPTIONS["gfxapi"] == "d3d11" then - WINDOWS_TARGET_SDK = "8.1" API_SUFFIX = "D3D11" end @@ -45,7 +43,7 @@ PLUGIN_DIR = "../" PLUGIN_SRC_DIR = PLUGIN_DIR.."src/" SUSHI_ROOT = "../prebuilt/" SUSHI_INCLUDE = "../prebuilt/include/" -SUSHI_BIN = "../prebuilt/bin/".._AMD_SHORT_DIR_LAYOUT.."/" +SUSHI_BIN = "../prebuilt/bin/VS2015/%{cfg.platform}/" EFFECT_ROOT = "..\\..\\" WORKING_DIR = EFFECT_ROOT.."amd_tressfx_sample\\bin\\" SUFFIX = API_SUFFIX @@ -60,7 +58,7 @@ workspace ("AMD_" .. _AMD_SAMPLE_NAME .. API_SUFFIX) symbols "On" architecture "x86_64" flags { "MultiProcessorCompile" } - systemversion (WINDOWS_TARGET_SDK) + systemversion (_AMD_WIN_SDK_VERSION) characterset "MBCS" location ("../build") startproject ("AMD_" .. _AMD_LIBRARY_NAME) @@ -85,7 +83,7 @@ workspace ("AMD_" .. _AMD_SAMPLE_NAME .. API_SUFFIX) filter "configurations:Release" defines { "NDEBUG" } - flags { "OptimizeSpeed" } + optimize "Speed" filter "options:gfxapi=d3d11" defines { "SU_3D_API_D3D11" } diff --git a/premake/amd_premake_util.lua b/premake/amd_premake_util.lua index 3b93979..3962235 100644 --- a/premake/amd_premake_util.lua +++ b/premake/amd_premake_util.lua @@ -22,6 +22,9 @@ _AMD_LIBRARY_DIR_LAYOUT_BACKSLASH = "%{_AMD_ACTION_ALL_CAPS}\\%{cfg.platform}\\% _AMD_SAMPLE_DIR_LAYOUT_MINIMAL = "Desktop%{_AMD_VS_SUFFIX}/minimal/%{cfg.platform}/%{cfg.buildcfg}" _AMD_LIBRARY_DIR_LAYOUT_MINIMAL = "%{_AMD_ACTION_ALL_CAPS}/minimal/%{cfg.platform}/%{cfg.buildcfg}" +-- Specify WindowsTargetPlatformVersion here for VS2015 and VS2017 +_AMD_WIN_SDK_VERSION = "8.1" + _AMD_COPY_WIN_10_SDK_REDIST_TO_BIN = "if not exist \"..\\bin\\d3dcompiler_47.dll\" if exist \"$(ProgramFiles)\\Windows Kits\\10\\Redist\\D3D\\x64\\d3dcompiler_47.dll\" xcopy \"$(ProgramFiles)\\Windows Kits\\10\\Redist\\D3D\\x64\\d3dcompiler_47.dll\" \"..\\bin\" /H /R /Y > nul" -- touch the import lib so that the sample build will know the library was updated diff --git a/premake/gpuopen_tressfx_update_vs_files.bat b/premake/gpuopen_tressfx_update_vs_files.bat index 6f03a00..a904296 100644 --- a/premake/gpuopen_tressfx_update_vs_files.bat +++ b/premake/gpuopen_tressfx_update_vs_files.bat @@ -30,16 +30,18 @@ goto :EOF -:: run premake for vs2013 and vs2015 +:: run premake for vs2015 and vs2017 :createvsfiles -..\..\premake\premake5.exe vs2013 ..\..\premake\premake5.exe vs2015 +..\..\premake\premake5.exe vs2017 goto :EOF :createvsfilesforallapis ..\..\premake\premake5.exe --gfxapi=d3d11 vs2015 +..\..\premake\premake5.exe --gfxapi=d3d11 vs2017 ..\..\premake\premake5.exe --gfxapi=d3d12 vs2015 +..\..\premake\premake5.exe --gfxapi=d3d12 vs2017 goto :EOF diff --git a/premake/premake5.exe b/premake/premake5.exe index fce9197..4c9f01f 100644 Binary files a/premake/premake5.exe and b/premake/premake5.exe differ