From d65487d897bb5de3ce68ad89cb46a86016a364f2 Mon Sep 17 00:00:00 2001 From: Yigit Aras Tunali Date: Tue, 4 Jun 2024 15:46:02 +0200 Subject: [PATCH] CI related updates --- .../FrameInterpolationSwapchainDX12.cpp | 5 +++-- .../FrameInterpolationSwapchainDX12.h | 2 +- .../FrameInterpolationSwapchainDX12_Helpers.cpp | 4 ++-- .../FrameInterpolationSwapchainDX12_UiComposition.cpp | 8 ++++---- .../recompileUiCompositionHLSL.bat | 4 ++-- sys/FidelityFX/src/backends/dx12/ffx_dx12.cpp | 5 +++-- sys/build.rs | 2 ++ 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.cpp b/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.cpp index 580c867..ba0b81c 100644 --- a/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.cpp +++ b/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.cpp @@ -21,10 +21,11 @@ #include -#include "FrameInterpolationSwapChainDX12.h" +#include "frameinterpolationswapchaindx12.h" #include -#include "FrameInterpolationSwapchainDX12_UiComposition.h" +#include "frameinterpolationswapchainuicompositionvs.h" +#include "frameinterpolationswapchaindx12_uicomposition.h" FfxErrorCode ffxRegisterFrameinterpolationUiResourceDX12(FfxSwapchain gameSwapChain, FfxResource uiResource) { diff --git a/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.h b/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.h index 0885ed4..d70f3de 100644 --- a/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.h +++ b/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.h @@ -28,7 +28,7 @@ #include #include -#include "FrameInterpolationSwapchainDX12_Helpers.h" +#include "frameinterpolationswapchaindx12_helpers.h" #include #include diff --git a/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12_Helpers.cpp b/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12_Helpers.cpp index 915bf53..51065c9 100644 --- a/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12_Helpers.cpp +++ b/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12_Helpers.cpp @@ -20,11 +20,11 @@ // THE SOFTWARE. -#include +#include #include -#include "FrameInterpolationSwapchainDX12_Helpers.h" +#include "frameinterpolationswapchaindx12_helpers.h" #include #pragma comment(lib, "Dwmapi.lib") diff --git a/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12_UiComposition.cpp b/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12_UiComposition.cpp index 54fa039..e9cc092 100644 --- a/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12_UiComposition.cpp +++ b/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12_UiComposition.cpp @@ -21,11 +21,11 @@ #include "d3d12.h" -#include "FrameInterpolationSwapchainDX12_Helpers.h" -#include "FrameInterpolationSwapchainDX12_UiComposition.h" +#include "frameinterpolationswapchaindx12_helpers.h" +#include "frameinterpolationswapchaindx12_uicomposition.h" -#include "FrameInterpolationSwapchainUiCompositionVS.h" -#include "FrameInterpolationSwapchainUiCompositionPS.h" +#include "frameinterpolationswapchainuicompositionvs.h" +#include "frameinterpolationswapchainuicompositionps.h" typedef HRESULT(__stdcall* D3D12SerializeVersionedRootSignatureType)(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC* pRootSignature, ID3DBlob** ppBlob, diff --git a/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/recompileUiCompositionHLSL.bat b/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/recompileUiCompositionHLSL.bat index 997c19a..4c9ba9d 100644 --- a/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/recompileUiCompositionHLSL.bat +++ b/sys/FidelityFX/src/backends/dx12/FrameInterpolationSwapchain/recompileUiCompositionHLSL.bat @@ -1,4 +1,4 @@ @REM regenerates the header files containing the shaderblobs for the ui composition blit @REM only needs to be run when the shader is changed -..\..\..\..\tools\ffx_shader_compiler\libs\dxc\bin\x64\dxc.exe -Fh FrameInterpolationSwapchainUiCompositionVS.h -T vs_6_0 -E mainVS FrameInterpolationSwapchainUiComposition.hlsl -..\..\..\..\tools\ffx_shader_compiler\libs\dxc\bin\x64\dxc.exe -Fh FrameInterpolationSwapchainUiCompositionPS.h -T ps_6_0 -E mainPS FrameInterpolationSwapchainUiComposition.hlsl +..\..\..\..\tools\ffx_shader_compiler\libs\dxc\bin\x64\dxc.exe -Fh frameinterpolationswapchainuicompositionvs.h -T vs_6_0 -E mainVS frameinterpolationswapchainuicomposition.hlsl +..\..\..\..\tools\ffx_shader_compiler\libs\dxc\bin\x64\dxc.exe -Fh frameinterpolationswapchainuicompositionps.h -T ps_6_0 -E mainPS frameinterpolationswapchainuicomposition.hlsl diff --git a/sys/FidelityFX/src/backends/dx12/ffx_dx12.cpp b/sys/FidelityFX/src/backends/dx12/ffx_dx12.cpp index c80ae8e..51e67ec 100644 --- a/sys/FidelityFX/src/backends/dx12/ffx_dx12.cpp +++ b/sys/FidelityFX/src/backends/dx12/ffx_dx12.cpp @@ -225,7 +225,8 @@ void TIF(HRESULT result) #ifdef _DEBUG int32_t msgboxID = MessageBoxW(NULL, errorMessage, L"Error", MB_OK); #endif - throw 1; + // TODO(YIGIT): The compiler does not allow us to throw errors + // throw 1; } } @@ -2698,7 +2699,7 @@ IDXGISwapChain4* ffxGetDX12SwapchainPtr(FfxSwapchain ffxSwapchain) #include #include -#include "FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.h" +#include "FrameInterpolationSwapchain/frameinterpolationswapchaindx12.h" // fix up format in case resource passed to FSR2 was created as typeless diff --git a/sys/build.rs b/sys/build.rs index 945d404..c5d25c8 100644 --- a/sys/build.rs +++ b/sys/build.rs @@ -68,6 +68,8 @@ fn build_fsr3(api_dir: &Path, vk_include_dir: &Path) { .include(api_dir.join("src/shared")) // TODO: Only include this when compiling the backends .include(api_dir.join("src/backends/shared")) + // For FrameInterpolation headers to show up during linking + .include(api_dir.join("src/backends/dx12/FrameInterpolationSwapchain/")) // For the shader headers .include(api_dir.join("src/components")) // TODO: Shader permutations are only available for Dx12 currently