From 28aba7d5d7e7557c0d733300b79ac8183a8f0963 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 8 Jul 2026 14:24:41 -0700 Subject: [PATCH 01/10] Add ARM64 native build configuration to D3D12Raytracing samples Add ARM64 solution platform to D3D12Raytracing.slnx and ARM64 Debug/Release project configurations to all standalone raytracing sample projects, mirroring the existing x64 configurations. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../D3D12OMMOfflineBaker.vcxproj | 67 +++++++- .../D3D12Raytracing/src/D3D12Raytracing.slnx | 1 + ...cingHelloShaderExecutionReordering.vcxproj | 138 +++++++++++++++ .../D3D12RaytracingHelloWorld.vcxproj | 136 +++++++++++++++ .../D3D12RaytracingLibrarySubobjects.vcxproj | 157 ++++++++++++++++++ .../D3D12RaytracingOpacityMicromaps.vcxproj | 150 +++++++++++++++++ .../D3D12RaytracingProceduralGeometry.vcxproj | 149 +++++++++++++++++ .../D3D12RaytracingSakuraForestSER.vcxproj | 149 +++++++++++++++++ .../D3D12RaytracingSimpleLighting.vcxproj | 145 ++++++++++++++++ 9 files changed, 1091 insertions(+), 1 deletion(-) diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/D3D12OMMOfflineBaker.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/D3D12OMMOfflineBaker.vcxproj index 3a26b89eb..9144acf7c 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/D3D12OMMOfflineBaker.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/D3D12OMMOfflineBaker.vcxproj @@ -1,4 +1,4 @@ - + @@ -13,10 +13,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + 17.0 @@ -45,6 +53,12 @@ v143 Unicode + + Application + true + v143 + Unicode + Application false @@ -52,6 +66,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -66,18 +87,32 @@ + + + + + + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Level3 @@ -119,6 +154,19 @@ $(CoreLibraryDependencies);%(AdditionalDependencies) + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + $(CoreLibraryDependencies);%(AdditionalDependencies) + + Level3 @@ -136,6 +184,23 @@ $(CoreLibraryDependencies);%(AdditionalDependencies) + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + $(CoreLibraryDependencies);%(AdditionalDependencies) + + diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12Raytracing.slnx b/Samples/Desktop/D3D12Raytracing/src/D3D12Raytracing.slnx index 1d147a636..869b88d08 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12Raytracing.slnx +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12Raytracing.slnx @@ -4,6 +4,7 @@ + diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloShaderExecutionReordering/D3D12RaytracingHelloShaderExecutionReordering.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloShaderExecutionReordering/D3D12RaytracingHelloShaderExecutionReordering.vcxproj index 81411f027..adaaa5e22 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloShaderExecutionReordering/D3D12RaytracingHelloShaderExecutionReordering.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloShaderExecutionReordering/D3D12RaytracingHelloShaderExecutionReordering.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {390A4D56-FF1B-4CA0-81CA-AC8ED273BFC9} @@ -26,6 +34,12 @@ v143 Unicode + + Application + true + v143 + Unicode + Application false @@ -33,15 +47,28 @@ true Unicode + + Application + false + v143 + true + Unicode + + + + + + + true @@ -55,6 +82,18 @@ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + + false bin\$(Platform)\$(Configuration)\ @@ -66,6 +105,17 @@ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + Use @@ -118,6 +168,58 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\;$(IntDir);%(AdditionalIncludeDirectories) + false + + + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + + + + + + + + + + + + + + + + + + + + + + + Level3 @@ -150,6 +252,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\;$(IntDir);%(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -171,7 +305,9 @@ Create + Create Create + Create @@ -181,7 +317,9 @@ true + true true + true diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj index cc5eaad27..b9ebc599c 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj @@ -6,10 +6,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {5018F6A3-6533-4744-B1FD-727D199FD2E9} @@ -25,6 +33,12 @@ v143 Unicode + + Application + true + v143 + Unicode + Application false @@ -32,15 +46,28 @@ true Unicode + + Application + false + v143 + true + Unicode + + + + + + + true @@ -54,6 +81,18 @@ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + + false bin\$(Platform)\$(Configuration)\ @@ -65,6 +104,17 @@ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + Use @@ -117,6 +167,58 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\;$(IntDir);%(AdditionalIncludeDirectories) + false + + + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + + + + + + + + + + + + + + + + + + + + + + + Level3 @@ -149,6 +251,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\;$(IntDir);%(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -169,7 +303,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingLibrarySubobjects/D3D12RaytracingLibrarySubobjects.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingLibrarySubobjects/D3D12RaytracingLibrarySubobjects.vcxproj index 7b2d1e7a0..d27a45655 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingLibrarySubobjects/D3D12RaytracingLibrarySubobjects.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingLibrarySubobjects/D3D12RaytracingLibrarySubobjects.vcxproj @@ -6,10 +6,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {0AF699F0-99A8-4493-9FF7-1FFDE2900100} @@ -25,6 +33,12 @@ v143 Unicode + + Application + true + v143 + Unicode + Application false @@ -32,15 +46,28 @@ true Unicode + + Application + false + v143 + true + Unicode + + + + + + + true @@ -54,6 +81,18 @@ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + + false bin\$(Platform)\$(Configuration)\ @@ -66,6 +105,18 @@ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + + Use @@ -118,6 +169,58 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\;$(IntDir);%(AdditionalIncludeDirectories) + false + + + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + + + + + + + + + + + + + + + + + + + + + + + Level3 @@ -170,6 +273,58 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\;$(IntDir);%(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + + + + + + + + + + + + + + + + + + + + + @@ -190,7 +345,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.vcxproj index edabe215b..fd4cad0ee 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {A62C42DA-DAFA-47DB-B370-D2EC5DAB762D} @@ -22,6 +30,9 @@ .\D3D12\ + + .\D3D12\ + Application @@ -29,6 +40,12 @@ v143 Unicode + + Application + true + v143 + Unicode + Application false @@ -36,15 +53,28 @@ true Unicode + + Application + false + v143 + true + Unicode + + + + + + + true @@ -58,6 +88,18 @@ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + + false bin\$(Platform)\$(Configuration)\ @@ -70,6 +112,18 @@ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + + Use @@ -118,6 +172,54 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\;$(IntDir);..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.616.0\build\native\include;..\..\..\..\..\\Packages\directxtex_desktop_win10.2024.10.29.1\include;%(AdditionalIncludeDirectories) + false + + + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + + + + + + + + + + + + + + + + + + + Level3 @@ -162,6 +264,50 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\;$(IntDir);..\..\..\..\..\Packages\Microsoft.Direct3D.D3D12.1.616.0\build\native\include;..\..\..\..\..\\Packages\directxtex_desktop_win10.2024.10.29.1\include;%(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + + + + + + + + + + + + + @@ -183,7 +329,9 @@ Create + Create Create + Create @@ -196,7 +344,9 @@ $(IntDir)CompiledShaders\%(Filename).hlsl.h /Zpr %(AdditionalOptions) 6.6 + 6.6 6.6 + 6.6 diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingProceduralGeometry/D3D12RaytracingProceduralGeometry.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingProceduralGeometry/D3D12RaytracingProceduralGeometry.vcxproj index a1c994448..92a0cd016 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingProceduralGeometry/D3D12RaytracingProceduralGeometry.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingProceduralGeometry/D3D12RaytracingProceduralGeometry.vcxproj @@ -6,10 +6,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {0C266269-AC0C-41B0-9D25-0117DC23CFC7} @@ -25,6 +33,12 @@ v143 Unicode + + Application + true + v143 + Unicode + Application false @@ -32,15 +46,28 @@ true Unicode + + Application + false + v143 + true + Unicode + + + + + + + true @@ -54,6 +81,18 @@ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + + false bin\$(Platform)\$(Configuration)\ @@ -66,6 +105,18 @@ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + + Use @@ -113,6 +164,53 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + util;..\;$(IntDir);%(AdditionalIncludeDirectories) + false + + + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + -HV 2021 %(AdditionalOptions) + + + + + + + + + + + + + + + + + + Level3 @@ -162,6 +260,55 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + util;..\;$(IntDir);%(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + -HV 2021 %(AdditionalOptions) + + + + + + + + + + + + + + + + + + @@ -187,7 +334,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.vcxproj index d22414938..9c8776632 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {8A6F63FD-E766-476B-9748-9C14737297B7} @@ -26,6 +34,12 @@ v143 Unicode + + Application + true + v143 + Unicode + Application false @@ -33,15 +47,28 @@ true Unicode + + Application + false + v143 + true + Unicode + + + + + + + true @@ -55,6 +82,18 @@ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + + false bin\$(Platform)\$(Configuration)\ @@ -67,6 +106,18 @@ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + + Use @@ -117,6 +168,56 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\;$(IntDir);%(AdditionalIncludeDirectories) + false + + + stdcpp17 + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + 4.0_level_9_3 + + + + + + + + + + + + + + + + + + + + Level3 @@ -161,6 +262,50 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\;$(IntDir);%(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + + + + + + + + + + + + + @@ -186,7 +331,9 @@ Create + Create Create + Create @@ -199,7 +346,9 @@ $(IntDir)CompiledShaders\%(Filename).hlsl.h /Zpr %(AdditionalOptions) 6.9 + 6.9 true + true diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSimpleLighting/D3D12RaytracingSimpleLighting.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSimpleLighting/D3D12RaytracingSimpleLighting.vcxproj index 8516f8c3c..4abdbfd9f 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSimpleLighting/D3D12RaytracingSimpleLighting.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSimpleLighting/D3D12RaytracingSimpleLighting.vcxproj @@ -6,10 +6,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {A0848C98-F5AA-431C-9E76-7F1E7EFA368C} @@ -25,6 +33,12 @@ v143 Unicode + + Application + true + v143 + Unicode + Application false @@ -32,15 +46,28 @@ true Unicode + + Application + false + v143 + true + Unicode + + + + + + + true @@ -54,6 +81,18 @@ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + + false bin\$(Platform)\$(Configuration)\ @@ -66,6 +105,18 @@ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + + + + + + Use @@ -114,6 +165,54 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\;$(IntDir);%(AdditionalIncludeDirectories) + false + + + + + Windows + true + d3d12.lib;dxgi.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + + + + + + + + + + + + + + + + + + + Level3 @@ -158,6 +257,50 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\;$(IntDir);%(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + + + + + + + + + + + + + @@ -178,7 +321,9 @@ Create + Create Create + Create From d8f236bb65a87517c1395da2349c42da45b1119f Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 8 Jul 2026 14:24:47 -0700 Subject: [PATCH 02/10] Fix XMVECTOR aggregate initialization for ARM64 On ARM64 XMVECTOR maps to __n128, which does not accept the { x, y, z, w } aggregate initializer that works for __m128 on x64. Replace those brace initializations with XMVectorSet(), which is portable across architectures and behavior-identical on x64. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../D3D12RaytracingLibrarySubobjects.cpp | 6 +++--- .../D3D12RaytracingOpacityMicromaps.cpp | 6 +++--- .../D3D12RaytracingProceduralGeometry.cpp | 6 +++--- .../D3D12RaytracingSakuraForestSER.cpp | 14 +++++++------- .../D3D12RaytracingSimpleLighting.cpp | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingLibrarySubobjects/D3D12RaytracingLibrarySubobjects.cpp b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingLibrarySubobjects/D3D12RaytracingLibrarySubobjects.cpp index 42fc1695a..f1d1ad020 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingLibrarySubobjects/D3D12RaytracingLibrarySubobjects.cpp +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingLibrarySubobjects/D3D12RaytracingLibrarySubobjects.cpp @@ -100,9 +100,9 @@ void D3D12RaytracingLibrarySubobjects::InitializeScene() // Setup camera. { // Initialize the view and projection inverse matrices. - m_eye = { 0.0f, 2.0f, -5.0f, 1.0f }; - m_at = { 0.0f, 0.0f, 0.0f, 1.0f }; - XMVECTOR right = { 1.0f, 0.0f, 0.0f, 0.0f }; + m_eye = XMVectorSet(0.0f, 2.0f, -5.0f, 1.0f); + m_at = XMVectorSet(0.0f, 0.0f, 0.0f, 1.0f); + XMVECTOR right = XMVectorSet(1.0f, 0.0f, 0.0f, 0.0f); XMVECTOR direction = XMVector4Normalize(m_at - m_eye); m_up = XMVector3Normalize(XMVector3Cross(direction, right)); diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.cpp b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.cpp index 58791be73..fafb5cfe4 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.cpp +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.cpp @@ -98,9 +98,9 @@ void D3D12RaytracingOpacityMicromaps::InitializeScene() // Setup camera. { // Initialize the view and projection inverse matrices. - m_eye = { 0.0f, 7.0f, -24.0f, 1.0f }; - m_at = { 0.0f, 8.7f, 0.0f, 1.0f }; - XMVECTOR right = { 1.0f, 0.0f, 0.0f, 0.0f }; + m_eye = XMVectorSet(0.0f, 7.0f, -24.0f, 1.0f); + m_at = XMVectorSet(0.0f, 8.7f, 0.0f, 1.0f); + XMVECTOR right = XMVectorSet(1.0f, 0.0f, 0.0f, 0.0f); XMVECTOR direction = XMVector4Normalize(m_at - m_eye); m_up = XMVector3Normalize(XMVector3Cross(direction, right)); diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingProceduralGeometry/D3D12RaytracingProceduralGeometry.cpp b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingProceduralGeometry/D3D12RaytracingProceduralGeometry.cpp index 3fa8d1c83..ca926ee52 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingProceduralGeometry/D3D12RaytracingProceduralGeometry.cpp +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingProceduralGeometry/D3D12RaytracingProceduralGeometry.cpp @@ -229,9 +229,9 @@ void D3D12RaytracingProceduralGeometry::InitializeScene() // Setup camera. { // Initialize the view and projection inverse matrices. - m_eye = { 0.0f, 5.3f, -17.0f, 1.0f }; - m_at = { 0.0f, 0.0f, 0.0f, 1.0f }; - XMVECTOR right = { 1.0f, 0.0f, 0.0f, 0.0f }; + m_eye = XMVectorSet(0.0f, 5.3f, -17.0f, 1.0f); + m_at = XMVectorSet(0.0f, 0.0f, 0.0f, 1.0f); + XMVECTOR right = XMVectorSet(1.0f, 0.0f, 0.0f, 0.0f); XMVECTOR direction = XMVector4Normalize(m_at - m_eye); m_up = XMVector3Normalize(XMVector3Cross(direction, right)); diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.cpp b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.cpp index 7b7839c9b..07ec22340 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.cpp +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.cpp @@ -223,9 +223,9 @@ void D3D12RaytracingSakuraForestSER::InitializeScene() { // Initialize the view and projection inverse matrices. // m_eye currently at the middle of the forest - m_eye = { 0.0f, 2.2f, -2.0f, 1.0f }; - m_at = { 1.0f, 2.5f, -6.0f, 1.0f }; - XMVECTOR right = { 1.0f, 0.0f, 0.0f, 0.0f }; + m_eye = XMVectorSet(0.0f, 2.2f, -2.0f, 1.0f); + m_at = XMVectorSet(1.0f, 2.5f, -6.0f, 1.0f); + XMVECTOR right = XMVectorSet(1.0f, 0.0f, 0.0f, 0.0f); XMVECTOR direction = XMVector4Normalize(m_at - m_eye); m_up = XMVector3Normalize(XMVector3Cross(direction, right)); @@ -235,7 +235,7 @@ void D3D12RaytracingSakuraForestSER::InitializeScene() m_eye = XMVector3Transform(m_eye, rotate); // Keep the camera upright - m_up = { 0.0f, 1.0f, 0.0f, 0.0f }; + m_up = XMVectorSet(0.0f, 1.0f, 0.0f, 0.0f); UpdateCameraMatrices(); } @@ -785,9 +785,9 @@ void D3D12RaytracingSakuraForestSER::BuildTreeGeometry() std::vector bushIndices; { - XMVECTOR xAxis = { 1, 0, 0 }; - XMVECTOR yAxis = { 0, 1, 0 }; - XMVECTOR zAxis = { 0, 0, 1 }; + XMVECTOR xAxis = XMVectorSet(1, 0, 0, 0); + XMVECTOR yAxis = XMVectorSet(0, 1, 0, 0); + XMVECTOR zAxis = XMVectorSet(0, 0, 1, 0); XMMATRIX transform = XMMatrixRotationAxis(xAxis, 3.14159f / 2.0f) * XMMatrixRotationAxis(yAxis, 3.14159f / 12.0f) * XMMatrixRotationAxis(zAxis, 3.14159f) * XMMatrixTranslation(-1.5f, 0, 0); m_ObjModelLoader.GetObjectVerticesAndIndices( "tree", diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSimpleLighting/D3D12RaytracingSimpleLighting.cpp b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSimpleLighting/D3D12RaytracingSimpleLighting.cpp index f2c3ac1ca..c73fc42d3 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSimpleLighting/D3D12RaytracingSimpleLighting.cpp +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSimpleLighting/D3D12RaytracingSimpleLighting.cpp @@ -88,9 +88,9 @@ void D3D12RaytracingSimpleLighting::InitializeScene() // Setup camera. { // Initialize the view and projection inverse matrices. - m_eye = { 0.0f, 2.0f, -5.0f, 1.0f }; - m_at = { 0.0f, 0.0f, 0.0f, 1.0f }; - XMVECTOR right = { 1.0f, 0.0f, 0.0f, 0.0f }; + m_eye = XMVectorSet(0.0f, 2.0f, -5.0f, 1.0f); + m_at = XMVectorSet(0.0f, 0.0f, 0.0f, 1.0f); + XMVECTOR right = XMVectorSet(1.0f, 0.0f, 0.0f, 0.0f); XMVECTOR direction = XMVector4Normalize(m_at - m_eye); m_up = XMVector3Normalize(XMVector3Cross(direction, right)); From 4291394452c5f0d0e0ff198756000177bc9dfc71 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 8 Jul 2026 15:05:57 -0700 Subject: [PATCH 03/10] Enable ARM64 platform and float toolset/SDK across desktop samples Add ARM64 solution platforms and per-project ARM64 Debug/Release configurations to all standalone desktop samples (Samples/Desktop, TechniqueDemos, Tools), mirroring the existing x64 configurations. Also float the previously hard-pinned toolset and SDK so the samples build with the installed Visual Studio. Set to $(DefaultPlatformToolset) rather than removing it: a bare removal makes x64 fall back to the ancient v100 toolset (ARM64 happens to resolve to v143), so an explicit floating value is required. Retarget to 10.0 (latest installed). The old v140/v141/v142 and fixed SDK pins referenced toolsets/SDKs not present in current VS installs and blocked building on both x64 and ARM64. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../Desktop/D3DX12AffinityLayer.vcxproj | 75 ++++- .../UWP/D3DX12AffinityLayer.vcxproj | 77 ++++- .../Desktop/D3D1211On12/src/D3D1211On12.slnx | 1 + .../D3D1211On12/src/D3D1211On12.vcxproj | 89 +++++- .../D3D12Bundles/src/D3D12Bundles.slnx | 1 + .../D3D12Bundles/src/D3D12Bundles.vcxproj | 120 +++++++- .../src/D3D12DepthBoundsTest.slnx | 1 + .../src/D3D12DepthBoundsTest.vcxproj | 107 ++++++- .../src/D3D12DynamicIndexing.slnx | 1 + .../src/D3D12DynamicIndexing.vcxproj | 114 ++++++- .../src/D3D12ExecuteIndirect.slnx | 1 + .../src/D3D12ExecuteIndirect.vcxproj | 117 ++++++- .../D3D12Fullscreen/src/D3D12Fullscreen.slnx | 1 + .../src/D3D12Fullscreen.vcxproj | 125 +++++++- Samples/Desktop/D3D12HDR/src/D3D12HDR.slnx | 1 + Samples/Desktop/D3D12HDR/src/D3D12HDR.vcxproj | 130 +++++++- .../D3D12HelloWorld/src/D3D12HelloWorld.slnx | 1 + .../HelloBundles/D3D12HelloBundles.vcxproj | 121 +++++++- .../D3D12HelloConstBuffers.vcxproj | 121 +++++++- .../D3D12HelloFrameBuffering.vcxproj | 121 +++++++- .../D3D12HelloGenericPrograms.vcxproj | 103 ++++++- .../D3D12HelloMeshNodes.vcxproj | 103 ++++++- .../D3D12HelloPartialGraphicsPrograms.vcxproj | 105 ++++++- .../HelloTexture/D3D12HelloTexture.vcxproj | 121 +++++++- .../D3D12HelloTightAlignment.vcxproj | 67 +++- .../HelloTriangle/D3D12HelloTriangle.vcxproj | 121 +++++++- .../HelloVADecode/D3D12HelloVADecode.vcxproj | 114 ++++++- .../HelloVAEncode/D3D12HelloVAEncode.vcxproj | 114 ++++++- .../D3D12HelloVAResourceInterop.vcxproj | 114 ++++++- .../src/HelloWindow/D3D12HelloWindow.vcxproj | 113 ++++++- .../D3D12HelloWorkGraphs.vcxproj | 101 +++++- .../D3D12WorkGraphsSandbox.vcxproj | 101 +++++- .../src/D3D12HeterogeneousMultiadapter.slnx | 1 + .../D3D12HeterogeneousMultiadapter.vcxproj | 121 +++++++- .../D3D12LinkedGpus/src/D3D12LinkedGpus.slnx | 1 + .../D3DX12AffinityLayer.vcxproj | 75 ++++- .../src/LinkedGpus/D3D12LinkedGpus.vcxproj | 115 ++++++- .../D3D12LinkedGpusAffinity.vcxproj | 111 ++++++- .../src/SingleGpu/D3D12SingleGpu.vcxproj | 113 ++++++- .../src/D3D12MeshShaders.slnx | 1 + .../src/DynamicLOD/D3D12DynamicLOD.vcxproj | 100 +++++- .../src/MeshletCull/D3D12MeshletCull.vcxproj | 122 +++++++- .../D3D12MeshletGenerator.vcxproj | 63 +++- .../D3D12MeshletInstancing.vcxproj | 98 +++++- .../MeshletRender/D3D12MeshletRender.vcxproj | 94 +++++- .../D3D12WavefrontConverter.vcxproj | 82 ++++- .../src/D3D12Multithreading.slnx | 1 + .../src/D3D12Multithreading.vcxproj | 109 ++++++- Samples/Desktop/D3D12On7/src/D3D12On7.slnx | 1 + Samples/Desktop/D3D12On7/src/D3D12On7.vcxproj | 107 ++++++- .../src/D3D12PipelineStateCache.slnx | 1 + .../src/D3D12PipelineStateCache.vcxproj | 290 +++++++++++++++++- .../src/D3D12PredicationQueries.slnx | 1 + .../src/D3D12PredicationQueries.vcxproj | 109 ++++++- .../src/D3D12ReservedResources.slnx | 1 + .../src/D3D12ReservedResources.vcxproj | 109 ++++++- .../D3D12Residency/src/D3D12Residency.slnx | 1 + .../D3D12Residency/src/D3D12Residency.vcxproj | 89 +++++- .../src/D3D12SM6WaveIntrinsics.slnx | 1 + .../src/D3D12SM6WaveIntrinsics.vcxproj | 109 ++++++- .../src/D3D12SmallResources.slnx | 1 + .../src/D3D12SmallResources.vcxproj | 109 ++++++- .../src/D3D12StateObjectDatabase Sample.slnx | 1 + .../src/StateObjectDatabase Sample.vcxproj | 167 +++++++++- .../src/D3D12VariableRateShading.slnx | 1 + .../src/D3D12VariableRateShading.vcxproj | 158 +++++++++- .../src/D3D12nBodyGravity.slnx | 1 + .../src/D3D12nBodyGravity.vcxproj | 119 ++++++- Samples/Desktop/D3D12xGPU/src/D3D12xGPU.slnx | 1 + .../Desktop/D3D12xGPU/src/D3D12xGPU.vcxproj | 132 +++++++- .../src/D3D12MemoryManagement.slnx | 1 + .../src/D3D12MemoryManagement.vcxproj | 115 ++++++- .../src/DXGIAdapterRemovalSupportTest.slnx | 1 + .../src/DXGIAdapterRemovalSupportTest.vcxproj | 83 ++++- 74 files changed, 5372 insertions(+), 146 deletions(-) diff --git a/Libraries/D3DX12AffinityLayer/Desktop/D3DX12AffinityLayer.vcxproj b/Libraries/D3DX12AffinityLayer/Desktop/D3DX12AffinityLayer.vcxproj index 9997e2146..00a635ade 100644 --- a/Libraries/D3DX12AffinityLayer/Desktop/D3DX12AffinityLayer.vcxproj +++ b/Libraries/D3DX12AffinityLayer/Desktop/D3DX12AffinityLayer.vcxproj @@ -5,28 +5,49 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {B2283BA1-603B-4360-AE99-7A3F5912BC42} Win32Proj D3DX12AffinityLayer - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + StaticLibrary + true + Unicode + + + $(DefaultPlatformToolset) StaticLibrary true - v142 Unicode + $(DefaultPlatformToolset) + StaticLibrary + false + true + Unicode + + + $(DefaultPlatformToolset) StaticLibrary false - v142 true Unicode @@ -38,20 +59,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -65,6 +102,19 @@ Windows + + + Use + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + + d3dx12affinity.h + Level3 + + + Windows + + Use @@ -82,6 +132,23 @@ true + + + Use + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + + d3dx12affinity.h + Level3 + + + Windows + true + true + + @@ -126,7 +193,9 @@ Create + Create Create + Create diff --git a/Libraries/D3DX12AffinityLayer/UWP/D3DX12AffinityLayer.vcxproj b/Libraries/D3DX12AffinityLayer/UWP/D3DX12AffinityLayer.vcxproj index 4b3e6dcae..147da58aa 100644 --- a/Libraries/D3DX12AffinityLayer/UWP/D3DX12AffinityLayer.vcxproj +++ b/Libraries/D3DX12AffinityLayer/UWP/D3DX12AffinityLayer.vcxproj @@ -13,6 +13,10 @@ Debug x64 + + Debug + ARM64 + Release ARM @@ -25,6 +29,10 @@ Release x64 + + Release + ARM64 + {dbfb5d41-279e-4906-aa95-4cb9d94e6428} @@ -35,43 +43,54 @@ 14.0 true Windows Store - 10.0.19041.0 + 10.0 10.0.17763.0 10.0 + $(DefaultPlatformToolset) StaticLibrary true - v142 + $(DefaultPlatformToolset) StaticLibrary true - v142 + $(DefaultPlatformToolset) + StaticLibrary + true + + + $(DefaultPlatformToolset) StaticLibrary true - v142 + $(DefaultPlatformToolset) StaticLibrary false true - v142 + $(DefaultPlatformToolset) StaticLibrary false true - v142 + $(DefaultPlatformToolset) + StaticLibrary + false + true + + + $(DefaultPlatformToolset) StaticLibrary false true - v142 @@ -93,9 +112,15 @@ + + + + + + @@ -123,11 +148,21 @@ bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false @@ -193,6 +228,19 @@ false + + + false + true + d3dx12affinity.h + + + + Console + false + false + + false @@ -206,6 +254,19 @@ false + + + false + true + d3dx12affinity.h + + + + Console + false + false + + @@ -252,7 +313,9 @@ Create Create Create + Create Create + Create Create Create diff --git a/Samples/Desktop/D3D1211On12/src/D3D1211On12.slnx b/Samples/Desktop/D3D1211On12/src/D3D1211On12.slnx index 4fc368858..88884ea46 100644 --- a/Samples/Desktop/D3D1211On12/src/D3D1211On12.slnx +++ b/Samples/Desktop/D3D1211On12/src/D3D1211On12.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D1211On12/src/D3D1211On12.vcxproj b/Samples/Desktop/D3D1211On12/src/D3D1211On12.vcxproj index 640a2582d..b75b477c2 100644 --- a/Samples/Desktop/D3D1211On12/src/D3D1211On12.vcxproj +++ b/Samples/Desktop/D3D1211On12/src/D3D1211On12.vcxproj @@ -6,29 +6,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {46B71301-A352-4611-BB90-6987F918B988} Win32Proj D3D1211On12 D3D1211On12 - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -38,20 +59,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -71,6 +108,25 @@ d3d12.dll + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + false + false + + + %(AdditionalIncludeDirectories) + + + true + d3dcompiler.lib;d2d1.lib;dwrite.lib;d3d11.lib;d3d12.lib;dxgi.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + Level3 @@ -90,16 +146,41 @@ d3d12.dll + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + + + true + true + true + d3dcompiler.lib;d2d1.lib;dwrite.lib;d3d11.lib;d3d12.lib;dxgi.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + true Document copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true @@ -116,7 +197,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12Bundles/src/D3D12Bundles.slnx b/Samples/Desktop/D3D12Bundles/src/D3D12Bundles.slnx index 53341b731..f7db8f17b 100644 --- a/Samples/Desktop/D3D12Bundles/src/D3D12Bundles.slnx +++ b/Samples/Desktop/D3D12Bundles/src/D3D12Bundles.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12Bundles/src/D3D12Bundles.vcxproj b/Samples/Desktop/D3D12Bundles/src/D3D12Bundles.vcxproj index 7d9487b93..1f3d5b2f1 100644 --- a/Samples/Desktop/D3D12Bundles/src/D3D12Bundles.vcxproj +++ b/Samples/Desktop/D3D12Bundles/src/D3D12Bundles.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {6B14BF7F-31E1-4DC9-91F2-9CDDB6E22C2C} Win32Proj D3D12Bundles D3D12Bundles - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -83,6 +120,36 @@ 5.0 + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + false + false + + + %(AdditionalIncludeDirectories) + + + true + d3d12.lib;dxgi.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + 5.0 + + Level3 @@ -110,6 +177,33 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + + + true + true + true + d3d12.lib;dxgi.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + @@ -130,33 +224,53 @@ Create + Create Create + Create dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso diff --git a/Samples/Desktop/D3D12DepthBoundsTest/src/D3D12DepthBoundsTest.slnx b/Samples/Desktop/D3D12DepthBoundsTest/src/D3D12DepthBoundsTest.slnx index 09b82b4cb..6fea5d309 100644 --- a/Samples/Desktop/D3D12DepthBoundsTest/src/D3D12DepthBoundsTest.slnx +++ b/Samples/Desktop/D3D12DepthBoundsTest/src/D3D12DepthBoundsTest.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12DepthBoundsTest/src/D3D12DepthBoundsTest.vcxproj b/Samples/Desktop/D3D12DepthBoundsTest/src/D3D12DepthBoundsTest.vcxproj index 39fe348fe..dced4f817 100644 --- a/Samples/Desktop/D3D12DepthBoundsTest/src/D3D12DepthBoundsTest.vcxproj +++ b/Samples/Desktop/D3D12DepthBoundsTest/src/D3D12DepthBoundsTest.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {EDC25A65-E2D7-427E-8FEA-DB448AFD71AD} Win32Proj D3D12DepthBoundsTest D3D12DepthBoundsTest - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -78,6 +115,31 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + Level3 @@ -107,6 +169,35 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + @@ -121,19 +212,29 @@ Create + Create Create + Create dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso diff --git a/Samples/Desktop/D3D12DynamicIndexing/src/D3D12DynamicIndexing.slnx b/Samples/Desktop/D3D12DynamicIndexing/src/D3D12DynamicIndexing.slnx index 11af3b7a1..424199d85 100644 --- a/Samples/Desktop/D3D12DynamicIndexing/src/D3D12DynamicIndexing.slnx +++ b/Samples/Desktop/D3D12DynamicIndexing/src/D3D12DynamicIndexing.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12DynamicIndexing/src/D3D12DynamicIndexing.vcxproj b/Samples/Desktop/D3D12DynamicIndexing/src/D3D12DynamicIndexing.vcxproj index cb9f76fde..6f4f16476 100644 --- a/Samples/Desktop/D3D12DynamicIndexing/src/D3D12DynamicIndexing.vcxproj +++ b/Samples/Desktop/D3D12DynamicIndexing/src/D3D12DynamicIndexing.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {110F6CA7-039D-437F-A624-8D218C14D0EF} Win32Proj D3D12DynamicIndexing D3D12DynamicIndexing - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -83,6 +120,36 @@ 5.0 + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + false + false + + + %(AdditionalIncludeDirectories) + + + true + d3d12.lib;dxgi.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + 5.0 + + Level3 @@ -110,6 +177,33 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + + + true + true + true + d3d12.lib;dxgi.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + @@ -130,25 +224,39 @@ Create + Create Create + Create dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso diff --git a/Samples/Desktop/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.slnx b/Samples/Desktop/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.slnx index dad67d20d..de80e5224 100644 --- a/Samples/Desktop/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.slnx +++ b/Samples/Desktop/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.vcxproj b/Samples/Desktop/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.vcxproj index 8682169cc..1ab870aa0 100644 --- a/Samples/Desktop/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.vcxproj +++ b/Samples/Desktop/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {9C46643A-4522-46F1-94B9-7207B9A1B4F5} Win32Proj D3D12ExecuteIndirect D3D12ExecuteIndirect - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -78,6 +115,31 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + Level3 @@ -107,6 +169,35 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + @@ -121,35 +212,55 @@ Create + Create Create + Create Document true + true true + true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso %(Identity) + %(Identity) %(Identity) + %(Identity) Document true + true true + true dxc.exe -nologo -Tcs_6_0 -E"CSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tcs_6_0 -E"CSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tcs_6_0 -E"CSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tcs_6_0 -E"CSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso %(Identity) + %(Identity) %(Identity) + %(Identity) diff --git a/Samples/Desktop/D3D12Fullscreen/src/D3D12Fullscreen.slnx b/Samples/Desktop/D3D12Fullscreen/src/D3D12Fullscreen.slnx index 2e69fb7a4..ef7393d8e 100644 --- a/Samples/Desktop/D3D12Fullscreen/src/D3D12Fullscreen.slnx +++ b/Samples/Desktop/D3D12Fullscreen/src/D3D12Fullscreen.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12Fullscreen/src/D3D12Fullscreen.vcxproj b/Samples/Desktop/D3D12Fullscreen/src/D3D12Fullscreen.vcxproj index f611f728d..c47b75fdb 100644 --- a/Samples/Desktop/D3D12Fullscreen/src/D3D12Fullscreen.vcxproj +++ b/Samples/Desktop/D3D12Fullscreen/src/D3D12Fullscreen.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {296530E7-221E-436A-80FC-B1EF5218C820} Win32Proj D3D12Fullscreen D3D12Fullscreen - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -81,6 +118,34 @@ PerMonitorHighDPIAware + + + Use + Level3 + Disabled + WIN32;DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + PerMonitorHighDPIAware + + Level3 @@ -113,6 +178,38 @@ PerMonitorHighDPIAware + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + PerMonitorHighDPIAware + + @@ -126,36 +223,58 @@ Create + Create Create + Create true + true true + true Document dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso true + true Document true + true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso diff --git a/Samples/Desktop/D3D12HDR/src/D3D12HDR.slnx b/Samples/Desktop/D3D12HDR/src/D3D12HDR.slnx index 1673486cc..37b66c473 100644 --- a/Samples/Desktop/D3D12HDR/src/D3D12HDR.slnx +++ b/Samples/Desktop/D3D12HDR/src/D3D12HDR.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12HDR/src/D3D12HDR.vcxproj b/Samples/Desktop/D3D12HDR/src/D3D12HDR.vcxproj index 8c56231c4..b3c665405 100644 --- a/Samples/Desktop/D3D12HDR/src/D3D12HDR.vcxproj +++ b/Samples/Desktop/D3D12HDR/src/D3D12HDR.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {010274FF-11D2-4FBC-88E4-0B6DC174507F} @@ -21,15 +29,28 @@ + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -39,9 +60,15 @@ + + + + + + true @@ -50,6 +77,13 @@ true true + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + true + true + false bin\$(Platform)\$(Configuration)\ @@ -57,6 +91,13 @@ true true + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + true + true + Use @@ -77,6 +118,26 @@ PerMonitorHighDPIAware + + + Use + Level3 + Disabled + WIN32;DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + dxgi.lib;d3d12.lib;d3d11.lib;d2d1.lib;dwrite.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + PerMonitorHighDPIAware + + Level3 @@ -104,6 +165,33 @@ PerMonitorHighDPIAware + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + dxgi.lib;d3d12.lib;d3d11.lib;d2d1.lib;dwrite.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + PerMonitorHighDPIAware + + @@ -118,7 +206,9 @@ Create + Create Create + Create @@ -133,51 +223,87 @@ dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso diff --git a/Samples/Desktop/D3D12HelloWorld/src/D3D12HelloWorld.slnx b/Samples/Desktop/D3D12HelloWorld/src/D3D12HelloWorld.slnx index bec0e0e31..f80c46d35 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/D3D12HelloWorld.slnx +++ b/Samples/Desktop/D3D12HelloWorld/src/D3D12HelloWorld.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloBundles/D3D12HelloBundles.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloBundles/D3D12HelloBundles.vcxproj index 7a9c71b66..2bbdcbe37 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloBundles/D3D12HelloBundles.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloBundles/D3D12HelloBundles.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {CAE2B6C4-B644-4B92-8804-23E18310765B} @@ -24,22 +32,45 @@ false false + + false + false + false + false false false + + false + false + false + + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -49,20 +80,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -91,6 +138,34 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -123,6 +198,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -137,7 +244,9 @@ Create + Create Create + Create @@ -145,13 +254,21 @@ Document true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso %(Identity) + %(Identity) %(Identity) + %(Identity) diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloConstBuffers/D3D12HelloConstBuffers.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloConstBuffers/D3D12HelloConstBuffers.vcxproj index fb44bf600..5304afb44 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloConstBuffers/D3D12HelloConstBuffers.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloConstBuffers/D3D12HelloConstBuffers.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {6F49D366-B5F1-432B-A3E8-5D1CA57865F9} @@ -24,22 +32,45 @@ false false + + false + false + false + false false false + + false + false + false + + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -49,20 +80,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -91,6 +138,34 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -123,6 +198,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -137,7 +244,9 @@ Create + Create Create + Create @@ -145,13 +254,21 @@ Document true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso %(Identity) + %(Identity) %(Identity) + %(Identity) diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloFrameBuffering/D3D12HelloFrameBuffering.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloFrameBuffering/D3D12HelloFrameBuffering.vcxproj index b00c211eb..b8def6f0e 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloFrameBuffering/D3D12HelloFrameBuffering.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloFrameBuffering/D3D12HelloFrameBuffering.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {DF8A573D-FD94-45F8-AED2-0BEFC00B9591} @@ -24,22 +32,45 @@ false false + + false + false + false + false false false + + false + false + false + + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -49,20 +80,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -91,6 +138,34 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -123,6 +198,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -137,7 +244,9 @@ Create + Create Create + Create @@ -145,13 +254,21 @@ Document true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso %(Identity) + %(Identity) %(Identity) + %(Identity) diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloGenericPrograms/D3D12HelloGenericPrograms.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloGenericPrograms/D3D12HelloGenericPrograms.vcxproj index 7c6b60ae3..d9065881c 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloGenericPrograms/D3D12HelloGenericPrograms.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloGenericPrograms/D3D12HelloGenericPrograms.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {7db43f09-7bd6-4e69-8987-9a919a142852} @@ -21,15 +29,28 @@ + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -81,6 +118,34 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -113,6 +178,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -128,7 +225,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloMeshNodes/D3D12HelloMeshNodes.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloMeshNodes/D3D12HelloMeshNodes.vcxproj index 76bcc6aae..c5c7af097 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloMeshNodes/D3D12HelloMeshNodes.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloMeshNodes/D3D12HelloMeshNodes.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {B9680899-F009-406B-BEEE-D0214C1E7592} @@ -21,15 +29,28 @@ + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -81,6 +118,34 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + dxguid.lib;d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -113,6 +178,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + dxguid.lib;d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -128,7 +225,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloPartialGraphicsPrograms/D3D12HelloPartialGraphicsPrograms.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloPartialGraphicsPrograms/D3D12HelloPartialGraphicsPrograms.vcxproj index 12d4e0882..706ac11c0 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloPartialGraphicsPrograms/D3D12HelloPartialGraphicsPrograms.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloPartialGraphicsPrograms/D3D12HelloPartialGraphicsPrograms.vcxproj @@ -1,4 +1,4 @@ - + @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {ff87d9c7-631e-4409-a52b-ea14739e3fec} @@ -21,15 +29,28 @@ + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -81,6 +118,34 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -113,6 +178,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -128,7 +225,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloTexture/D3D12HelloTexture.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloTexture/D3D12HelloTexture.vcxproj index 41826ea96..bdbe7c23e 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloTexture/D3D12HelloTexture.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloTexture/D3D12HelloTexture.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {16B13BB4-D82D-4AC1-8B40-C6BCCC99954B} @@ -24,22 +32,45 @@ false false + + false + false + false + false false false + + false + false + false + + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -49,20 +80,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -91,6 +138,34 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -123,6 +198,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -137,7 +244,9 @@ Create + Create Create + Create @@ -145,13 +254,21 @@ Document true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso %(Identity) + %(Identity) %(Identity) + %(Identity) diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloTightAlignment/D3D12HelloTightAlignment.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloTightAlignment/D3D12HelloTightAlignment.vcxproj index 395113a7a..814e0780a 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloTightAlignment/D3D12HelloTightAlignment.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloTightAlignment/D3D12HelloTightAlignment.vcxproj @@ -1,4 +1,4 @@ - + @@ -14,10 +14,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + 17.0 @@ -28,28 +36,41 @@ + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) Application false - v143 true Unicode + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -69,9 +90,15 @@ + + + + + + @@ -114,6 +141,19 @@ d3d12.lib;dxgi.lib;d3dcompiler.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + Level3 @@ -131,6 +171,23 @@ d3d12.lib;dxgi.lib;d3dcompiler.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloTriangle/D3D12HelloTriangle.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloTriangle/D3D12HelloTriangle.vcxproj index 722066747..7d8fa804b 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloTriangle/D3D12HelloTriangle.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloTriangle/D3D12HelloTriangle.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {5018F6A3-6533-4744-B1FD-727D199FD2E9} @@ -24,22 +32,45 @@ false false + + false + false + false + false false false + + false + false + false + + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -49,20 +80,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -91,6 +138,34 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -123,6 +198,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -137,7 +244,9 @@ Create + Create Create + Create @@ -145,13 +254,21 @@ Document true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso %(Identity) + %(Identity) %(Identity) + %(Identity) diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloVADecode/D3D12HelloVADecode.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloVADecode/D3D12HelloVADecode.vcxproj index 5e81a854c..a8171162d 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloVADecode/D3D12HelloVADecode.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloVADecode/D3D12HelloVADecode.vcxproj @@ -6,10 +6,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {E16591B9-E382-431F-BE17-8C94E5F6AD5E} @@ -23,22 +31,45 @@ false false + + false + false + false + false false false + + false + false + false + + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -48,20 +79,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -91,6 +138,35 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + d3d12.lib;dxgi.lib;va.lib;va_win32.lib;%(AdditionalDependencies) + d3d12.dll + %(AdditionalLibraryDirectories) + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -123,6 +199,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;va.lib;va_win32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -138,7 +246,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloVAEncode/D3D12HelloVAEncode.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloVAEncode/D3D12HelloVAEncode.vcxproj index 5ed236b92..9ee970c61 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloVAEncode/D3D12HelloVAEncode.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloVAEncode/D3D12HelloVAEncode.vcxproj @@ -6,10 +6,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {940957E3-82D6-4CD8-B39F-6FA47763973F} @@ -23,22 +31,45 @@ false false + + false + false + false + false false false + + false + false + false + + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -48,20 +79,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -91,6 +138,35 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + d3d12.lib;dxgi.lib;va.lib;va_win32.lib;%(AdditionalDependencies) + d3d12.dll + %(AdditionalLibraryDirectories) + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -123,6 +199,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;va.lib;va_win32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -137,7 +245,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloVAResourceInterop/D3D12HelloVAResourceInterop.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloVAResourceInterop/D3D12HelloVAResourceInterop.vcxproj index ff02af543..6965e48dd 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloVAResourceInterop/D3D12HelloVAResourceInterop.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloVAResourceInterop/D3D12HelloVAResourceInterop.vcxproj @@ -6,10 +6,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {17171787-C5D2-4014-9D1D-BC43074F36A1} @@ -23,22 +31,45 @@ false false + + false + false + false + false false false + + false + false + false + + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -48,20 +79,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -91,6 +138,35 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + d3d12.lib;dxgi.lib;va.lib;va_win32.lib;%(AdditionalDependencies) + d3d12.dll + %(AdditionalLibraryDirectories) + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -123,6 +199,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;va.lib;va_win32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -137,7 +245,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloWindow/D3D12HelloWindow.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloWindow/D3D12HelloWindow.vcxproj index 06a1c6857..19a0ff252 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloWindow/D3D12HelloWindow.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloWindow/D3D12HelloWindow.vcxproj @@ -6,10 +6,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {23E282D0-E846-485C-B7A1-DA60F4BEA3D2} @@ -23,22 +31,45 @@ false false + + false + false + false + false false false + + false + false + false + + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -48,20 +79,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -90,6 +137,34 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + d3d12.lib;dxgi.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -122,6 +197,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -136,7 +243,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12HelloWorld/src/HelloWorkGraphs/D3D12HelloWorkGraphs.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/HelloWorkGraphs/D3D12HelloWorkGraphs.vcxproj index 4635e22aa..49dba60d4 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/HelloWorkGraphs/D3D12HelloWorkGraphs.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/HelloWorkGraphs/D3D12HelloWorkGraphs.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {05080ADC-D456-4058-8064-4791865F796B} @@ -21,15 +29,28 @@ + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Level3 @@ -80,6 +117,33 @@ + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Console + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -111,13 +175,46 @@ + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Console + true + true + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + true + true true + true Document diff --git a/Samples/Desktop/D3D12HelloWorld/src/WorkGraphsSandbox/D3D12WorkGraphsSandbox.vcxproj b/Samples/Desktop/D3D12HelloWorld/src/WorkGraphsSandbox/D3D12WorkGraphsSandbox.vcxproj index acaa8b5ff..b81b93257 100644 --- a/Samples/Desktop/D3D12HelloWorld/src/WorkGraphsSandbox/D3D12WorkGraphsSandbox.vcxproj +++ b/Samples/Desktop/D3D12HelloWorld/src/WorkGraphsSandbox/D3D12WorkGraphsSandbox.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {2725E8EC-0892-499B-ACD5-0EA18157682A} @@ -21,15 +29,28 @@ + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Level3 @@ -80,6 +117,33 @@ + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Console + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -111,13 +175,46 @@ + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Console + true + true + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + true + true true + true Document diff --git a/Samples/Desktop/D3D12HeterogeneousMultiadapter/src/D3D12HeterogeneousMultiadapter.slnx b/Samples/Desktop/D3D12HeterogeneousMultiadapter/src/D3D12HeterogeneousMultiadapter.slnx index 0459b5898..ded909fd8 100644 --- a/Samples/Desktop/D3D12HeterogeneousMultiadapter/src/D3D12HeterogeneousMultiadapter.slnx +++ b/Samples/Desktop/D3D12HeterogeneousMultiadapter/src/D3D12HeterogeneousMultiadapter.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12HeterogeneousMultiadapter/src/D3D12HeterogeneousMultiadapter.vcxproj b/Samples/Desktop/D3D12HeterogeneousMultiadapter/src/D3D12HeterogeneousMultiadapter.vcxproj index 4cb44a965..9f8505c9b 100644 --- a/Samples/Desktop/D3D12HeterogeneousMultiadapter/src/D3D12HeterogeneousMultiadapter.vcxproj +++ b/Samples/Desktop/D3D12HeterogeneousMultiadapter/src/D3D12HeterogeneousMultiadapter.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {AE603B26-C9E0-4D35-9737-A86E74FD7E1C} Win32Proj D3D12HeterogeneousMultiadapter D3D12HeterogeneousMultiadapter - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -78,6 +115,31 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + Level3 @@ -107,6 +169,35 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + @@ -121,39 +212,63 @@ Create + Create Create + Create Document true + true true + true dxc.exe -nologo -Tvs_6_0 -E"VShader" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VShader.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PShader" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PShader.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VShader" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VShader.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PShader" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PShader.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VShader.cso;$(OutDir)%(Filename)_PShader.cso + $(OutDir)%(Filename)_VShader.cso;$(OutDir)%(Filename)_PShader.cso dxc.exe -nologo -Tvs_6_0 -E"VShader" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VShader.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PShader" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PShader.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VShader" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VShader.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PShader" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PShader.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VShader.cso;$(OutDir)%(Filename)_PShader.cso + $(OutDir)%(Filename)_VShader.cso;$(OutDir)%(Filename)_PShader.cso true + true true + true Document dxc.exe -nologo -Tvs_6_0 -E"VSSimpleBlur" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSSimpleBlur.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSSimpleBlurU" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSSimpleBlurU.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSSimpleBlurV" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSSimpleBlurV.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSSimpleBlur" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSSimpleBlur.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSSimpleBlurU" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSSimpleBlurU.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSSimpleBlurV" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSSimpleBlurV.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSSimpleBlur.cso;$(OutDir)%(Filename)_PSSimpleBlurU.cso;$(OutDir)%(Filename)_PSSimpleBlurV.cso + $(OutDir)%(Filename)_VSSimpleBlur.cso;$(OutDir)%(Filename)_PSSimpleBlurU.cso;$(OutDir)%(Filename)_PSSimpleBlurV.cso dxc.exe -nologo -Tvs_6_0 -E"VSSimpleBlur" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSSimpleBlur.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSSimpleBlurU" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSSimpleBlurU.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSSimpleBlurV" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSSimpleBlurV.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSSimpleBlur" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSSimpleBlur.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSSimpleBlurU" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSSimpleBlurU.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSSimpleBlurV" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSSimpleBlurV.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSSimpleBlur.cso;$(OutDir)%(Filename)_PSSimpleBlurU.cso;$(OutDir)%(Filename)_PSSimpleBlurV.cso + $(OutDir)%(Filename)_VSSimpleBlur.cso;$(OutDir)%(Filename)_PSSimpleBlurU.cso;$(OutDir)%(Filename)_PSSimpleBlurV.cso diff --git a/Samples/Desktop/D3D12LinkedGpus/src/D3D12LinkedGpus.slnx b/Samples/Desktop/D3D12LinkedGpus/src/D3D12LinkedGpus.slnx index 3b63b3712..6ba97d26a 100644 --- a/Samples/Desktop/D3D12LinkedGpus/src/D3D12LinkedGpus.slnx +++ b/Samples/Desktop/D3D12LinkedGpus/src/D3D12LinkedGpus.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12LinkedGpus/src/D3DX12AffinityLayer/D3DX12AffinityLayer.vcxproj b/Samples/Desktop/D3D12LinkedGpus/src/D3DX12AffinityLayer/D3DX12AffinityLayer.vcxproj index 56b6a53e6..4f20d4f73 100644 --- a/Samples/Desktop/D3D12LinkedGpus/src/D3DX12AffinityLayer/D3DX12AffinityLayer.vcxproj +++ b/Samples/Desktop/D3D12LinkedGpus/src/D3DX12AffinityLayer/D3DX12AffinityLayer.vcxproj @@ -6,28 +6,49 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {B2283BA1-603B-4360-AE99-7A3F5912BC42} Win32Proj D3DX12AffinityLayer - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + StaticLibrary + true + Unicode + + + $(DefaultPlatformToolset) StaticLibrary true - v142 Unicode + $(DefaultPlatformToolset) + StaticLibrary + false + true + Unicode + + + $(DefaultPlatformToolset) StaticLibrary false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -66,6 +103,19 @@ Windows + + + Use + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + + d3dx12affinity.h + Level3 + + + Windows + + Use @@ -83,6 +133,23 @@ true + + + Use + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + + d3dx12affinity.h + Level3 + + + Windows + true + true + + @@ -126,7 +193,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12LinkedGpus/src/LinkedGpus/D3D12LinkedGpus.vcxproj b/Samples/Desktop/D3D12LinkedGpus/src/LinkedGpus/D3D12LinkedGpus.vcxproj index 222f19c1f..c8afdad99 100644 --- a/Samples/Desktop/D3D12LinkedGpus/src/LinkedGpus/D3D12LinkedGpus.vcxproj +++ b/Samples/Desktop/D3D12LinkedGpus/src/LinkedGpus/D3D12LinkedGpus.vcxproj @@ -1,4 +1,4 @@ - + @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {2C4064CC-ACA4-4CEA-8DC7-BD9C6F8CCE59} Win32Proj D3D12LinkedGpus D3D12LinkedGpus - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -73,6 +110,26 @@ PerMonitorHighDPIAware + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + dxgi.lib;d3d12.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + PerMonitorHighDPIAware + + Level3 @@ -97,6 +154,30 @@ PerMonitorHighDPIAware + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + dxgi.lib;d3d12.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + PerMonitorHighDPIAware + + @@ -117,7 +198,9 @@ Create + Create Create + Create @@ -130,38 +213,62 @@ Document dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso diff --git a/Samples/Desktop/D3D12LinkedGpus/src/LinkedGpusAffinity/D3D12LinkedGpusAffinity.vcxproj b/Samples/Desktop/D3D12LinkedGpus/src/LinkedGpusAffinity/D3D12LinkedGpusAffinity.vcxproj index 0ddf7c3fd..f80083bc2 100644 --- a/Samples/Desktop/D3D12LinkedGpus/src/LinkedGpusAffinity/D3D12LinkedGpusAffinity.vcxproj +++ b/Samples/Desktop/D3D12LinkedGpus/src/LinkedGpusAffinity/D3D12LinkedGpusAffinity.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {8799E11E-7043-4449-BF24-85F966EB2C65} Win32Proj D3D12LinkedGpusAffinity D3D12LinkedGpusAffinity - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -72,6 +109,25 @@ PerMonitorHighDPIAware + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\D3DX12AffinityLayer + + + Windows + true + dxgi.lib;d3d12.lib;%(AdditionalDependencies) + d3d12.dll + + + PerMonitorHighDPIAware + + Level3 @@ -95,6 +151,29 @@ PerMonitorHighDPIAware + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\D3DX12AffinityLayer + + + Windows + true + true + true + dxgi.lib;d3d12.lib;%(AdditionalDependencies) + d3d12.dll + + + PerMonitorHighDPIAware + + @@ -111,7 +190,9 @@ Create + Create Create + Create @@ -124,38 +205,62 @@ Document dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso diff --git a/Samples/Desktop/D3D12LinkedGpus/src/SingleGpu/D3D12SingleGpu.vcxproj b/Samples/Desktop/D3D12LinkedGpus/src/SingleGpu/D3D12SingleGpu.vcxproj index ed5145fd9..bf15cdab7 100644 --- a/Samples/Desktop/D3D12LinkedGpus/src/SingleGpu/D3D12SingleGpu.vcxproj +++ b/Samples/Desktop/D3D12LinkedGpus/src/SingleGpu/D3D12SingleGpu.vcxproj @@ -1,4 +1,4 @@ - + @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {02A8C19C-4834-4C57-A77F-2A1A94B724BA} Win32Proj D3D12SingleGpu D3D12SingleGpu - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -72,6 +109,25 @@ PerMonitorHighDPIAware + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\D3DX12AffinityLayer + + + Windows + true + dxgi.lib;d3d12.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + PerMonitorHighDPIAware + + Level3 @@ -95,6 +151,29 @@ PerMonitorHighDPIAware + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + ..\D3DX12AffinityLayer + + + Windows + true + true + true + dxgi.lib;d3d12.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + PerMonitorHighDPIAware + + @@ -111,7 +190,9 @@ Create + Create Create + Create @@ -124,38 +205,62 @@ Document dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso diff --git a/Samples/Desktop/D3D12MeshShaders/src/D3D12MeshShaders.slnx b/Samples/Desktop/D3D12MeshShaders/src/D3D12MeshShaders.slnx index 3bd968c7c..0ffeb4106 100644 --- a/Samples/Desktop/D3D12MeshShaders/src/D3D12MeshShaders.slnx +++ b/Samples/Desktop/D3D12MeshShaders/src/D3D12MeshShaders.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12MeshShaders/src/DynamicLOD/D3D12DynamicLOD.vcxproj b/Samples/Desktop/D3D12MeshShaders/src/DynamicLOD/D3D12DynamicLOD.vcxproj index 261d2dac8..c107ccf25 100644 --- a/Samples/Desktop/D3D12MeshShaders/src/DynamicLOD/D3D12DynamicLOD.vcxproj +++ b/Samples/Desktop/D3D12MeshShaders/src/DynamicLOD/D3D12DynamicLOD.vcxproj @@ -1,4 +1,4 @@ - + @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + 15.0 @@ -20,15 +28,28 @@ + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -40,18 +61,32 @@ + + + + + + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Level3 @@ -72,6 +107,26 @@ d3d12.dll + + + Level3 + Disabled + true + true + + + Use + + + 6.0 + true + /Fd "$(OutDir)%(Filename).pdb" %(AdditionalOptions) + + + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + Level3 @@ -91,6 +146,25 @@ d3d12.dll + + + Level3 + MaxSpeed + true + true + true + true + + + Use + + + true + true + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + @@ -99,7 +173,9 @@ Create + Create Create + Create @@ -128,28 +204,46 @@ dxc.exe -nologo -Tas_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tas_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tas_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tas_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso diff --git a/Samples/Desktop/D3D12MeshShaders/src/MeshletCull/D3D12MeshletCull.vcxproj b/Samples/Desktop/D3D12MeshShaders/src/MeshletCull/D3D12MeshletCull.vcxproj index 64d9981f5..4638a95de 100644 --- a/Samples/Desktop/D3D12MeshShaders/src/MeshletCull/D3D12MeshletCull.vcxproj +++ b/Samples/Desktop/D3D12MeshShaders/src/MeshletCull/D3D12MeshletCull.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + 15.0 @@ -20,15 +28,28 @@ + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -40,18 +61,32 @@ + + + + + + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Level3 @@ -72,6 +107,26 @@ d3d12.dll + + + Level3 + Disabled + true + true + + + Use + + + 6.0 + true + /Fd "$(OutDir)%(Filename).pdb" %(AdditionalOptions) + + + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + Level3 @@ -91,6 +146,25 @@ d3d12.dll + + + Level3 + MaxSpeed + true + true + true + true + + + Use + + + true + true + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + @@ -101,7 +175,9 @@ Create + Create Create + Create @@ -131,65 +207,107 @@ Document dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tas_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tas_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tas_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tas_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso diff --git a/Samples/Desktop/D3D12MeshShaders/src/MeshletGenerator/D3D12MeshletGenerator.vcxproj b/Samples/Desktop/D3D12MeshShaders/src/MeshletGenerator/D3D12MeshletGenerator.vcxproj index 2d70e99b3..41a81f4de 100644 --- a/Samples/Desktop/D3D12MeshShaders/src/MeshletGenerator/D3D12MeshletGenerator.vcxproj +++ b/Samples/Desktop/D3D12MeshShaders/src/MeshletGenerator/D3D12MeshletGenerator.vcxproj @@ -1,4 +1,4 @@ - + @@ -6,10 +6,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + @@ -32,15 +40,28 @@ + $(DefaultPlatformToolset) + StaticLibrary + true + MultiByte + + + $(DefaultPlatformToolset) StaticLibrary true - v142 MultiByte + $(DefaultPlatformToolset) + StaticLibrary + false + true + MultiByte + + + $(DefaultPlatformToolset) StaticLibrary false - v142 true MultiByte @@ -52,18 +73,32 @@ + + + + + + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Level3 @@ -72,6 +107,14 @@ true + + + Level3 + Disabled + true + true + + Level3 @@ -86,6 +129,20 @@ true + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + diff --git a/Samples/Desktop/D3D12MeshShaders/src/MeshletInstancing/D3D12MeshletInstancing.vcxproj b/Samples/Desktop/D3D12MeshShaders/src/MeshletInstancing/D3D12MeshletInstancing.vcxproj index a82bd0bfb..b5e0236bf 100644 --- a/Samples/Desktop/D3D12MeshShaders/src/MeshletInstancing/D3D12MeshletInstancing.vcxproj +++ b/Samples/Desktop/D3D12MeshShaders/src/MeshletInstancing/D3D12MeshletInstancing.vcxproj @@ -1,4 +1,4 @@ - + @@ -15,10 +15,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + 15.0 @@ -28,28 +36,41 @@ + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) Application false - v142 true Unicode + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -67,18 +88,32 @@ + + + + + + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Level3 @@ -99,6 +134,26 @@ d3d12.dll + + + Level3 + Disabled + true + true + + + Use + + + 6.0 + true + /Fd "$(OutDir)%(Filename).pdb" %(AdditionalOptions) + + + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + Level3 @@ -155,6 +210,25 @@ d3d12.dll + + + Level3 + MaxSpeed + true + true + true + true + + + Use + + + true + true + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + @@ -163,7 +237,9 @@ Create + Create Create + Create @@ -187,20 +263,32 @@ Document $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso %(Identity) + %(Identity) %(Identity) + %(Identity) dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" Document $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso %(Identity) + %(Identity) %(Identity) + %(Identity) dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" diff --git a/Samples/Desktop/D3D12MeshShaders/src/MeshletRender/D3D12MeshletRender.vcxproj b/Samples/Desktop/D3D12MeshShaders/src/MeshletRender/D3D12MeshletRender.vcxproj index c2d978517..d1ec5d6ff 100644 --- a/Samples/Desktop/D3D12MeshShaders/src/MeshletRender/D3D12MeshletRender.vcxproj +++ b/Samples/Desktop/D3D12MeshShaders/src/MeshletRender/D3D12MeshletRender.vcxproj @@ -1,4 +1,4 @@ - + @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + 15.0 @@ -20,15 +28,28 @@ + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -40,18 +61,32 @@ + + + + + + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Level3 @@ -72,6 +107,26 @@ d3d12.dll + + + Level3 + Disabled + true + true + + + Use + + + 6.0 + true + /Fd "$(OutDir)%(Filename).pdb" %(AdditionalOptions) + + + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + Level3 @@ -91,6 +146,25 @@ d3d12.dll + + + Level3 + MaxSpeed + true + true + true + true + + + Use + + + true + true + d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + @@ -99,7 +173,9 @@ Create + Create Create + Create @@ -122,20 +198,32 @@ Document dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tms_6_5 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso Document dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tps_6_3 -E"main" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso diff --git a/Samples/Desktop/D3D12MeshShaders/src/WavefrontConverter/D3D12WavefrontConverter.vcxproj b/Samples/Desktop/D3D12MeshShaders/src/WavefrontConverter/D3D12WavefrontConverter.vcxproj index 90a18930f..2880d3d8d 100644 --- a/Samples/Desktop/D3D12MeshShaders/src/WavefrontConverter/D3D12WavefrontConverter.vcxproj +++ b/Samples/Desktop/D3D12MeshShaders/src/WavefrontConverter/D3D12WavefrontConverter.vcxproj @@ -1,14 +1,22 @@ - + Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + @@ -17,7 +25,9 @@ Create + Create Create + Create @@ -40,15 +50,28 @@ + $(DefaultPlatformToolset) + Application + true + MultiByte + + + $(DefaultPlatformToolset) Application true - v142 MultiByte + $(DefaultPlatformToolset) + Application + false + true + MultiByte + + + $(DefaultPlatformToolset) Application false - v142 true MultiByte @@ -60,9 +83,15 @@ + + + + + + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\; @@ -70,12 +99,24 @@ bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\; + $(VC_IncludePath);$(WindowsSDK_IncludePath); + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath); $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\; bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\; + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Level3 @@ -92,6 +133,22 @@ $(SolutionDir)MeshletGenerator\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + Level3 + Disabled + true + true + $(SolutionDir)\MeshletGenerator; + _MBCS;%(PreprocessorDefinitions) + Use + + + D3D12MeshletGenerator.lib;%(AdditionalDependencies) + false + $(SolutionDir)MeshletGenerator\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + Level3 @@ -111,6 +168,25 @@ $(SolutionDir)MeshletGenerator\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + Level3 + MaxSpeed + true + true + true + true + $(SolutionDir)\MeshletGenerator; + Use + + + true + true + D3D12MeshletGenerator.lib;%(AdditionalDependencies) + false + $(SolutionDir)MeshletGenerator\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + diff --git a/Samples/Desktop/D3D12Multithreading/src/D3D12Multithreading.slnx b/Samples/Desktop/D3D12Multithreading/src/D3D12Multithreading.slnx index 9ac461821..9aeb15217 100644 --- a/Samples/Desktop/D3D12Multithreading/src/D3D12Multithreading.slnx +++ b/Samples/Desktop/D3D12Multithreading/src/D3D12Multithreading.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12Multithreading/src/D3D12Multithreading.vcxproj b/Samples/Desktop/D3D12Multithreading/src/D3D12Multithreading.vcxproj index 4af69f5fa..9170b948a 100644 --- a/Samples/Desktop/D3D12Multithreading/src/D3D12Multithreading.vcxproj +++ b/Samples/Desktop/D3D12Multithreading/src/D3D12Multithreading.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {3FC193D0-7E4E-4918-8431-D67391EE4145} Win32Proj D3D12Multithreading D3D12Multithreading - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -81,6 +118,34 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + false + false + + + %(AdditionalIncludeDirectories) + 4267 + + + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + Level3 @@ -109,6 +174,34 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + 4267 + + + true + true + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + @@ -129,7 +222,9 @@ Create + Create Create + Create @@ -137,13 +232,21 @@ true Document dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso diff --git a/Samples/Desktop/D3D12On7/src/D3D12On7.slnx b/Samples/Desktop/D3D12On7/src/D3D12On7.slnx index 31947b34a..1e02224a1 100644 --- a/Samples/Desktop/D3D12On7/src/D3D12On7.slnx +++ b/Samples/Desktop/D3D12On7/src/D3D12On7.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12On7/src/D3D12On7.vcxproj b/Samples/Desktop/D3D12On7/src/D3D12On7.vcxproj index 466457acc..04e7da985 100644 --- a/Samples/Desktop/D3D12On7/src/D3D12On7.vcxproj +++ b/Samples/Desktop/D3D12On7/src/D3D12On7.vcxproj @@ -6,29 +6,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {3094FDBC-E341-46E8-AED0-B822339C563D} Win32Proj D3D12On7 D3D12On7 - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -38,9 +59,15 @@ + + + + + + true @@ -48,12 +75,24 @@ obj\$(Platform)\$(Configuration)\ $(IntDir);$(IncludePath) + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(IntDir);$(IncludePath) + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ $(IntDir);$(IncludePath) + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(IntDir);$(IncludePath) + Use @@ -82,6 +121,34 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + Level3 @@ -114,6 +181,38 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + + + @@ -128,7 +227,9 @@ Create + Create Create + Create diff --git a/Samples/Desktop/D3D12PipelineStateCache/src/D3D12PipelineStateCache.slnx b/Samples/Desktop/D3D12PipelineStateCache/src/D3D12PipelineStateCache.slnx index 3c1019fb0..3fa531c58 100644 --- a/Samples/Desktop/D3D12PipelineStateCache/src/D3D12PipelineStateCache.slnx +++ b/Samples/Desktop/D3D12PipelineStateCache/src/D3D12PipelineStateCache.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12PipelineStateCache/src/D3D12PipelineStateCache.vcxproj b/Samples/Desktop/D3D12PipelineStateCache/src/D3D12PipelineStateCache.vcxproj index 128e87474..3af91fc3c 100644 --- a/Samples/Desktop/D3D12PipelineStateCache/src/D3D12PipelineStateCache.vcxproj +++ b/Samples/Desktop/D3D12PipelineStateCache/src/D3D12PipelineStateCache.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {AB31FB4E-E202-4D6A-B313-4C57F5D70C9E} Win32Proj D3D12nBodyGravity D3D12PipelineStateCache - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -78,6 +115,31 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + dxgi.lib;d3d12.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + Level3 @@ -107,6 +169,35 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + dxgi.lib;d3d12.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + @@ -134,226 +225,419 @@ Create + Create Create + Create Pixel + Pixel Pixel + Pixel 6.0 + 6.0 6.0 + 6.0 g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h mainBlit + mainBlit mainBlit + mainBlit g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h + + + + -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) Pixel + Pixel Pixel + Pixel 6.0 + 6.0 6.0 + 6.0 g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h mainDistort + mainDistort g_%(Filename) + g_%(Filename) + + %(FullPath).h + %(FullPath).h + + mainDistort + mainDistort -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) Pixel + Pixel Pixel + Pixel g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h mainBlur + mainBlur g_%(Filename) + g_%(Filename) + + %(FullPath).h + %(FullPath).h + + 6.0 + 6.0 6.0 + 6.0 mainBlur + mainBlur -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) Pixel + Pixel Pixel + Pixel g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h mainEdge + mainEdge g_%(Filename) + g_%(Filename) + + %(FullPath).h + %(FullPath).h + + 6.0 + 6.0 6.0 + 6.0 mainEdge + mainEdge -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) Pixel + Pixel Pixel + Pixel g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h mainGray + mainGray g_%(Filename) + g_%(Filename) + + %(FullPath).h + %(FullPath).h + + 6.0 + 6.0 6.0 + 6.0 mainGray + mainGray -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) Pixel + Pixel Pixel + Pixel 6.0 + 6.0 g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h mainInvert + mainInvert g_%(Filename) + g_%(Filename) + + %(FullPath).h + %(FullPath).h + + 6.0 + 6.0 mainInvert + mainInvert -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) Pixel + Pixel Pixel + Pixel + + g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h 6.0 + 6.0 mainPixel + mainPixel g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h 6.0 + 6.0 mainPixel + mainPixel + + -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) Vertex + Vertex Vertex + Vertex 6.0 + 6.0 g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h mainQuad + mainQuad g_%(Filename) + g_%(Filename) + + %(FullPath).h + %(FullPath).h + + 6.0 + 6.0 mainQuad + mainQuad -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) Pixel + Pixel Pixel + Pixel g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h 6.0 + 6.0 g_%(Filename) + g_%(Filename) + + %(FullPath).h + %(FullPath).h + + 6.0 + 6.0 -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) Vertex + Vertex Vertex + Vertex 6.0 + 6.0 g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h g_%(Filename) + g_%(Filename) + + %(FullPath).h + %(FullPath).h + + 6.0 + 6.0 -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) Pixel + Pixel Pixel + Pixel 6.0 + 6.0 g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h mainUber + mainUber g_%(Filename) + g_%(Filename) + + %(FullPath).h + %(FullPath).h + + 6.0 + 6.0 mainUber + mainUber -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) Pixel + Pixel Pixel + Pixel %(FullPath).h + %(FullPath).h g_%(Filename) + g_%(Filename) 6.0 + 6.0 mainWarp + mainWarp g_%(Filename) + g_%(Filename) + + %(FullPath).h + %(FullPath).h + + 6.0 + 6.0 mainWarp + mainWarp -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) Pixel + Pixel Pixel + Pixel 6.0 + 6.0 g_%(Filename) + g_%(Filename) %(FullPath).h + %(FullPath).h mainWave + mainWave g_%(Filename) + g_%(Filename) + + %(FullPath).h + %(FullPath).h + + 6.0 + 6.0 mainWave + mainWave -Qembed_debug %(AdditionalOptions) + -Qembed_debug %(AdditionalOptions) diff --git a/Samples/Desktop/D3D12PredicationQueries/src/D3D12PredicationQueries.slnx b/Samples/Desktop/D3D12PredicationQueries/src/D3D12PredicationQueries.slnx index d696bf838..15c083e04 100644 --- a/Samples/Desktop/D3D12PredicationQueries/src/D3D12PredicationQueries.slnx +++ b/Samples/Desktop/D3D12PredicationQueries/src/D3D12PredicationQueries.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12PredicationQueries/src/D3D12PredicationQueries.vcxproj b/Samples/Desktop/D3D12PredicationQueries/src/D3D12PredicationQueries.vcxproj index 72da5912f..e218aaaae 100644 --- a/Samples/Desktop/D3D12PredicationQueries/src/D3D12PredicationQueries.vcxproj +++ b/Samples/Desktop/D3D12PredicationQueries/src/D3D12PredicationQueries.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {B6AF5084-28EC-4BEC-AB32-C7CBCC5B5B1E} Win32Proj D3D12PredicationQueries D3D12PredicationQueries - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -78,6 +115,31 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + Level3 @@ -107,6 +169,35 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + @@ -121,22 +212,34 @@ Create + Create Create + Create Document true + true true + true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso diff --git a/Samples/Desktop/D3D12ReservedResources/src/D3D12ReservedResources.slnx b/Samples/Desktop/D3D12ReservedResources/src/D3D12ReservedResources.slnx index 2f2bbcc22..9e60ec0c9 100644 --- a/Samples/Desktop/D3D12ReservedResources/src/D3D12ReservedResources.slnx +++ b/Samples/Desktop/D3D12ReservedResources/src/D3D12ReservedResources.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12ReservedResources/src/D3D12ReservedResources.vcxproj b/Samples/Desktop/D3D12ReservedResources/src/D3D12ReservedResources.vcxproj index da6a0b53e..3e66437d6 100644 --- a/Samples/Desktop/D3D12ReservedResources/src/D3D12ReservedResources.vcxproj +++ b/Samples/Desktop/D3D12ReservedResources/src/D3D12ReservedResources.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {44243D44-1DC7-403A-8BA6-169BD5151876} Win32Proj D3D12ReservedResources D3D12ReservedResources - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -78,6 +115,31 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + Level3 @@ -107,6 +169,35 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + @@ -121,22 +212,34 @@ Create + Create Create + Create Document true + true true + true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso diff --git a/Samples/Desktop/D3D12Residency/src/D3D12Residency.slnx b/Samples/Desktop/D3D12Residency/src/D3D12Residency.slnx index 358d0d2a9..26d0021f0 100644 --- a/Samples/Desktop/D3D12Residency/src/D3D12Residency.slnx +++ b/Samples/Desktop/D3D12Residency/src/D3D12Residency.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12Residency/src/D3D12Residency.vcxproj b/Samples/Desktop/D3D12Residency/src/D3D12Residency.vcxproj index 89f9f622b..4946f40f0 100644 --- a/Samples/Desktop/D3D12Residency/src/D3D12Residency.vcxproj +++ b/Samples/Desktop/D3D12Residency/src/D3D12Residency.vcxproj @@ -7,10 +7,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {5141ABDE-3F88-4435-848E-7728C304C7D3} @@ -21,15 +29,28 @@ + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -72,6 +109,25 @@ d3d12.dll + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + false + false + + + ..\..\..\..\Libraries\D3DX12Residency\;%(AdditionalIncludeDirectories) + + + true + d3dcompiler.lib;d3d12.lib;dxgi.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + Level3 @@ -91,18 +147,45 @@ d3d12.dll + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + + + true + true + true + d3dcompiler.lib;d3d12.lib;dxgi.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + true Document dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso @@ -119,7 +202,9 @@ dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_P Create + Create Create + Create diff --git a/Samples/Desktop/D3D12SM6WaveIntrinsics/src/D3D12SM6WaveIntrinsics.slnx b/Samples/Desktop/D3D12SM6WaveIntrinsics/src/D3D12SM6WaveIntrinsics.slnx index 637cd5049..d4ebe939c 100644 --- a/Samples/Desktop/D3D12SM6WaveIntrinsics/src/D3D12SM6WaveIntrinsics.slnx +++ b/Samples/Desktop/D3D12SM6WaveIntrinsics/src/D3D12SM6WaveIntrinsics.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12SM6WaveIntrinsics/src/D3D12SM6WaveIntrinsics.vcxproj b/Samples/Desktop/D3D12SM6WaveIntrinsics/src/D3D12SM6WaveIntrinsics.vcxproj index 6d884ec53..a590362c4 100644 --- a/Samples/Desktop/D3D12SM6WaveIntrinsics/src/D3D12SM6WaveIntrinsics.vcxproj +++ b/Samples/Desktop/D3D12SM6WaveIntrinsics/src/D3D12SM6WaveIntrinsics.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {D1425B0C-06B6-4FC2-9C3C-A699535C082E} Win32Proj D3D12SM6WaveIntrinsics D3D12SM6WaveIntrinsics - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -75,6 +112,28 @@ CompileShader_SM6.bat + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + false + false + + + %(AdditionalIncludeDirectories) + + + true + d3dcompiler.lib;d2d1.lib;dwrite.lib;d3d11.lib;d3d12.lib;dxgi.lib;%(AdditionalDependencies) + d3d12.dll + + + CompileShader_SM6.bat + + Level3 @@ -97,6 +156,28 @@ CompileShader_SM6.bat + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + + + true + true + true + d3dcompiler.lib;d2d1.lib;dwrite.lib;d3d11.lib;d3d12.lib;dxgi.lib;%(AdditionalDependencies) + d3d12.dll + + + CompileShader_SM6.bat + + @@ -116,38 +197,60 @@ Create + Create Create + Create false + false Document false + false dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso %(Identity) + %(Identity) %(Identity) + %(Identity) false + false Document false + false dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso %(Identity) + %(Identity) %(Identity) + %(Identity) diff --git a/Samples/Desktop/D3D12SmallResources/src/D3D12SmallResources.slnx b/Samples/Desktop/D3D12SmallResources/src/D3D12SmallResources.slnx index 9970fefb4..13e4aec28 100644 --- a/Samples/Desktop/D3D12SmallResources/src/D3D12SmallResources.slnx +++ b/Samples/Desktop/D3D12SmallResources/src/D3D12SmallResources.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12SmallResources/src/D3D12SmallResources.vcxproj b/Samples/Desktop/D3D12SmallResources/src/D3D12SmallResources.vcxproj index 1bf463b25..356b68ed5 100644 --- a/Samples/Desktop/D3D12SmallResources/src/D3D12SmallResources.vcxproj +++ b/Samples/Desktop/D3D12SmallResources/src/D3D12SmallResources.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {A6DB1D1C-E2EE-462D-AC61-0E3100C010DF} Win32Proj D3D12SmallResources D3D12SmallResources - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -78,6 +115,31 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + Level3 @@ -107,6 +169,35 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + @@ -121,22 +212,34 @@ Create + Create Create + Create Document true + true true + true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso diff --git a/Samples/Desktop/D3D12StateObjectDatabase/src/D3D12StateObjectDatabase Sample.slnx b/Samples/Desktop/D3D12StateObjectDatabase/src/D3D12StateObjectDatabase Sample.slnx index f69a81a79..678e42c83 100644 --- a/Samples/Desktop/D3D12StateObjectDatabase/src/D3D12StateObjectDatabase Sample.slnx +++ b/Samples/Desktop/D3D12StateObjectDatabase/src/D3D12StateObjectDatabase Sample.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12StateObjectDatabase/src/StateObjectDatabase Sample.vcxproj b/Samples/Desktop/D3D12StateObjectDatabase/src/StateObjectDatabase Sample.vcxproj index 172db39ec..21ff87891 100644 --- a/Samples/Desktop/D3D12StateObjectDatabase/src/StateObjectDatabase Sample.vcxproj +++ b/Samples/Desktop/D3D12StateObjectDatabase/src/StateObjectDatabase Sample.vcxproj @@ -1,4 +1,4 @@ - + @@ -15,10 +15,18 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + 17.0 @@ -30,28 +38,41 @@ + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) Application false - v143 true Unicode + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v143 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v143 true Unicode @@ -69,9 +90,15 @@ + + + + + + @@ -114,6 +141,21 @@ dxcompiler.lib;d3d12.lib;%(AdditionalDependencies) + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + $(OutDir) + + + Console + true + dxcompiler.lib;d3d12.lib;%(AdditionalDependencies) + + Level3 @@ -130,6 +172,22 @@ dxcompiler.lib;d3d12.lib;%(AdditionalDependencies) + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + $(OutDir) + + + Console + true + dxcompiler.lib;d3d12.lib;%(AdditionalDependencies) + + @@ -146,12 +204,19 @@ Pixel 6.5 NoRootSignaturePS + NoRootSignaturePS false + false Pixel + Pixel 6.5 + 6.5 NoRootSignaturePS + NoRootSignaturePS Pixel + Pixel 6.5 + 6.5 $(OutDir)\NoRootSignaturePS.h @@ -159,15 +224,22 @@ $(OutDir)\NoRootSignaturePS.h + $(OutDir)\NoRootSignaturePS.h + + $(OutDir)\NoRootSignaturePS.h + $(OutDir)\NoRootSignaturePS.h + + false false + false NoRootSignatureVS Vertex 6.5 @@ -175,23 +247,35 @@ Vertex 6.5 NoRootSignatureVS + NoRootSignatureVS Vertex + Vertex 6.5 + 6.5 NoRootSignatureVS + NoRootSignatureVS Vertex + Vertex 6.5 + 6.5 $(OutDir)\NoRootSignatureVS.h $(OutDir)\NoRootSignatureVS.h $(OutDir)\NoRootSignatureVS.h + $(OutDir)\NoRootSignatureVS.h $(OutDir)\NoRootSignatureVS.h + $(OutDir)\NoRootSignatureVS.h + + + + PositionColorPS @@ -202,12 +286,19 @@ Pixel 6.5 PositionColorPS + PositionColorPS false + false Pixel + Pixel 6.5 + 6.5 PositionColorPS + PositionColorPS Pixel + Pixel 6.5 + 6.5 $(OutDir)\PositionColorPS.h @@ -215,11 +306,17 @@ $(OutDir)\PositionColorPS.h + $(OutDir)\PositionColorPS.h + + $(OutDir)\PositionColorPS.h + $(OutDir)\PositionColorPS.h + + PositionColorVS @@ -230,12 +327,19 @@ Vertex 6.5 PositionColorVS + PositionColorVS false + false Vertex + Vertex 6.5 + 6.5 PositionColorVS + PositionColorVS Vertex + Vertex 6.5 + 6.5 $(OutDir)\PositionColorVS.h @@ -243,26 +347,45 @@ $(OutDir)\PositionColorVS.h + $(OutDir)\PositionColorVS.h + + $(OutDir)\PositionColorVS.h + $(OutDir)\PositionColorVS.h + + + + 6.5 + 6.5 + + Library + Library $(OutDir)\RayTracing.h + $(OutDir)\RayTracing.h + + g_RayTracingLib + g_RayTracingLib + + false + false false g_RayTracingLib @@ -271,8 +394,11 @@ g_RayTracingLib + g_RayTracingLib + + $(OutDir)\RayTracing.h @@ -280,9 +406,14 @@ 6.5 + + Library + Library 6.5 + 6.5 $(OutDir)\RayTracing.h + $(OutDir)\RayTracing.h RootSignaturePS @@ -292,11 +423,17 @@ Pixel 6.5 RootSignaturePS + RootSignaturePS Pixel + Pixel 6.5 + 6.5 RootSignaturePS + RootSignaturePS Pixel + Pixel 6.5 + 6.5 $(OutDir)\RootSignaturePS.h @@ -304,22 +441,36 @@ $(OutDir)\RootSignaturePS.h + $(OutDir)\RootSignaturePS.h + + $(OutDir)\RootSignaturePS.h + $(OutDir)\RootSignaturePS.h + + false false + false RootSignatureVS + RootSignatureVS false + false Vertex + Vertex 6.5 + 6.5 $(OutDir)\RootSignatureVS.h + $(OutDir)\RootSignatureVS.h + + $(OutDir)\RootSignatureVS.h @@ -334,11 +485,17 @@ RootSignatureVS + RootSignatureVS Vertex + Vertex 6.7 + 6.7 $(OutDir)\RootSignatureVS.h + $(OutDir)\RootSignatureVS.h + + diff --git a/Samples/Desktop/D3D12VariableRateShading/src/D3D12VariableRateShading.slnx b/Samples/Desktop/D3D12VariableRateShading/src/D3D12VariableRateShading.slnx index ad027dfdd..b0577779a 100644 --- a/Samples/Desktop/D3D12VariableRateShading/src/D3D12VariableRateShading.slnx +++ b/Samples/Desktop/D3D12VariableRateShading/src/D3D12VariableRateShading.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12VariableRateShading/src/D3D12VariableRateShading.vcxproj b/Samples/Desktop/D3D12VariableRateShading/src/D3D12VariableRateShading.vcxproj index 30e3de7ac..45746bcd2 100644 --- a/Samples/Desktop/D3D12VariableRateShading/src/D3D12VariableRateShading.vcxproj +++ b/Samples/Desktop/D3D12VariableRateShading/src/D3D12VariableRateShading.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {60ABBAA1-404D-43B9-88E1-EE8EFFF29B70} Win32Proj D3D12VariableRateShading D3D12VariableRateShading - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,9 +60,15 @@ + + + + + + true @@ -50,6 +77,13 @@ true true + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + true + true + false bin\$(Platform)\$(Configuration)\ @@ -57,6 +91,13 @@ true true + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + true + true + Use @@ -77,6 +118,26 @@ PerMonitorHighDPIAware + + + Use + Level3 + Disabled + WIN32;DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + d3dcompiler.lib;dxgi.lib;d3d12.lib;d3d11.lib;d2d1.lib;dwrite.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + PerMonitorHighDPIAware + + Level3 @@ -104,6 +165,33 @@ PerMonitorHighDPIAware + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + d3dcompiler.lib;dxgi.lib;d3d12.lib;d3d11.lib;d2d1.lib;dwrite.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + PerMonitorHighDPIAware + + @@ -130,7 +218,9 @@ Create + Create Create + Create @@ -142,98 +232,160 @@ true + true Document true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true true + true Document true + true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso true + true Document true + true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso true + true Document true + true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso true + true Document true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true true + true Document true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true true + true Document true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true diff --git a/Samples/Desktop/D3D12nBodyGravity/src/D3D12nBodyGravity.slnx b/Samples/Desktop/D3D12nBodyGravity/src/D3D12nBodyGravity.slnx index 2996b03c7..0faa70668 100644 --- a/Samples/Desktop/D3D12nBodyGravity/src/D3D12nBodyGravity.slnx +++ b/Samples/Desktop/D3D12nBodyGravity/src/D3D12nBodyGravity.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12nBodyGravity/src/D3D12nBodyGravity.vcxproj b/Samples/Desktop/D3D12nBodyGravity/src/D3D12nBodyGravity.vcxproj index eead5b4b1..c9f87884f 100644 --- a/Samples/Desktop/D3D12nBodyGravity/src/D3D12nBodyGravity.vcxproj +++ b/Samples/Desktop/D3D12nBodyGravity/src/D3D12nBodyGravity.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {2E637720-4AEE-45B5-A5AC-D165E5623DB9} Win32Proj D3D12nBodyGravity D3D12nBodyGravity - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,20 +60,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -78,6 +115,31 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + Level3 @@ -107,6 +169,35 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + dxgi.lib;d3d12.lib;d3dcompiler.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + @@ -124,35 +215,57 @@ Create + Create Create + Create true + true Document true + true dxc.exe -nologo -Tcs_6_0 -E"CSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tcs_6_0 -E"CSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso dxc.exe -nologo -Tcs_6_0 -E"CSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" + dxc.exe -nologo -Tcs_6_0 -E"CSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename).cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename).cso + $(OutDir)%(Filename).cso true + true Document true + true dxc.exe -nologo -Tvs_6_0 -E"VSParticleDraw" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VS.cso" "%(FullPath)" dxc.exe -nologo -Tgs_6_0 -E"GSParticleDraw" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_GS.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSParticleDraw" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PS.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSParticleDraw" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VS.cso" "%(FullPath)" +dxc.exe -nologo -Tgs_6_0 -E"GSParticleDraw" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_GS.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSParticleDraw" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PS.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VS.cso;$(OutDir)%(Filename)_GS.cso;$(OutDir)%(Filename)_PS.cso + $(OutDir)%(Filename)_VS.cso;$(OutDir)%(Filename)_GS.cso;$(OutDir)%(Filename)_PS.cso dxc.exe -nologo -Tvs_6_0 -E"VSParticleDraw" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VS.cso" "%(FullPath)" dxc.exe -nologo -Tgs_6_0 -E"GSParticleDraw" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_GS.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSParticleDraw" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PS.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSParticleDraw" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VS.cso" "%(FullPath)" +dxc.exe -nologo -Tgs_6_0 -E"GSParticleDraw" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_GS.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSParticleDraw" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PS.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VS.cso;$(OutDir)%(Filename)_GS.cso;$(OutDir)%(Filename)_PS.cso + $(OutDir)%(Filename)_VS.cso;$(OutDir)%(Filename)_GS.cso;$(OutDir)%(Filename)_PS.cso diff --git a/Samples/Desktop/D3D12xGPU/src/D3D12xGPU.slnx b/Samples/Desktop/D3D12xGPU/src/D3D12xGPU.slnx index 98b5fc668..eb5586ff5 100644 --- a/Samples/Desktop/D3D12xGPU/src/D3D12xGPU.slnx +++ b/Samples/Desktop/D3D12xGPU/src/D3D12xGPU.slnx @@ -1,6 +1,7 @@ + diff --git a/Samples/Desktop/D3D12xGPU/src/D3D12xGPU.vcxproj b/Samples/Desktop/D3D12xGPU/src/D3D12xGPU.vcxproj index 783ff9ca6..daa8d33b4 100644 --- a/Samples/Desktop/D3D12xGPU/src/D3D12xGPU.vcxproj +++ b/Samples/Desktop/D3D12xGPU/src/D3D12xGPU.vcxproj @@ -7,29 +7,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {9337191E-8566-464A-A0F7-622DC54DCB65} Win32Proj D3D12xGPU D3D12xGPU - 10.0.19041.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v142 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v142 true Unicode @@ -39,9 +60,15 @@ + + + + + + true @@ -50,6 +77,13 @@ true true + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + true + true + false bin\$(Platform)\$(Configuration)\ @@ -57,6 +91,13 @@ true true + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + true + true + Use @@ -77,6 +118,26 @@ PerMonitorHighDPIAware + + + Use + Level3 + Disabled + WIN32;DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + d3dcompiler.lib;dxgi.lib;d3d12.lib;d3d11.lib;d2d1.lib;dwrite.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + PerMonitorHighDPIAware + + Level3 @@ -104,6 +165,33 @@ PerMonitorHighDPIAware + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + + + Windows + true + true + true + d3dcompiler.lib;dxgi.lib;d3d12.lib;d3d11.lib;d2d1.lib;dwrite.lib;dxguid.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + PerMonitorHighDPIAware + + @@ -128,7 +216,9 @@ Create + Create Create + Create @@ -139,58 +229,94 @@ true + true Document true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true true + true Document true + true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso true + true Document true + true dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" +dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" + dxc.exe -nologo -Tvs_6_0 -E"VSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_VSMain.cso" "%(FullPath)" dxc.exe -nologo -Tps_6_0 -E"PSMain" -Zi -Qembed_debug -Fo"$(OutDir)%(Filename)_PSMain.cso" "%(FullPath)" %(Identity) + %(Identity) $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso + $(OutDir)%(Filename)_VSMain.cso;$(OutDir)%(Filename)_PSMain.cso true + true Document true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true copy %(Identity) "$(OutDir)" > NUL + copy %(Identity) "$(OutDir)" > NUL $(OutDir)\%(Identity) + $(OutDir)\%(Identity) true + true diff --git a/TechniqueDemos/D3D12MemoryManagement/src/D3D12MemoryManagement.slnx b/TechniqueDemos/D3D12MemoryManagement/src/D3D12MemoryManagement.slnx index 542974b69..e957688cd 100644 --- a/TechniqueDemos/D3D12MemoryManagement/src/D3D12MemoryManagement.slnx +++ b/TechniqueDemos/D3D12MemoryManagement/src/D3D12MemoryManagement.slnx @@ -1,6 +1,7 @@ + diff --git a/TechniqueDemos/D3D12MemoryManagement/src/D3D12MemoryManagement.vcxproj b/TechniqueDemos/D3D12MemoryManagement/src/D3D12MemoryManagement.vcxproj index dd0064f85..4ad6c133f 100644 --- a/TechniqueDemos/D3D12MemoryManagement/src/D3D12MemoryManagement.vcxproj +++ b/TechniqueDemos/D3D12MemoryManagement/src/D3D12MemoryManagement.vcxproj @@ -5,29 +5,50 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + {DB40D747-0C18-47BA-A8E8-316562316632} Win32Proj D3D12MemoryManagement D3D12MemoryManagement - 10.0.14393.0 + 10.0 + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v140 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v140 true Unicode @@ -37,20 +58,36 @@ + + + + + + true bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + Use @@ -74,6 +111,29 @@ false + + + Use + Disabled + WIN32;_DEBUG;_WINDOWS;_CONSOLE;%(PreprocessorDefinitions) + true + false + true + + + %(AdditionalIncludeDirectories) + Level3 + + + Console + true + d3d12.lib;d3d11.lib;dxgi.lib;d3dcompiler.lib;windowscodecs.lib;d2d1.lib;dwrite.lib;%(AdditionalDependencies) + d3d12.dll + + + false + + Use @@ -97,18 +157,49 @@ false + + + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_CONSOLE;%(PreprocessorDefinitions) + true + %(AdditionalIncludeDirectories) + Level3 + + + Console + true + true + true + d3d12.lib;d3d11.lib;dxgi.lib;d3dcompiler.lib;windowscodecs.lib;d2d1.lib;dwrite.lib;%(AdditionalDependencies) + d3d12.dll + + + false + + true Document copy %(Identity) "$(OutDir)Assets\Textures" > NUL + copy %(Identity) "$(OutDir)Assets\Textures" > NUL $(OutDir)Assets\Textures\%(Identity) + $(OutDir)Assets\Textures\%(Identity) true + true copy %(Identity) "$(OutDir)Assets\Textures" > NUL + copy %(Identity) "$(OutDir)Assets\Textures" > NUL $(OutDir)Assets\Textures\%(Identity) + $(OutDir)Assets\Textures\%(Identity) true + true Copying TileGrid.dds to output location + Copying TileGrid.dds to output location Copying TileGrid.dds to output location + Copying TileGrid.dds to output location @@ -116,25 +207,41 @@ true Document copy %(Identity) "$(OutDir)Assets\Shaders" > NUL + copy %(Identity) "$(OutDir)Assets\Shaders" > NUL $(OutDir)Assets\Shaders\%(Identity) + $(OutDir)Assets\Shaders\%(Identity) true + true copy %(Identity) "$(OutDir)Assets\Shaders" > NUL + copy %(Identity) "$(OutDir)Assets\Shaders" > NUL $(OutDir)Assets\Shaders\%(Identity) + $(OutDir)Assets\Shaders\%(Identity) true + true Copying Color.hlsl to output location + Copying Color.hlsl to output location Copying Color.hlsl to output location + Copying Color.hlsl to output location true Document copy %(Identity) "$(OutDir)Assets\Shaders" > NUL + copy %(Identity) "$(OutDir)Assets\Shaders" > NUL $(OutDir)Assets\Shaders\%(Identity) + $(OutDir)Assets\Shaders\%(Identity) true + true copy %(Identity) "$(OutDir)Assets\Shaders" > NUL + copy %(Identity) "$(OutDir)Assets\Shaders" > NUL $(OutDir)Assets\Shaders\%(Identity) + $(OutDir)Assets\Shaders\%(Identity) true + true Copying Texture.hlsl to output location + Copying Texture.hlsl to output location Copying Texture.hlsl to output location + Copying Texture.hlsl to output location @@ -164,7 +271,9 @@ Create + Create Create + Create diff --git a/Tools/DXGIAdapterRemovalSupportTest/src/DXGIAdapterRemovalSupportTest.slnx b/Tools/DXGIAdapterRemovalSupportTest/src/DXGIAdapterRemovalSupportTest.slnx index a202d7f22..f97d6ead3 100644 --- a/Tools/DXGIAdapterRemovalSupportTest/src/DXGIAdapterRemovalSupportTest.slnx +++ b/Tools/DXGIAdapterRemovalSupportTest/src/DXGIAdapterRemovalSupportTest.slnx @@ -1,6 +1,7 @@ + diff --git a/Tools/DXGIAdapterRemovalSupportTest/src/DXGIAdapterRemovalSupportTest.vcxproj b/Tools/DXGIAdapterRemovalSupportTest/src/DXGIAdapterRemovalSupportTest.vcxproj index f3ec8a774..ecd322390 100644 --- a/Tools/DXGIAdapterRemovalSupportTest/src/DXGIAdapterRemovalSupportTest.vcxproj +++ b/Tools/DXGIAdapterRemovalSupportTest/src/DXGIAdapterRemovalSupportTest.vcxproj @@ -1,4 +1,4 @@ - + @@ -13,42 +13,63 @@ Debug x64 + + Debug + ARM64 + Release x64 + + Release + ARM64 + 15.0 {A7E7C729-937E-4E30-A9C0-F56E9B6F5E07} Win32Proj DXGIAdapterRemovalSupportTest - 10.0.16299.0 + 10.0 + $(DefaultPlatformToolset) Application true - v141 Unicode + $(DefaultPlatformToolset) Application false - v141 true Unicode + $(DefaultPlatformToolset) + Application + true + Unicode + + + $(DefaultPlatformToolset) Application true - v141 Unicode + $(DefaultPlatformToolset) + Application + false + true + Unicode + + + $(DefaultPlatformToolset) Application false - v141 true Unicode @@ -66,9 +87,15 @@ + + + + + + true @@ -76,12 +103,18 @@ true + + true + false false + + false + NotUsing @@ -116,6 +149,23 @@ dxgi.lib;OneCoreUAP.lib;%(AdditionalDependencies) + + + NotUsing + Level3 + Disabled + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + MultiThreadedDebug + + + Console + true + dxgi.lib;OneCoreUAP.lib;%(AdditionalDependencies) + + NotUsing @@ -158,6 +208,27 @@ dxgi.lib;OneCoreUAP.lib;%(AdditionalDependencies) + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + MultiThreaded + + + Console + true + true + true + dxgi.lib;OneCoreUAP.lib;%(AdditionalDependencies) + + From 00df1019c4d3b305dd5cec9324ac43bed9af5874 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 8 Jul 2026 15:05:58 -0700 Subject: [PATCH 04/10] Replace deprecated Direct2D GetDesktopDpi with GetDpiForWindow Floating the pinned Windows SDK to the latest installed version (part of the ARM64 build enablement) surfaces ID2D1Factory::GetDesktopDpi as deprecated, which this project's SDLCheck promotes to a hard build error. This is purely an SDK-upgrade compatibility fix and is unrelated to the ARM64 platform itself. Switch to GetDpiForWindow(m_Hwnd) -- the recommended replacement -- which queries per-monitor DPI. m_Hwnd is created before CreateSwapChainResources, so it is valid here; behavior matches the previous single system-DPI value. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- TechniqueDemos/D3D12MemoryManagement/src/Framework.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TechniqueDemos/D3D12MemoryManagement/src/Framework.cpp b/TechniqueDemos/D3D12MemoryManagement/src/Framework.cpp index 700bd26d9..9c84d4413 100644 --- a/TechniqueDemos/D3D12MemoryManagement/src/Framework.cpp +++ b/TechniqueDemos/D3D12MemoryManagement/src/Framework.cpp @@ -765,7 +765,7 @@ HRESULT DX12Framework::CreateSwapChainResources() float dpiX; float dpiY; - m_pD2DFactory->GetDesktopDpi(&dpiX, &dpiY); + dpiX = dpiY = static_cast(GetDpiForWindow(m_Hwnd)); D2D1_BITMAP_PROPERTIES1 bitmapProperties = D2D1::BitmapProperties1( D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW, D2D1::PixelFormat(DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_PREMULTIPLIED), From 81c376431fdcb721ed61d4e587dd5338f9f10a05 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 8 Jul 2026 16:16:10 -0700 Subject: [PATCH 05/10] Migrate DirectXTK12/DirectXTex/DirectXMesh from NuGet to vcpkg The prebuilt directx*_desktop NuGet packages are deprecated and their ARM64 static libs fail to link against the current toolset (they reference legacy STL __std_init_once symbols the current arm64 msvcprt.lib only resolves for code built with the current STL). Build these three static libraries from source via vcpkg instead, so they use the same toolset as the samples -- this fixes ARM64 and aligns with Microsoft's deprecation guidance. Header/binary NuGet deps (Agility SDK, DXC, WinPix, WARP) are unaffected. Add a repo-root vcpkg manifest (vcpkg.json + pinned builtin-baseline) and shared MSBuild integration (vcpkg/DirectX.vcpkg.props/.targets) that: - derive the triplet from $(Platform) as -windows-static-md (static lib, dynamic CRT to match the samples' /MD); - request the directxtex/directxmesh 'dx12' feature (the D3D12 helpers the samples use, e.g. ComputeInputLayout(D3D12_INPUT_LAYOUT_DESC), are off by default in the base ports); - add include\directxtk12 to the include path (vcpkg nests DirectXTK12 headers there whereas the NuGet layout was flat); - derive VcpkgConfiguration from the configuration name so projects like MiniEngine that set RuntimeLibrary directly (without UseDebugLibraries) still link the matching debug/release libraries. Update all consumers to import the shared props/targets, drop the NuGet directx* imports/error-checks, and remove them from packages.config. Uses the vcpkg bundled with Visual Studio by default (no VCPKG_ROOT needed). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .gitignore | 3 ++ MiniEngine/Model/Model.vcxproj | 7 ++-- MiniEngine/Model/packages.config | 5 --- .../ModelConverter/ModelConverter.vcxproj | 6 ++-- MiniEngine/ModelConverter/packages.config | 2 -- MiniEngine/ModelViewer/ModelViewer.vcxproj | 6 ++-- MiniEngine/ModelViewer/packages.config | 2 -- .../D3D12WavefrontConverter.vcxproj | 7 ++-- .../src/WavefrontConverter/packages.config | 4 --- .../ModelViewer_VS16.vcxproj | 6 ++-- .../packages.config | 2 -- .../D3D12RaytracingOpacityMicromaps.vcxproj | 3 +- .../packages.config | 1 - ...ngRealTimeDenoisedAmbientOcclusion.vcxproj | 4 +-- .../packages.config | 1 - .../D3D12RaytracingSakuraForestSER.vcxproj | 6 ++-- .../packages.config | 2 -- vcpkg.json | 11 ++++++ vcpkg/DirectX.vcpkg.props | 36 +++++++++++++++++++ vcpkg/DirectX.vcpkg.targets | 28 +++++++++++++++ 20 files changed, 94 insertions(+), 48 deletions(-) delete mode 100644 MiniEngine/Model/packages.config delete mode 100644 Samples/Desktop/D3D12MeshShaders/src/WavefrontConverter/packages.config create mode 100644 vcpkg.json create mode 100644 vcpkg/DirectX.vcpkg.props create mode 100644 vcpkg/DirectX.vcpkg.targets diff --git a/.gitignore b/.gitignore index a75ec07ba..28493e9f3 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ Samples/Desktop/D3D12HelloWorld/src/HelloVAEncode/*.h264 /Samples/Desktop/D3D12Raytracing/src/D3D12OMMOfflineBaker/jacaranda_tree_4k.obj /Samples/Desktop/**/x64 + +# vcpkg manifest-mode install tree +vcpkg_installed/ diff --git a/MiniEngine/Model/Model.vcxproj b/MiniEngine/Model/Model.vcxproj index 7ddd99499..e404d3433 100644 --- a/MiniEngine/Model/Model.vcxproj +++ b/MiniEngine/Model/Model.vcxproj @@ -32,6 +32,7 @@ false + @@ -91,7 +92,6 @@ - @@ -173,15 +173,12 @@ + - - 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}. - - \ No newline at end of file diff --git a/MiniEngine/Model/packages.config b/MiniEngine/Model/packages.config deleted file mode 100644 index c9a748042..000000000 --- a/MiniEngine/Model/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/MiniEngine/ModelConverter/ModelConverter.vcxproj b/MiniEngine/ModelConverter/ModelConverter.vcxproj index 27d0f10f6..a80687b92 100644 --- a/MiniEngine/ModelConverter/ModelConverter.vcxproj +++ b/MiniEngine/ModelConverter/ModelConverter.vcxproj @@ -28,6 +28,7 @@ false + @@ -74,6 +75,7 @@ + ..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\lib_release;%(AdditionalLibraryDirectories) @@ -92,8 +94,6 @@ - - @@ -102,7 +102,5 @@ - - \ No newline at end of file diff --git a/MiniEngine/ModelConverter/packages.config b/MiniEngine/ModelConverter/packages.config index 5978ba83d..496d3976e 100644 --- a/MiniEngine/ModelConverter/packages.config +++ b/MiniEngine/ModelConverter/packages.config @@ -1,8 +1,6 @@  - - \ No newline at end of file diff --git a/MiniEngine/ModelViewer/ModelViewer.vcxproj b/MiniEngine/ModelViewer/ModelViewer.vcxproj index 044066094..a1d223e2a 100644 --- a/MiniEngine/ModelViewer/ModelViewer.vcxproj +++ b/MiniEngine/ModelViewer/ModelViewer.vcxproj @@ -32,6 +32,7 @@ false + @@ -353,6 +354,7 @@ + ..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\lib_release;%(AdditionalLibraryDirectories) @@ -361,8 +363,6 @@ - - @@ -370,8 +370,6 @@ 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}. - - \ No newline at end of file diff --git a/MiniEngine/ModelViewer/packages.config b/MiniEngine/ModelViewer/packages.config index feec40999..d89bb5df5 100644 --- a/MiniEngine/ModelViewer/packages.config +++ b/MiniEngine/ModelViewer/packages.config @@ -1,7 +1,5 @@  - - \ No newline at end of file diff --git a/Samples/Desktop/D3D12MeshShaders/src/WavefrontConverter/D3D12WavefrontConverter.vcxproj b/Samples/Desktop/D3D12MeshShaders/src/WavefrontConverter/D3D12WavefrontConverter.vcxproj index 2880d3d8d..a3aa2d4f9 100644 --- a/Samples/Desktop/D3D12MeshShaders/src/WavefrontConverter/D3D12WavefrontConverter.vcxproj +++ b/Samples/Desktop/D3D12MeshShaders/src/WavefrontConverter/D3D12WavefrontConverter.vcxproj @@ -37,9 +37,6 @@ - - - 15.0 {D4DBD8B1-49CA-4BC3-87E1-9128CF8F1126} @@ -76,6 +73,7 @@ MultiByte + @@ -188,13 +186,12 @@ + - 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}. - \ No newline at end of file diff --git a/Samples/Desktop/D3D12MeshShaders/src/WavefrontConverter/packages.config b/Samples/Desktop/D3D12MeshShaders/src/WavefrontConverter/packages.config deleted file mode 100644 index b080f6ab9..000000000 --- a/Samples/Desktop/D3D12MeshShaders/src/WavefrontConverter/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj index 862a940d3..0f081e8e5 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj @@ -50,6 +50,7 @@ Unicode + @@ -216,6 +217,7 @@ + /nodefaultlib:LIBCMT %(AdditionalOptions) @@ -229,15 +231,11 @@ - - 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}. - - \ No newline at end of file diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/packages.config b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/packages.config index 130e974fd..e81fa556a 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/packages.config +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/packages.config @@ -1,6 +1,4 @@  - - \ No newline at end of file diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.vcxproj index fd4cad0ee..0f9434883 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/D3D12RaytracingOpacityMicromaps.vcxproj @@ -61,6 +61,7 @@ Unicode + @@ -362,9 +363,9 @@ + - diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/packages.config b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/packages.config index 78eeb870c..ecd10d3af 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/packages.config +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingOpacityMicromaps/packages.config @@ -1,6 +1,5 @@  - diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/D3D12RaytracingRealTimeDenoisedAmbientOcclusion.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/D3D12RaytracingRealTimeDenoisedAmbientOcclusion.vcxproj index 908df8085..001be0dcf 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/D3D12RaytracingRealTimeDenoisedAmbientOcclusion.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/D3D12RaytracingRealTimeDenoisedAmbientOcclusion.vcxproj @@ -43,6 +43,7 @@ Unicode + @@ -650,15 +651,14 @@ + - 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}. - \ No newline at end of file diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/packages.config b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/packages.config index 99f9067b1..e81fa556a 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/packages.config +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.vcxproj index 9c8776632..75825a165 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/D3D12RaytracingSakuraForestSER.vcxproj @@ -55,6 +55,7 @@ Unicode + @@ -356,10 +357,9 @@ + - - @@ -368,8 +368,6 @@ 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}. - - diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/packages.config b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/packages.config index fe7c090d3..f6f24d331 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/packages.config +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingSakuraForestSER/packages.config @@ -1,7 +1,5 @@  - - diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 000000000..6608269f4 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,11 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "directx-graphics-samples", + "version-string": "1.0.0", + "builtin-baseline": "3af1d1e60af2b2abf55760538cd607829029b07a", + "dependencies": [ + { "name": "directxtk12", "default-features": false }, + { "name": "directxtex", "features": [ "dx12" ] }, + { "name": "directxmesh", "features": [ "dx12" ] } + ] +} diff --git a/vcpkg/DirectX.vcpkg.props b/vcpkg/DirectX.vcpkg.props new file mode 100644 index 000000000..189b043e0 --- /dev/null +++ b/vcpkg/DirectX.vcpkg.props @@ -0,0 +1,36 @@ + + + + + true + true + true + true + + Debug + Release + + $(VCPKG_ROOT) + $(VsInstallRoot)\vc\vcpkg\ + $(VcpkgRoot)\ + + $(VcpkgRoot)scripts\buildsystems\msbuild\vcpkg-general.xml + + + diff --git a/vcpkg/DirectX.vcpkg.targets b/vcpkg/DirectX.vcpkg.targets new file mode 100644 index 000000000..f32150bf9 --- /dev/null +++ b/vcpkg/DirectX.vcpkg.targets @@ -0,0 +1,28 @@ + + + + + + + This project requires the vcpkg integration support in Visual Studio. Add the Microsoft.VisualStudio.Component.Vcpkg component to your install (or set VCPKG_ROOT). + + + + + + + + %(AdditionalIncludeDirectories);$(_ZVcpkgCurrentInstalledDir)include\directxtk12 + + + From 0f03fd0d312bf4e8c627d325e0911d8a8ec20b11 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 8 Jul 2026 16:21:09 -0700 Subject: [PATCH 06/10] Fix ModelConverter zlib NuGet package reference packages.config listed zlib-vc140-static-64, but ModelConverter.vcxproj references zlib-msvc-x64.1.2.11.8900 (imports its targets and links zlibstatic.lib from its lib_release). The referenced package was therefore never restored on a clean machine, failing the build with a missing zlib-msvc-x64.targets. Align packages.config to the package the project actually uses. Verified a clean restore now fetches it and ModelConverter builds and links. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- MiniEngine/ModelConverter/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MiniEngine/ModelConverter/packages.config b/MiniEngine/ModelConverter/packages.config index 496d3976e..562c0228a 100644 --- a/MiniEngine/ModelConverter/packages.config +++ b/MiniEngine/ModelConverter/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file From aa05ea3ed5564a5a295923e05439315e4d3d3e11 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 8 Jul 2026 16:43:29 -0700 Subject: [PATCH 07/10] Port MiniEngine SSE intrinsics to NEON/portable for ARM64 MiniEngine/Core used x86 SSE intrinsics that do not compile on ARM64: - Utility.cpp SIMDMemCopy/SIMDMemFill: add an ARM64 NEON implementation (vld1q/vst1q) alongside the existing SSE (streaming-store) path, guarded by _M_ARM64. Change the SIMDMemFill signature from __m128 to DirectX::XMVECTOR (identical to __m128 on x64) so it is expressible on both architectures. - Color.h R10G10B10A2/R8G8B8A8: replace _mm_castsi128_ps(_mm_cvttps_epi32(..)) with the portable XMConvertVectorFloatToInt(.., 0) (same truncate-to-int). - CommandContext.cpp FillBuffer: build the fill pattern with XMVectorReplicate instead of _mm_set1_ps. Math/Common.h, Color.cpp and Hash.h already had non-SSE fallbacks, and the _BitScan*/__popcnt intrinsics are available on MSVC ARM64, so no change there. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- MiniEngine/Core/Color.h | 4 ++-- MiniEngine/Core/CommandContext.cpp | 2 +- MiniEngine/Core/Utility.cpp | 38 ++++++++++++++++++++++++++++-- MiniEngine/Core/Utility.h | 3 ++- 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/MiniEngine/Core/Color.h b/MiniEngine/Core/Color.h index 3b96a65bb..e47a8d620 100644 --- a/MiniEngine/Core/Color.h +++ b/MiniEngine/Core/Color.h @@ -133,7 +133,7 @@ inline Color Color::FromREC709( void ) const inline uint32_t Color::R10G10B10A2( void ) const { XMVECTOR result = XMVectorRound(XMVectorMultiply(XMVectorSaturate(m_value), XMVectorSet(1023.0f, 1023.0f, 1023.0f, 3.0f))); - result = _mm_castsi128_ps(_mm_cvttps_epi32(result)); + result = XMConvertVectorFloatToInt(result, 0); uint32_t r = XMVectorGetIntX(result); uint32_t g = XMVectorGetIntY(result); uint32_t b = XMVectorGetIntZ(result); @@ -144,7 +144,7 @@ inline uint32_t Color::R10G10B10A2( void ) const inline uint32_t Color::R8G8B8A8( void ) const { XMVECTOR result = XMVectorRound(XMVectorMultiply(XMVectorSaturate(m_value), XMVectorReplicate(255.0f))); - result = _mm_castsi128_ps(_mm_cvttps_epi32(result)); + result = XMConvertVectorFloatToInt(result, 0); uint32_t r = XMVectorGetIntX(result); uint32_t g = XMVectorGetIntY(result); uint32_t b = XMVectorGetIntZ(result); diff --git a/MiniEngine/Core/CommandContext.cpp b/MiniEngine/Core/CommandContext.cpp index ec2695d73..afe55abef 100644 --- a/MiniEngine/Core/CommandContext.cpp +++ b/MiniEngine/Core/CommandContext.cpp @@ -459,7 +459,7 @@ void CommandContext::WriteBuffer( GpuResource& Dest, size_t DestOffset, const vo void CommandContext::FillBuffer( GpuResource& Dest, size_t DestOffset, DWParam Value, size_t NumBytes ) { DynAlloc TempSpace = m_CpuLinearAllocator.Allocate( NumBytes, 512 ); - __m128 VectorValue = _mm_set1_ps(Value.Float); + DirectX::XMVECTOR VectorValue = DirectX::XMVectorReplicate(Value.Float); SIMDMemFill(TempSpace.DataPtr, VectorValue, Math::DivideByMultiple(NumBytes, 16)); CopyBufferRegion(Dest, DestOffset, TempSpace.Buffer, TempSpace.Offset, NumBytes ); } diff --git a/MiniEngine/Core/Utility.cpp b/MiniEngine/Core/Utility.cpp index 0ae3622a1..c342a1e30 100644 --- a/MiniEngine/Core/Utility.cpp +++ b/MiniEngine/Core/Utility.cpp @@ -15,8 +15,40 @@ #include "Utility.h" #include #include +#if defined(_M_ARM64) +#include +#endif -// A faster version of memcopy that uses SSE instructions. TODO: Write an ARM variant if necessary. +#if defined(_M_ARM64) + +// NEON variant. The SSE path below uses non-temporal (streaming) stores; on ARM64 we use +// ordinary NEON 128-bit loads/stores, which is sufficient for correctness. +void SIMDMemCopy( void* __restrict _Dest, const void* __restrict _Source, size_t NumQuadwords ) +{ + ASSERT(Math::IsAligned(_Dest, 16)); + ASSERT(Math::IsAligned(_Source, 16)); + + const uint32_t* __restrict Source = (const uint32_t* __restrict)_Source; + uint32_t* __restrict Dest = (uint32_t* __restrict)_Dest; + + for (size_t i = 0; i < NumQuadwords; ++i) + vst1q_u32(Dest + i * 4, vld1q_u32(Source + i * 4)); +} + +void SIMDMemFill( void* __restrict _Dest, DirectX::XMVECTOR FillVector, size_t NumQuadwords ) +{ + ASSERT(Math::IsAligned(_Dest, 16)); + + const float32x4_t Source = FillVector; + float* __restrict Dest = (float* __restrict)_Dest; + + for (size_t i = 0; i < NumQuadwords; ++i) + vst1q_f32(Dest + i * 4, Source); +} + +#else // SSE + +// A faster version of memcopy that uses SSE instructions. void SIMDMemCopy( void* __restrict _Dest, const void* __restrict _Source, size_t NumQuadwords ) { ASSERT(Math::IsAligned(_Dest, 16)); @@ -96,7 +128,7 @@ void SIMDMemCopy( void* __restrict _Dest, const void* __restrict _Source, size_t _mm_sfence(); } -void SIMDMemFill( void* __restrict _Dest, __m128 FillVector, size_t NumQuadwords ) +void SIMDMemFill( void* __restrict _Dest, DirectX::XMVECTOR FillVector, size_t NumQuadwords ) { ASSERT(Math::IsAligned(_Dest, 16)); @@ -136,6 +168,8 @@ void SIMDMemFill( void* __restrict _Dest, __m128 FillVector, size_t NumQuadwords _mm_sfence(); } +#endif // _M_ARM64 + std::wstring Utility::UTF8ToWideString( const std::string& str ) { wchar_t wstr[MAX_PATH]; diff --git a/MiniEngine/Core/Utility.h b/MiniEngine/Core/Utility.h index b50b10225..3e828d1bb 100644 --- a/MiniEngine/Core/Utility.h +++ b/MiniEngine/Core/Utility.h @@ -14,6 +14,7 @@ #pragma once #include "pch.h" +#include namespace Utility { @@ -160,4 +161,4 @@ namespace Utility #define BreakIfFailed( hr ) if (FAILED(hr)) __debugbreak() void SIMDMemCopy( void* __restrict Dest, const void* __restrict Source, size_t NumQuadwords ); -void SIMDMemFill( void* __restrict Dest, __m128 FillVector, size_t NumQuadwords ); +void SIMDMemFill( void* __restrict Dest, DirectX::XMVECTOR FillVector, size_t NumQuadwords ); From 0e01c8aa2594152209acf692e06ee20ef1b6516d Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 8 Jul 2026 16:43:45 -0700 Subject: [PATCH 08/10] Route MiniEngine shaders through DXC via shader model 6.0 MiniEngine's Build.props compiles shaders with -HV 2021 (HLSL 2021), which is a DXC-only option, but set no ShaderModel. VS therefore defaulted to the 4_0_level_9_3 profile and invoked legacy fxc.exe, which on current Windows SDKs rejects both -HV and the compute profile (cs_4_0_level_9_3) -- breaking clean builds on x64 and ARM64 alike (previously masked by cached CompiledShaders). Set ShaderModel 6.0 so the FxCompile task routes to dxc.exe, which supports -HV 2021 and compiles these shaders as SM6. A native arm64 dxc.exe is available. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- MiniEngine/PropertySheets/Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MiniEngine/PropertySheets/Build.props b/MiniEngine/PropertySheets/Build.props index 8031510da..2cbd5d87f 100644 --- a/MiniEngine/PropertySheets/Build.props +++ b/MiniEngine/PropertySheets/Build.props @@ -58,6 +58,8 @@ Compute + + 6.0 g_p%(Filename) $(SolutionDir)..\Build\$(Platform)\$(Configuration)\Output\$(ProjectName)\CompiledShaders\%(Filename).h false From 197c5f8ab181c2f1a67daf1a76efe29f3e65ea54 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 8 Jul 2026 16:43:45 -0700 Subject: [PATCH 09/10] Add ARM64 configurations to MiniEngine projects Add ARM64 Debug/Profile/Release configurations to the MiniEngine Core and Model libraries and the two MiniEngine-based raytracing samples (RaytracingMiniEngineSample, RealTimeDenoisedAmbientOcclusion), mirroring the existing x64 configurations. Also fix XMVECTOR aggregate initialization in RTAO's RaytracingSceneDefines.cpp (invalid for __n128 on ARM64) by using XMVectorSet, matching the earlier raytracing-sample fix. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- MiniEngine/Core/Core.vcxproj | 12 + MiniEngine/Model/Model.vcxproj | 12 + .../ModelViewer_VS16.vcxproj | 29 ++ ...ngRealTimeDenoisedAmbientOcclusion.vcxproj | 486 ++++++++++++++++++ .../SampleCore/RaytracingSceneDefines.cpp | 6 +- 5 files changed, 542 insertions(+), 3 deletions(-) diff --git a/MiniEngine/Core/Core.vcxproj b/MiniEngine/Core/Core.vcxproj index b431fb5bc..6fa3ef48e 100644 --- a/MiniEngine/Core/Core.vcxproj +++ b/MiniEngine/Core/Core.vcxproj @@ -6,14 +6,26 @@ Debug x64 + + Debug + ARM64 + Profile x64 + + Profile + ARM64 + Release x64 + + Release + ARM64 + Core diff --git a/MiniEngine/Model/Model.vcxproj b/MiniEngine/Model/Model.vcxproj index e404d3433..8967756ca 100644 --- a/MiniEngine/Model/Model.vcxproj +++ b/MiniEngine/Model/Model.vcxproj @@ -5,14 +5,26 @@ Debug x64 + + Debug + ARM64 + Profile x64 + + Profile + ARM64 + Release x64 + + Release + ARM64 + Model diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj index 0f081e8e5..3921b477f 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/ModelViewer_VS16.vcxproj @@ -7,29 +7,58 @@ MultiThreaded + + + + + + MultiThreaded + MultiThreaded + + + + MultiThreaded + MultiThreaded + + + + MultiThreaded + Debug x64 + + Debug + ARM64 + Profile x64 + + Profile + ARM64 + Release x64 + + Release + ARM64 + {315A1E1B-3732-41FE-9B4A-6A1E103BA2F5} diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/D3D12RaytracingRealTimeDenoisedAmbientOcclusion.vcxproj b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/D3D12RaytracingRealTimeDenoisedAmbientOcclusion.vcxproj index 001be0dcf..23a8bf9f5 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/D3D12RaytracingRealTimeDenoisedAmbientOcclusion.vcxproj +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/D3D12RaytracingRealTimeDenoisedAmbientOcclusion.vcxproj @@ -5,14 +5,26 @@ Debug x64 + + Debug + ARM64 + Profile x64 + + Profile + ARM64 + Release x64 + + Release + ARM64 + {19585C81-FB12-4A4B-B700-CCE253BDBA02} @@ -28,6 +40,12 @@ v143 Unicode + + Application + true + v143 + Unicode + Application false @@ -35,6 +53,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application false @@ -42,6 +67,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -49,12 +81,21 @@ + + + + + + + + + true @@ -62,18 +103,36 @@ obj\$(Platform)\$(Configuration)\ $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + true + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + false bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + + false + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName) + @@ -121,6 +180,40 @@ -Qembed_debug %(AdditionalOptions) + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + $(ProjectDir);util;util/Graphics;util/Misc;util/PBRTParser;$(IntDir);SampleCore;SampleCore\PBRTParser;RTAO;SampleCore\util;..\;%(AdditionalIncludeDirectories) + false + + + stdafx.h + stdcpp17 + + + Windows + true + d3d11.lib;d2d1.lib;dwrite.lib;d3d12.lib;dxgi.lib;dxguid.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + + false + true + -Qembed_debug %(AdditionalOptions) + + Level3 @@ -152,6 +245,37 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + $(ProjectDir);util;util/Graphics;util/Misc;util/PBRTParser;$(IntDir);SampleCore;SampleCore\PBRTParser;RTAO;SampleCore\util;..\;%(AdditionalIncludeDirectories) + false + stdafx.h + stdcpp17 + + + Windows + true + true + true + d3d11.lib;d2d1.lib;dwrite.lib;d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + Level3 @@ -183,6 +307,37 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;PROFILE;_WINDOWS;%(PreprocessorDefinitions) + true + $(ProjectDir);util;util/Graphics;util/Misc;util/PBRTParser;$(IntDir);SampleCore;SampleCore\PBRTParser;RTAO;SampleCore\util;..\;%(AdditionalIncludeDirectories) + false + stdafx.h + stdcpp17 + + + Windows + true + true + true + d3d11.lib;d2d1.lib;dwrite.lib;d3d12.lib;dxgi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + d3d12.dll + + + true + + + copy %(Identity) "$(OutDir)" > NUL + $(OutDir)\%(Identity) + true + + @@ -232,12 +387,17 @@ Create + Create Create + Create Create + Create + + @@ -245,8 +405,11 @@ false + false false + false false + false @@ -261,226 +424,419 @@ Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h Compute + Compute 6.3 + 6.3 g_p%(Filename) + g_p%(Filename) Compute + Compute Compute + Compute 6.3 + 6.3 6.3 + 6.3 g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) + + Compute + Compute 6.3 + 6.3 Compute + Compute Compute + Compute 6.3 + 6.3 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) + + Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) 6.3 + 6.3 /Zpr %(AdditionalOptions) + /Zpr %(AdditionalOptions) 6.3 + 6.3 /Zpr %(AdditionalOptions) + /Zpr %(AdditionalOptions) 6.3 + 6.3 /Zpr %(AdditionalOptions) + /Zpr %(AdditionalOptions) Library + Library $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h Library + Library $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h Library + Library $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) true + true + + $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h Compute + Compute 6.3 + 6.3 g_p%(Filename) + g_p%(Filename) Compute + Compute 6.3 + 6.3 g_p%(Filename) + g_p%(Filename) Compute + Compute 6.3 + 6.3 g_p%(Filename) + g_p%(Filename) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) Library + Library 6.3 + 6.3 Library + Library 6.3 + 6.3 Library + Library 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) /Zpr %(AdditionalOptions) + /Zpr %(AdditionalOptions) /Zpr %(AdditionalOptions) + /Zpr %(AdditionalOptions) /Zpr %(AdditionalOptions) + /Zpr %(AdditionalOptions) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) Compute + Compute 6.3 + 6.3 $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) Compute + Compute 6.3 + 6.3 $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) Compute + Compute 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) Compute + Compute 6.3 + 6.3 $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) Compute + Compute 6.3 + 6.3 $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) Compute + Compute 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) @@ -489,125 +845,231 @@ 6.3 + 6.3 6.3 + 6.3 6.3 + 6.3 Compute + Compute g_p%(Filename) + g_p%(Filename) $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h Compute + Compute Compute + Compute g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h true + true $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h Compute + Compute 6.3 + 6.3 g_p%(Filename) + g_p%(Filename) Compute + Compute Compute + Compute 6.3 + 6.3 6.3 + 6.3 g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 Compute + Compute 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) Compute + Compute 6.3 + 6.3 Compute + Compute Compute + Compute 6.3 + 6.3 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) 6.3 + 6.3 6.3 + 6.3 6.3 + 6.3 g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h Compute + Compute Compute + Compute Compute + Compute $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) Compute + Compute 6.3 + 6.3 Compute + Compute Compute + Compute 6.3 + 6.3 6.3 + 6.3 6.3 + 6.3 6.3 + 6.3 6.3 + 6.3 Compute + Compute Compute + Compute Compute + Compute $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) Compute + Compute 6.3 + 6.3 g_p%(Filename) + g_p%(Filename) Compute + Compute 6.3 + 6.3 g_p%(Filename) + g_p%(Filename) Compute + Compute 6.3 + 6.3 g_p%(Filename) + g_p%(Filename) $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) $(ProjectDir);%(AdditionalIncludeDirectories) + $(ProjectDir);%(AdditionalIncludeDirectories) @@ -622,32 +1084,56 @@ Compute + Compute 6.3 + 6.3 Compute + Compute Compute + Compute 6.3 + 6.3 6.3 + 6.3 $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h $(IntDir)CompiledShaders\%(Filename).hlsl.h + $(IntDir)CompiledShaders\%(Filename).hlsl.h g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) g_p%(Filename) + g_p%(Filename) + + Document + + + + Compute + Compute 6.3 + 6.3 Compute + Compute Compute + Compute 6.3 + 6.3 6.3 + 6.3 diff --git a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/SampleCore/RaytracingSceneDefines.cpp b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/SampleCore/RaytracingSceneDefines.cpp index eb08f527a..33646301e 100644 --- a/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/SampleCore/RaytracingSceneDefines.cpp +++ b/Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/SampleCore/RaytracingSceneDefines.cpp @@ -25,9 +25,9 @@ namespace SampleScene // Camera Position { auto& camera = args[Type::Main].camera; - camera.position.eye = { -38.5863f, 13.9563f, -24.2481f, 1 }; - camera.position.at = { -37.9042f, 13.5773f, -23.6219f, 1 }; - camera.position.up = { 0.351221f, 0.877166f, 0.32744f, 0 }; + camera.position.eye = XMVectorSet(-38.5863f, 13.9563f, -24.2481f, 1); + camera.position.at = XMVectorSet(-37.9042f, 13.5773f, -23.6219f, 1); + camera.position.up = XMVectorSet(0.351221f, 0.877166f, 0.32744f, 0); camera.boundaries.min = XMVectorSetY(-XMVectorSplatInfinity(), 0); camera.boundaries.max = XMVectorSplatInfinity(); } From e709def109a74daf51406c3adbc27987ca9e90c5 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 8 Jul 2026 16:47:41 -0700 Subject: [PATCH 10/10] Enable ARM64 for the standalone MiniEngine ModelViewer solution Add ARM64 Debug/Profile/Release configurations to ModelViewer.vcxproj and an ARM64 platform to ModelViewer.slnx (the existing abstract 'Windows' solution platform continues to map to the x64 project configuration). Core and Model already gained ARM64 configurations with the SSE->NEON port. ModelConverter is intentionally left x64-only: it is an offline content tool that depends on x64-only NuGet packages (assimp, zlib-msvc-x64). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- MiniEngine/ModelViewer/ModelViewer.slnx | 7 ++++--- MiniEngine/ModelViewer/ModelViewer.vcxproj | 12 ++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/MiniEngine/ModelViewer/ModelViewer.slnx b/MiniEngine/ModelViewer/ModelViewer.slnx index 578fe08b0..e361031cc 100644 --- a/MiniEngine/ModelViewer/ModelViewer.slnx +++ b/MiniEngine/ModelViewer/ModelViewer.slnx @@ -4,14 +4,15 @@ + - + - + - + diff --git a/MiniEngine/ModelViewer/ModelViewer.vcxproj b/MiniEngine/ModelViewer/ModelViewer.vcxproj index a1d223e2a..3ec1c27c9 100644 --- a/MiniEngine/ModelViewer/ModelViewer.vcxproj +++ b/MiniEngine/ModelViewer/ModelViewer.vcxproj @@ -5,14 +5,26 @@ Debug x64 + + Debug + ARM64 + Profile x64 + + Profile + ARM64 + Release x64 + + Release + ARM64 + ModelViewer