From a45fd3bd7c01107b9bc7102453fea65a3b67220b Mon Sep 17 00:00:00 2001 From: shawnz Date: Mon, 21 Apr 2025 11:52:33 +0800 Subject: [PATCH 1/2] Bug 5199167: Fix the includes issue for 5_Domain_Specific\simpleD3D12 --- Samples/5_Domain_Specific/simpleD3D12/DX12CudaSample.h | 3 +++ Samples/5_Domain_Specific/simpleD3D12/DXSampleHelper.h | 6 ++++++ Samples/5_Domain_Specific/simpleD3D12/simpleD3D12.h | 7 +++++++ 3 files changed, 16 insertions(+) diff --git a/Samples/5_Domain_Specific/simpleD3D12/DX12CudaSample.h b/Samples/5_Domain_Specific/simpleD3D12/DX12CudaSample.h index 903ed717..bdf94a90 100644 --- a/Samples/5_Domain_Specific/simpleD3D12/DX12CudaSample.h +++ b/Samples/5_Domain_Specific/simpleD3D12/DX12CudaSample.h @@ -52,6 +52,9 @@ The MIT License (MIT) #pragma once +#include +#include + #include "DXSampleHelper.h" #include "Win32Application.h" diff --git a/Samples/5_Domain_Specific/simpleD3D12/DXSampleHelper.h b/Samples/5_Domain_Specific/simpleD3D12/DXSampleHelper.h index be069074..5f35da3c 100644 --- a/Samples/5_Domain_Specific/simpleD3D12/DXSampleHelper.h +++ b/Samples/5_Domain_Specific/simpleD3D12/DXSampleHelper.h @@ -52,7 +52,13 @@ The MIT License (MIT) #pragma once +// includes for Windows +#include // DirectX 12 header #include +#include // Windows Platform SDK - must come first +#include // For basic WRL support +#include // For ComPtr +#include // For Wrappers::FileHandle // Note that while ComPtr is used to manage the lifetime of resources on the // CPU, it has no understanding of the lifetime of resources on the GPU. Apps // must account for the GPU lifetime of resources to avoid destroying objects diff --git a/Samples/5_Domain_Specific/simpleD3D12/simpleD3D12.h b/Samples/5_Domain_Specific/simpleD3D12/simpleD3D12.h index 411dae86..66e291d1 100644 --- a/Samples/5_Domain_Specific/simpleD3D12/simpleD3D12.h +++ b/Samples/5_Domain_Specific/simpleD3D12/simpleD3D12.h @@ -27,8 +27,15 @@ #pragma once +#include +#include +#include +#include +#include + #include "DX12CudaSample.h" #include "ShaderStructs.h" +#include "d3dx12.h" using namespace DirectX; From 1680a1dc7ff959e8201b6fddfd5f48b4173fdebe Mon Sep 17 00:00:00 2001 From: Rob Armstrong Date: Mon, 21 Apr 2025 09:20:22 -0700 Subject: [PATCH 2/2] Update Windows FreeImage configuration instructions in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12f5d8fd..20e88526 100644 --- a/README.md +++ b/README.md @@ -343,7 +343,7 @@ These third-party dependencies are required by some CUDA samples. If available, FreeImage is an open source imaging library. FreeImage can usually be installed on Linux using your distribution's package manager system. FreeImage can also be downloaded from the FreeImage website. -To set up FreeImage on a Windows system, extract the FreeImage DLL distribution into the folder `../../../Common/FreeImage/Dist/x64` such that it contains the .h and .lib files. Copy the .dll file to the Release/ Debug/ execution folder or pass the FreeImage folder when cmake configuring with the `-DFREEIMAGE_INCLUDE_DIR` and `-DFREEIMAGE_LIBRARY` options. +To set up FreeImage on a Windows system, extract the FreeImage DLL distribution into the folder `./Common/FreeImage/Dist/x64` such that it contains the .h and .lib files. Copy the .dll file to the Release/ Debug/ execution folder or pass the FreeImage folder when cmake configuring with the `-DFreeImage_INCLUDE_DIR` and `-DFreeImage_LIBRARY` options. #### Message Passing Interface