Skip to content

Commit f50d4c0

Browse files
authored
Merge pull request microsoft#188 from Microsoft/develop
Updating samples for the Windows 10 Anniversary Update
2 parents 45b208c + 1fb2474 commit f50d4c0

File tree

194 files changed

+23421
-1036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+23421
-1036
lines changed

Libraries/D3DX12AffinityLayer/Desktop/D3DX12AffinityLayer.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ProjectGuid>{B2283BA1-603B-4360-AE99-7A3F5912BC42}</ProjectGuid>
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>D3DX12AffinityLayer</RootNamespace>
17-
<WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

Libraries/D3DX12AffinityLayer/Desktop/d3dx12.h

Lines changed: 412 additions & 0 deletions
Large diffs are not rendered by default.

Libraries/D3DX12AffinityLayer/UWP/D3DX12AffinityLayer.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
3636
<AppContainerApplication>true</AppContainerApplication>
3737
<ApplicationType>Windows Store</ApplicationType>
38-
<WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
38+
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
3939
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
4040
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
4141
</PropertyGroup>

Libraries/D3DX12AffinityLayer/UWP/d3dx12.h

Lines changed: 412 additions & 0 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ It came from a desire to quickly dive into graphics and performance experiments.
2828

2929
## Requirements
3030
* Windows 10
31-
* Visual Studio 2015 with the Windows 10 SDK
31+
* [Visual Studio 2015](https://www.visualstudio.com/) with the [Windows 10 Anniversary Update SDK](https://go.microsoft.com/fwlink/p/?LinkID=822845)
3232

3333
## Contributing
3434
We're always looking for your help to fix bugs and improve the samples. File those pull requests and we'll be happy to take a look.
3535

3636
Find more information on DirectX 12 on our blog: http://blogs.msdn.com/b/directx/
3737

38+
Troubleshooting information for this repository can be found in the site [Wiki](https://github.com/Microsoft/DirectX-Graphics-Samples/wiki).
39+
3840
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

Samples/Desktop/D3D1211On12/src/D3D1211On12.vcxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>D3D1211On12</RootNamespace>
1717
<ProjectName>D3D1211On12</ProjectName>
18-
<WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
18+
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
1919
</PropertyGroup>
2020
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -67,6 +67,7 @@
6767
<Link>
6868
<GenerateDebugInformation>true</GenerateDebugInformation>
6969
<AdditionalDependencies>d3dcompiler.lib;d2d1.lib;dwrite.lib;d3d11.lib;d3d12.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
70+
<DelayLoadDLLs>d3d12.dll</DelayLoadDLLs>
7071
</Link>
7172
</ItemDefinitionGroup>
7273
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -85,6 +86,7 @@
8586
<EnableCOMDATFolding>true</EnableCOMDATFolding>
8687
<OptimizeReferences>true</OptimizeReferences>
8788
<AdditionalDependencies>d3dcompiler.lib;d2d1.lib;dwrite.lib;d3d11.lib;d3d12.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
89+
<DelayLoadDLLs>d3d12.dll</DelayLoadDLLs>
8890
</Link>
8991
</ItemDefinitionGroup>
9092
<ItemGroup>

0 commit comments

Comments
 (0)