Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Commit 1ce05a9

Browse files
committed
Properly submodule fidelityfx sdk
1 parent 2894e77 commit 1ce05a9

File tree

7 files changed

+24
-18
lines changed

7 files changed

+24
-18
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "dependencies/FidelityFX-SDK"]
2+
path = dependencies/FidelityFX-SDK
3+
url = https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK.git
4+
branch = release-FSR3-3.0.3

dependencies/FidelityFX-SDK

Submodule FidelityFX-SDK added at a0632ab

dependencies/ffx-sdk/placeholder.txt

Whitespace-only changes.

source/maindll/CMakeLists.txt

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
# Set up the source files and output library
33
#
44
set(CURRENT_PROJECT dlssg_output_dll)
5+
56
set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
7+
set(FIDELITYFX_SDK_DIR "${PROJECT_DEPENDENCIES_PATH}/FidelityFX-SDK/sdk")
68

79
file(
810
GLOB HEADER_FILES
@@ -44,7 +46,8 @@ target_include_directories(
4446
${CURRENT_PROJECT}
4547
PRIVATE
4648
"${SOURCE_DIR}"
47-
"${PROJECT_DEPENDENCIES_PATH}/ffx-sdk"
49+
"${FIDELITYFX_SDK_DIR}/include"
50+
"${FIDELITYFX_SDK_DIR}/src/components"
4851
"$ENV{VULKAN_SDK}/include"
4952
)
5053

@@ -112,7 +115,8 @@ target_link_options(
112115
${CURRENT_PROJECT}
113116
PRIVATE
114117
"/DELAYLOAD:gdi32.dll"
115-
"/DELAYLOAD:dxgi.dll")
118+
"/DELAYLOAD:dxgi.dll"
119+
)
116120

117121
target_link_libraries(
118122
${CURRENT_PROJECT}
@@ -130,6 +134,17 @@ find_package(Vulkan REQUIRED)
130134
target_link_options(${CURRENT_PROJECT} PRIVATE "/DELAYLOAD:vulkan-1.dll")
131135
target_link_libraries(${CURRENT_PROJECT} PRIVATE Vulkan::Vulkan)
132136

137+
# FidelityFX
138+
target_link_libraries(
139+
${CURRENT_PROJECT}
140+
PRIVATE
141+
"${FIDELITYFX_SDK_DIR}/bin/ffx_sdk/ffx_backend_dx12_x64$<$<CONFIG:Debug>:d>.lib"
142+
"${FIDELITYFX_SDK_DIR}/bin/ffx_sdk/ffx_backend_vk_x64$<$<CONFIG:Debug>:d>.lib"
143+
"${FIDELITYFX_SDK_DIR}/bin/ffx_sdk/ffx_fsr3_x64$<$<CONFIG:Debug>:d>.lib"
144+
"${FIDELITYFX_SDK_DIR}/bin/ffx_sdk/ffx_frameinterpolation_x64$<$<CONFIG:Debug>:d>.lib"
145+
"${FIDELITYFX_SDK_DIR}/bin/ffx_sdk/ffx_opticalflow_x64$<$<CONFIG:Debug>:d>.lib"
146+
)
147+
133148
#
134149
# Commands
135150
#

source/maindll/FFDilator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#pragma once
1010

1111
#include <FidelityFX/host/ffx_fsr3upscaler.h>
12-
#include <FidelityFX/components/fsr3upscaler/ffx_fsr3upscaler_private.h>
12+
#include <fsr3upscaler/ffx_fsr3upscaler_private.h>
1313

1414
struct FFDilatorDispatchParameters
1515
{

source/maindll/FFFrameInterpolator.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@
66
#include "FFFrameInterpolator.h"
77
#include "Util.h"
88

9-
#ifdef _DEBUG
10-
#pragma comment(lib, "../../dependencies/ffx-sdk/ffx_fsr3_x64d.lib")
11-
#pragma comment(lib, "../../dependencies/ffx-sdk/ffx_backend_dx12_x64d.lib")
12-
#pragma comment(lib, "../../dependencies/ffx-sdk/ffx_backend_vk_x64d.lib")
13-
#pragma comment(lib, "../../dependencies/ffx-sdk/ffx_frameinterpolation_x64d.lib")
14-
#pragma comment(lib, "../../dependencies/ffx-sdk/ffx_opticalflow_x64d.lib")
15-
#else
16-
#pragma comment(lib, "../../dependencies/ffx-sdk/ffx_fsr3_x64.lib")
17-
#pragma comment(lib, "../../dependencies/ffx-sdk/ffx_backend_dx12_x64.lib")
18-
#pragma comment(lib, "../../dependencies/ffx-sdk/ffx_backend_vk_x64.lib")
19-
#pragma comment(lib, "../../dependencies/ffx-sdk/ffx_frameinterpolation_x64.lib")
20-
#pragma comment(lib, "../../dependencies/ffx-sdk/ffx_opticalflow_x64.lib")
21-
#endif
22-
239
D3D12_RESOURCE_STATES ffxGetDX12StateFromResourceState(FfxResourceStates state);
2410
VkAccessFlags getVKAccessFlagsFromResourceState(FfxResourceStates state);
2511
VkImageLayout getVKImageLayoutFromResourceState(FfxResourceStates state);

source/maindll/FFInterpolator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <FidelityFX/host/ffx_frameinterpolation.h>
2-
#include <FidelityFX/components/frameinterpolation/ffx_frameinterpolation_private.h>
2+
#include <frameinterpolation/ffx_frameinterpolation_private.h>
33
#include "FFExt.h"
44
#include "FFInterpolator.h"
55

0 commit comments

Comments
 (0)