Merge pull request #32 from ashleysmithgpu/master

Added Visual Studio 2017 project files, removed 2013 and below

Author: Rys Sommefeldt

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.

amd_tressfx/build/AMD_TressFX_2015.vcxproj

@@ -48,6 +48,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>AMD_TressFX</RootNamespace>
     <ProjectName>AMD_TressFX</ProjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL_Debug|Win32'" Label="Configuration">

amd_tressfx/build/AMD_TressFX_2015.vcxproj.filters

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="inc">

amd_tressfx/build/AMD_TressFX_2013.sln amd_tressfx/build/AMD_TressFX_2017.slnamd_tressfx/build/AMD_TressFX_2013.sln renamed to 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

…d_tressfx/build/AMD_TressFX_2013.vcxproj …d_tressfx/build/AMD_TressFX_2017.vcxprojamd_tressfx/build/AMD_TressFX_2013.vcxproj renamed to amd_tressfx/build/AMD_TressFX_2017.vcxproj amd_tressfx/build/AMD_TressFX_2013.vcxproj renamed to amd_tressfx/build/AMD_TressFX_2017.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="inc">

…x/build/AMD_TressFX_2013.vcxproj.filters …x/build/AMD_TressFX_2017.vcxproj.filtersamd_tressfx/build/AMD_TressFX_2013.vcxproj.filters renamed to amd_tressfx/build/AMD_TressFX_2017.vcxproj.filters amd_tressfx/build/AMD_TressFX_2013.vcxproj.filters renamed to amd_tressfx/build/AMD_TressFX_2017.vcxproj.filters

@@ -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" }

amd_tressfx/build/Windows10SDKVS13_x64.props

@@ -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