Skip to content

Commit 644ddd7

Browse files
Updated D3D1211On12 sample to use AgilitySDK (#931)
* Converted 11On12 sample * Update AgilitySDK version
1 parent fc2e476 commit 644ddd7

7 files changed

Lines changed: 26 additions & 4056 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ Samples/Desktop/D3D12HelloWorld/src/HelloVAEncode/*.h264
2727
/Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/treeModel.bin
2828
/Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/treeOMM.bin
2929
/Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/jacaranda_tree_4k.obj
30+
31+
/Samples/Desktop/**/x64

Samples/Desktop/D3D1211On12/src/D3D1211On12.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
#include "stdafx.h"
1313
#include "D3D1211On12.h"
1414

15+
extern "C" { __declspec(dllexport) extern const UINT D3D12SDKVersion = 618; }
16+
extern "C" { __declspec(dllexport) extern const char* D3D12SDKPath = u8".\\D3D12\\"; }
17+
1518
D3D1211on12::D3D1211on12(UINT width, UINT height, std::wstring name) :
1619
DXSample(width, height, name),
1720
m_frameIndex(0),

Samples/Desktop/D3D1211On12/src/D3D1211On12.vcxproj

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.props" Condition="Exists('packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.props')" />
34
<ItemGroup Label="ProjectConfigurations">
45
<ProjectConfiguration Include="Debug|x64">
56
<Configuration>Debug</Configuration>
@@ -59,7 +60,7 @@
5960
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6061
<SDLCheck>true</SDLCheck>
6162
<CompileAsWinRT>false</CompileAsWinRT>
62-
<MinimalRebuild>true</MinimalRebuild>
63+
<MinimalRebuild>false</MinimalRebuild>
6364
<AdditionalUsingDirectories>
6465
</AdditionalUsingDirectories>
6566
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -104,7 +105,6 @@
104105
<ItemGroup>
105106
<ClInclude Include="Win32Application.h" />
106107
<ClInclude Include="D3D1211On12.h" />
107-
<ClInclude Include="d3dx12.h" />
108108
<ClInclude Include="DXSample.h" />
109109
<ClInclude Include="DXSampleHelper.h" />
110110
<ClInclude Include="stdafx.h" />
@@ -119,7 +119,18 @@
119119
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
120120
</ClCompile>
121121
</ItemGroup>
122+
<ItemGroup>
123+
<None Include="packages.config" />
124+
</ItemGroup>
122125
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
123126
<ImportGroup Label="ExtensionTargets">
127+
<Import Project="packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.targets" Condition="Exists('packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.targets')" />
124128
</ImportGroup>
129+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
130+
<PropertyGroup>
131+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
132+
</PropertyGroup>
133+
<Error Condition="!Exists('packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.props'))" />
134+
<Error Condition="!Exists('packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Direct3D.D3D12.1.618.3\build\native\Microsoft.Direct3D.D3D12.targets'))" />
135+
</Target>
125136
</Project>

Samples/Desktop/D3D1211On12/src/D3D1211On12.vcxproj.filters

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
<ClInclude Include="D3D1211On12.h">
3333
<Filter>Header Files</Filter>
3434
</ClInclude>
35-
<ClInclude Include="d3dx12.h">
36-
<Filter>Header Files\Util</Filter>
37-
</ClInclude>
3835
<ClInclude Include="DXSample.h">
3936
<Filter>Header Files\Util</Filter>
4037
</ClInclude>
@@ -65,4 +62,7 @@
6562
<Filter>Source Files\Util</Filter>
6663
</ClCompile>
6764
</ItemGroup>
65+
<ItemGroup>
66+
<None Include="packages.config" />
67+
</ItemGroup>
6868
</Project>

0 commit comments

Comments
 (0)