Skip to content

Commit 1e800dc

Browse files
alecardoso-techalecardoso-tech
authored
Converted all samples to use AgilitySDK 1.618.3 (#932)
* Converted 11On12 sample * D3D12 Bundles converted * D3D12 Depth Bounds Test converted * D3D12 Dynamic Indexing converted * Updated PIX package * Updated PIX package * D3D12 Execute Indirect converted * D3D12 Fullscreen converted * D3D12 HDR converted * All D3D12 HelloWorld samples converted * D3D12 Heterogeneous Multiadapter converted * All D3D12 Linked GPUs samples converted * All D3D12 Mesh Shaders samples converted * D3D12 Multithreading converted * D3D12 nBody Gravity converted * D3D12 7on12 converted * D3D12 Pipeline State Cache converted * D3D12 Prediction Queries converted * All D3D12 Raytracing converted * D3D12 Reserved Resources converted * D3D12 Small Resources converted * D3D12 Residency converted * D3D12 SM6 Wave Intrinsics converted * D3D12 Variable Rate Shading converted * D3D12 xGPU converted * Added warning supression * Restore preview * Restore preview packages * Revert sln * Revert unneeded change * Revert sln * Update tight alignment again
1 parent 644ddd7 commit 1e800dc

197 files changed

Lines changed: 655 additions & 105050 deletions

File tree

Some content is hidden

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

‎MiniEngine/Core/Core.vcxproj‎

Lines changed: 4 additions & 0 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="16.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>
@@ -442,11 +443,14 @@
442443
</ItemDefinitionGroup>
443444
<ImportGroup Label="ExtensionTargets">
444445
<Import Project="..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" />
446+
<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')" />
445447
</ImportGroup>
446448
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
447449
<PropertyGroup>
448450
<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>
449451
</PropertyGroup>
450452
<Error Condition="!Exists('..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets'))" />
453+
<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'))" />
454+
<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'))" />
451455
</Target>
452456
</Project>

‎MiniEngine/Core/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Microsoft.Direct3D.D3D12" version="1.618.3" targetFramework="native" />
34
<package id="WinPixEventRuntime" version="1.0.240308001" targetFramework="native" />
45
</packages>

‎Samples/Desktop/D3D1211On12/src/D3D1211On12.vcxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,5 @@
124124
</ItemGroup>
125125
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
126126
<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')" />
128127
</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>
136128
</Project>

‎Samples/Desktop/D3D12Bundles/src/D3D12Bundles.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
#include "D3D12Bundles.h"
1414
#include "occcity.h"
1515

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

‎Samples/Desktop/D3D12Bundles/src/D3D12Bundles.vcxproj‎

Lines changed: 7 additions & 4 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>
@@ -111,7 +112,6 @@
111112
<ItemGroup>
112113
<ClInclude Include="Win32Application.h" />
113114
<ClInclude Include="D3D12Bundles.h" />
114-
<ClInclude Include="d3dx12.h" />
115115
<ClInclude Include="DXSample.h" />
116116
<ClInclude Include="DXSampleHelper.h" />
117117
<ClInclude Include="FrameResource.h" />
@@ -172,12 +172,15 @@
172172
</ItemGroup>
173173
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
174174
<ImportGroup Label="ExtensionTargets">
175-
<Import Project="$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets" Condition="Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets')" />
175+
<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')" />
176+
<Import Project="packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets" Condition="Exists('packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" />
176177
</ImportGroup>
177178
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
178179
<PropertyGroup>
179180
<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>
180181
</PropertyGroup>
181-
<Error Condition="!Exists('$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\WinPixEventRuntime.1.0.161208001\build\WinPixEventRuntime.targets'))" />
182+
<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'))" />
183+
<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'))" />
184+
<Error Condition="!Exists('packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets'))" />
182185
</Target>
183186
</Project>

‎Samples/Desktop/D3D12Bundles/src/D3D12Bundles.vcxproj.filters‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
<ClInclude Include="D3D12Bundles.h">
3131
<Filter>Header Files</Filter>
3232
</ClInclude>
33-
<ClInclude Include="d3dx12.h">
34-
<Filter>Header Files\Util</Filter>
35-
</ClInclude>
3633
<ClInclude Include="DXSample.h">
3734
<Filter>Header Files\Util</Filter>
3835
</ClInclude>

0 commit comments

Comments
 (0)