Skip to content

Commit 26bf0cc

Browse files
amarpMSFTamarpMSFT
committed
sample updates
1 parent 5f6fe72 commit 26bf0cc

11 files changed

Lines changed: 37 additions & 44 deletions

File tree

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloShaderExecutionReordering/D3D12RaytracingHelloShaderExecutionReordering.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <atlbase.h>
1717
#include <vector>
1818

19-
extern "C" { __declspec(dllexport) extern const UINT D3D12SDKVersion = 717; }
19+
extern "C" { __declspec(dllexport) extern const UINT D3D12SDKVersion = 619; }
2020
extern "C" { __declspec(dllexport) extern const char* D3D12SDKPath = u8".\\D3D12\\"; }
2121

2222

@@ -156,9 +156,6 @@ D3D12RaytracingHelloShaderExecutionReordering::D3D12RaytracingHelloShaderExecuti
156156

157157
void D3D12RaytracingHelloShaderExecutionReordering::OnInit()
158158
{
159-
UUID Features[] = { D3D12ExperimentalShaderModels };
160-
ThrowIfFailed(D3D12EnableExperimentalFeatures(_countof(Features), Features, nullptr, nullptr));
161-
162159
m_deviceResources = std::make_unique<DeviceResources>(
163160
DXGI_FORMAT_R8G8B8A8_UNORM,
164161
DXGI_FORMAT_UNKNOWN,

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloShaderExecutionReordering/D3D12RaytracingHelloShaderExecutionReordering.vcxproj‎

Lines changed: 8 additions & 8 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.DXC.1.8.2505.28\build\native\Microsoft.Direct3D.DXC.props" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.8.2505.28\build\native\Microsoft.Direct3D.DXC.props')" />
4-
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.717.0-preview\build\native\Microsoft.Direct3D.D3D12.props" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.717.0-preview\build\native\Microsoft.Direct3D.D3D12.props')" />
3+
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.props" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.props')" />
4+
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.props" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.props')" />
55
<ItemGroup Label="ProjectConfigurations">
66
<ProjectConfiguration Include="Debug|x64">
77
<Configuration>Debug</Configuration>
@@ -187,17 +187,17 @@
187187
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
188188
<ImportGroup Label="ExtensionTargets">
189189
<Import Project="..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" />
190-
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.717.0-preview\build\native\Microsoft.Direct3D.D3D12.targets" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.717.0-preview\build\native\Microsoft.Direct3D.D3D12.targets')" />
191-
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.8.2505.28\build\native\Microsoft.Direct3D.DXC.targets" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.8.2505.28\build\native\Microsoft.Direct3D.DXC.targets')" />
190+
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.targets" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.targets')" />
191+
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.targets" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.targets')" />
192192
</ImportGroup>
193193
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
194194
<PropertyGroup>
195195
<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>
196196
</PropertyGroup>
197197
<Error Condition="!Exists('..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets'))" />
198-
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.717.0-preview\build\native\Microsoft.Direct3D.D3D12.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.717.0-preview\build\native\Microsoft.Direct3D.D3D12.props'))" />
199-
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.717.0-preview\build\native\Microsoft.Direct3D.D3D12.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.717.0-preview\build\native\Microsoft.Direct3D.D3D12.targets'))" />
200-
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.8.2505.28\build\native\Microsoft.Direct3D.DXC.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.8.2505.28\build\native\Microsoft.Direct3D.DXC.props'))" />
201-
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.8.2505.28\build\native\Microsoft.Direct3D.DXC.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.8.2505.28\build\native\Microsoft.Direct3D.DXC.targets'))" />
198+
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.props'))" />
199+
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.targets'))" />
200+
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.props'))" />
201+
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.targets'))" />
202202
</Target>
203203
</Project>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloShaderExecutionReordering/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Direct3D.D3D12" version="1.717.0-preview" targetFramework="native" />
4-
<package id="Microsoft.Direct3D.DXC" version="1.8.2505.28" targetFramework="native" />
3+
<package id="Microsoft.Direct3D.D3D12" version="1.619.0" targetFramework="native" />
4+
<package id="Microsoft.Direct3D.DXC" version="1.9.2602.17" targetFramework="native" />
55
<package id="WinPixEventRuntime" version="1.0.240308001" targetFramework="native" />
66
</packages>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +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')" />
3+
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.props" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.props')" />
44
<ItemGroup Label="ProjectConfigurations">
55
<ProjectConfiguration Include="Debug|x64">
66
<Configuration>Debug</Configuration>
@@ -189,14 +189,14 @@
189189
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
190190
<ImportGroup Label="ExtensionTargets">
191191
<Import Project="..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" />
192-
<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')" />
192+
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.targets" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.targets')" />
193193
</ImportGroup>
194194
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
195195
<PropertyGroup>
196196
<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>
197197
</PropertyGroup>
198198
<Error Condition="!Exists('..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets'))" />
199-
<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'))" />
200-
<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'))" />
199+
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.props'))" />
200+
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.targets'))" />
201201
</Target>
202202
</Project>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloWorld/packages.config‎

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.618.3" targetFramework="native" />
3+
<package id="Microsoft.Direct3D.D3D12" version="1.619.0" targetFramework="native" />
44
<package id="WinPixEventRuntime" version="1.0.240308001" targetFramework="native" />
55
</packages>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.vcxproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +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.616.0\build\native\Microsoft.Direct3D.D3D12.props" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.616.0\build\native\Microsoft.Direct3D.D3D12.props')" />
3+
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.props" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.props')" />
4+
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.props" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.props')" />
45
<ItemGroup Label="ProjectConfigurations">
56
<ProjectConfiguration Include="Debug|x64">
67
<Configuration>Debug</Configuration>
@@ -215,15 +216,18 @@
215216
<Import Project="..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" />
216217
<Import Project="..\..\..\..\..\Packages\directxtk12_desktop_2019.2024.10.29.1\build\native\directxtk12_desktop_2019.targets" Condition="Exists('..\..\..\..\..\Packages\directxtk12_desktop_2019.2024.10.29.1\build\native\directxtk12_desktop_2019.targets')" />
217218
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.WARP.1.0.15-preview\build\native\Microsoft.Direct3D.WARP.targets" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.WARP.1.0.15-preview\build\native\Microsoft.Direct3D.WARP.targets')" />
218-
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.616.0\build\native\Microsoft.Direct3D.D3D12.targets" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.616.0\build\native\Microsoft.Direct3D.D3D12.targets')" />
219+
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.targets" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.targets')" />
220+
<Import Project="..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.targets" Condition="Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.targets')" />
219221
</ImportGroup>
220222
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
221223
<PropertyGroup>
222224
<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>
223225
</PropertyGroup>
224226
<Error Condition="!Exists('..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\WinPixEventRuntime.1.0.240308001\build\WinPixEventRuntime.targets'))" />
225227
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.WARP.1.0.15-preview\build\native\Microsoft.Direct3D.WARP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.WARP.1.0.15-preview\build\native\Microsoft.Direct3D.WARP.targets'))" />
226-
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.616.0\build\native\Microsoft.Direct3D.D3D12.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.616.0\build\native\Microsoft.Direct3D.D3D12.props'))" />
227-
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.616.0\build\native\Microsoft.Direct3D.D3D12.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.616.0\build\native\Microsoft.Direct3D.D3D12.targets'))" />
228+
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.props'))" />
229+
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.619.0\build\native\Microsoft.Direct3D.D3D12.targets'))" />
230+
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.props'))" />
231+
<Error Condition="!Exists('..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Packages\Microsoft.Direct3D.DXC.1.9.2602.17\build\native\Microsoft.Direct3D.DXC.targets'))" />
228232
</Target>
229233
</Project>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/DeviceResources.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,6 @@ void DeviceResources::InitializeDXGIAdapter()
111111
ThrowIfFailed(CreateDXGIFactory1(IID_PPV_ARGS(&m_dxgiFactory)));
112112
}
113113

114-
115-
//std::vector<IID> experimentalFeatures;
116-
//experimentalFeatures.clear();
117-
//experimentalFeatures.push_back(D3D12RaytracingExperiment);
118-
//HRESULT expTierHR = SUCCEEDED(D3D12EnableExperimentalFeatures((UINT)experimentalFeatures.size(), experimentalFeatures.data(), nullptr, nullptr));
119-
120114
// Determines whether tearing support is available for fullscreen borderless windows.
121115
if (m_options & (c_AllowTearing | c_RequireTearingSupport))
122116
{

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="directxtk12_desktop_2019" version="2024.10.29.1" targetFramework="native" />
4-
<package id="Microsoft.Direct3D.D3D12" version="1.616.0" targetFramework="native" />
4+
<package id="Microsoft.Direct3D.D3D12" version="1.619.0" targetFramework="native" />
5+
<package id="Microsoft.Direct3D.DXC" version="1.9.2602.17" targetFramework="native" />
56
<package id="Microsoft.Direct3D.WARP" version="1.0.15-preview" targetFramework="native" />
67
<package id="WinPixEventRuntime" version="1.0.240308001" targetFramework="native" />
78
</packages>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "SharedCode.h"
2323
#include <random>
2424

25-
extern "C" { __declspec(dllexport) extern const UINT D3D12SDKVersion = 717; }
25+
extern "C" { __declspec(dllexport) extern const UINT D3D12SDKVersion = 619; }
2626
extern "C" { __declspec(dllexport) extern const char* D3D12SDKPath = u8".\\D3D12\\"; }
2727

2828
using namespace std;
@@ -172,9 +172,6 @@ D3D12RaytracingSakuraForestSER::D3D12RaytracingSakuraForestSER(UINT width, UINT
172172

173173
void D3D12RaytracingSakuraForestSER::OnInit()
174174
{
175-
UUID Features[] = { D3D12ExperimentalShaderModels };
176-
ThrowIfFailed(D3D12EnableExperimentalFeatures(_countof(Features), Features, nullptr, nullptr));
177-
178175
m_deviceResources = std::make_unique<DeviceResources>(
179176
DXGI_FORMAT_R8G8B8A8_UNORM,
180177
DXGI_FORMAT_UNKNOWN,

0 commit comments

Comments
 (0)