aboutsummaryrefslogtreecommitdiff
path: root/samples/dual_layer/D3D12
diff options
context:
space:
mode:
Diffstat (limited to 'samples/dual_layer/D3D12')
-rw-r--r--samples/dual_layer/D3D12/src/DeviceManager12.h1
-rw-r--r--samples/dual_layer/D3D12/src/SSAO12_2015.vcxproj10
2 files changed, 6 insertions, 5 deletions
diff --git a/samples/dual_layer/D3D12/src/DeviceManager12.h b/samples/dual_layer/D3D12/src/DeviceManager12.h
index e4b1e37..4a180e3 100644
--- a/samples/dual_layer/D3D12/src/DeviceManager12.h
+++ b/samples/dual_layer/D3D12/src/DeviceManager12.h
@@ -14,6 +14,7 @@
#include <D3D12.h>
#include <list>
#include <vector>
+#include <string>
#ifndef SAFE_RELEASE
#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p)=NULL; } }
diff --git a/samples/dual_layer/D3D12/src/SSAO12_2015.vcxproj b/samples/dual_layer/D3D12/src/SSAO12_2015.vcxproj
index 89e3f47..fe8e8d0 100644
--- a/samples/dual_layer/D3D12/src/SSAO12_2015.vcxproj
+++ b/samples/dual_layer/D3D12/src/SSAO12_2015.vcxproj
@@ -60,33 +60,33 @@
<ProjectGuid>{CFEEDBA7-74CF-4AF1-9A14-0E890CE94DF8}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>hbaop_dx12</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>SampleApp_D3D12</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>