CI related updates

Traverse-Research · Jun 6, 2024 · d65487d · d65487d
1 parent 59a1a23
commit d65487d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/...elityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.cpp b/...elityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.cpp
@@ -21,10 +21,11 @@
 
 
 #include <initguid.h>
-#include "FrameInterpolationSwapChainDX12.h"
+#include "frameinterpolationswapchaindx12.h"
 
 #include <FidelityFX/host/backends/dx12/ffx_dx12.h>
-#include "FrameInterpolationSwapchainDX12_UiComposition.h"
+#include "frameinterpolationswapchainuicompositionvs.h"
+#include "frameinterpolationswapchaindx12_uicomposition.h"
 
 FfxErrorCode ffxRegisterFrameinterpolationUiResourceDX12(FfxSwapchain gameSwapChain, FfxResource uiResource)
 {

diff --git a/...idelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.h b/...idelityFX/src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12.h
@@ -28,7 +28,7 @@
 #include <comdef.h>
 #include <synchapi.h>
 
-#include "FrameInterpolationSwapchainDX12_Helpers.h"
+#include "frameinterpolationswapchaindx12_helpers.h"
 
 #include <FidelityFX/host/backends/dx12/ffx_dx12.h>
 #include <FidelityFX/host/ffx_fsr3.h>

diff --git a/...src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12_Helpers.cpp b/...src/backends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12_Helpers.cpp
@@ -20,11 +20,11 @@
 // THE SOFTWARE.
 
 
-#include <FidelityFX/host/ffx_FrameInterpolation.h>
+#include <FidelityFX/host/ffx_frameinterpolation.h>
 #include <FidelityFX/host/backends/dx12/ffx_dx12.h>
 
 
-#include "FrameInterpolationSwapchainDX12_Helpers.h"
+#include "frameinterpolationswapchaindx12_helpers.h"
 
 #include <dwmapi.h>
 #pragma comment(lib, "Dwmapi.lib")

diff --git a/...ckends/dx12/FrameInterpolationSwapchain/FrameInterpolationSwapchainDX12_UiComposition.cpp b/...ckends/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
@@ -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
@@ -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 <FidelityFX/host/ffx_fsr2.h>
 #include <FidelityFX/host/ffx_fsr3.h>
-#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
@@ -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