Skip to content

Commit bf2e880

Browse files
authored
Add mesh nodes sample (#879)
1 parent 7bda9a3 commit bf2e880

32 files changed

+1939
-27
lines changed

Samples/Desktop/D3D12HelloWorld/src/D3D12HelloWorld.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12WorkGraphsSandbox", "W
2727
EndProject
2828
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12HelloGenericPrograms", "HelloGenericPrograms\D3D12HelloGenericPrograms.vcxproj", "{7db43f09-7bd6-4e69-8987-9a919a142852}"
2929
EndProject
30+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12HelloMeshNodes", "HelloMeshNodes\D3D12HelloMeshNodes.vcxproj", "{b9680899-f009-406b-beee-d0214c1e7592}"
31+
EndProject
3032
Global
3133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3234
Debug|x64 = Debug|x64
@@ -81,6 +83,10 @@ Global
8183
{7db43f09-7bd6-4e69-8987-9a919a142852}.Debug|x64.Build.0 = Debug|x64
8284
{7db43f09-7bd6-4e69-8987-9a919a142852}.Release|x64.ActiveCfg = Release|x64
8385
{7db43f09-7bd6-4e69-8987-9a919a142852}.Release|x64.Build.0 = Release|x64
86+
{b9680899-f009-406b-beee-d0214c1e7592}.Debug|x64.ActiveCfg = Debug|x64
87+
{b9680899-f009-406b-beee-d0214c1e7592}.Debug|x64.Build.0 = Debug|x64
88+
{b9680899-f009-406b-beee-d0214c1e7592}.Release|x64.ActiveCfg = Release|x64
89+
{b9680899-f009-406b-beee-d0214c1e7592}.Release|x64.Build.0 = Release|x64
8490
EndGlobalSection
8591
GlobalSection(SolutionProperties) = preSolution
8692
HideSolutionNode = FALSE
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Direct3D.D3D12" version="1.613.1" targetFramework="native" />
3+
<package id="Microsoft.Direct3D.D3D12" version="1.614.1" targetFramework="native" />
44
</packages>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Direct3D.D3D12" version="1.613.1" targetFramework="native" />
3+
<package id="Microsoft.Direct3D.D3D12" version="1.614.1" targetFramework="native" />
44
</packages>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Direct3D.D3D12" version="1.613.1" targetFramework="native" />
3+
<package id="Microsoft.Direct3D.D3D12" version="1.614.1" targetFramework="native" />
44
</packages>

Samples/Desktop/D3D12HelloWorld/src/HelloGenericPrograms/D3D12HelloGenericPrograms.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <iostream>
3030
#include <atlbase.h>
3131

32-
extern "C" { __declspec(dllexport) extern const UINT D3D12SDKVersion = 613; }
32+
extern "C" { __declspec(dllexport) extern const UINT D3D12SDKVersion = 614; }
3333
extern "C" { __declspec(dllexport) extern const char* D3D12SDKPath = u8".\\D3D12\\"; }
3434

3535
HRESULT CompileDxilLibraryFromFile(

Samples/Desktop/D3D12HelloWorld/src/HelloGenericPrograms/D3D12HelloGenericPrograms.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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.614.1\build\native\Microsoft.Direct3D.D3D12.props" Condition="Exists('..\packages\Microsoft.Direct3D.D3D12.1.614.1\build\native\Microsoft.Direct3D.D3D12.props')" />
34
<Import Project="..\packages\Microsoft.Direct3D.DXC.1.8.2403.21\build\native\Microsoft.Direct3D.DXC.props" Condition="Exists('..\packages\Microsoft.Direct3D.DXC.1.8.2403.21\build\native\Microsoft.Direct3D.DXC.props')" />
4-
<Import Project="..\packages\Microsoft.Direct3D.D3D12.1.613.1\build\native\Microsoft.Direct3D.D3D12.props" Condition="Exists('..\packages\Microsoft.Direct3D.D3D12.1.613.1\build\native\Microsoft.Direct3D.D3D12.props')" />
55
<ItemGroup Label="ProjectConfigurations">
66
<ProjectConfiguration Include="Debug|x64">
77
<Configuration>Debug</Configuration>
@@ -142,16 +142,16 @@
142142
</ItemGroup>
143143
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
144144
<ImportGroup Label="ExtensionTargets">
145-
<Import Project="..\packages\Microsoft.Direct3D.D3D12.1.613.1\build\native\Microsoft.Direct3D.D3D12.targets" Condition="Exists('..\packages\Microsoft.Direct3D.D3D12.1.613.1\build\native\Microsoft.Direct3D.D3D12.targets')" />
146145
<Import Project="..\packages\Microsoft.Direct3D.DXC.1.8.2403.21\build\native\Microsoft.Direct3D.DXC.targets" Condition="Exists('..\packages\Microsoft.Direct3D.DXC.1.8.2403.21\build\native\Microsoft.Direct3D.DXC.targets')" />
146+
<Import Project="..\packages\Microsoft.Direct3D.D3D12.1.614.1\build\native\Microsoft.Direct3D.D3D12.targets" Condition="Exists('..\packages\Microsoft.Direct3D.D3D12.1.614.1\build\native\Microsoft.Direct3D.D3D12.targets')" />
147147
</ImportGroup>
148148
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
149149
<PropertyGroup>
150150
<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>
151151
</PropertyGroup>
152-
<Error Condition="!Exists('..\packages\Microsoft.Direct3D.D3D12.1.613.1\build\native\Microsoft.Direct3D.D3D12.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Direct3D.D3D12.1.613.1\build\native\Microsoft.Direct3D.D3D12.props'))" />
153-
<Error Condition="!Exists('..\packages\Microsoft.Direct3D.D3D12.1.613.1\build\native\Microsoft.Direct3D.D3D12.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Direct3D.D3D12.1.613.1\build\native\Microsoft.Direct3D.D3D12.targets'))" />
154152
<Error Condition="!Exists('..\packages\Microsoft.Direct3D.DXC.1.8.2403.21\build\native\Microsoft.Direct3D.DXC.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Direct3D.DXC.1.8.2403.21\build\native\Microsoft.Direct3D.DXC.props'))" />
155153
<Error Condition="!Exists('..\packages\Microsoft.Direct3D.DXC.1.8.2403.21\build\native\Microsoft.Direct3D.DXC.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Direct3D.DXC.1.8.2403.21\build\native\Microsoft.Direct3D.DXC.targets'))" />
154+
<Error Condition="!Exists('..\packages\Microsoft.Direct3D.D3D12.1.614.1\build\native\Microsoft.Direct3D.D3D12.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Direct3D.D3D12.1.614.1\build\native\Microsoft.Direct3D.D3D12.props'))" />
155+
<Error Condition="!Exists('..\packages\Microsoft.Direct3D.D3D12.1.614.1\build\native\Microsoft.Direct3D.D3D12.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Direct3D.D3D12.1.614.1\build\native\Microsoft.Direct3D.D3D12.targets'))" />
156156
</Target>
157157
</Project>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Direct3D.D3D12" version="1.613.1" targetFramework="native" />
3+
<package id="Microsoft.Direct3D.D3D12" version="1.614.1" targetFramework="native" />
44
<package id="Microsoft.Direct3D.DXC" version="1.8.2403.21" targetFramework="native" />
55
</packages>

0 commit comments

Comments
 (0)