Skip to content

Commit

Permalink
build: add hacky temp fidelity-sdk-dx12 submodule for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
FlayaN committed Dec 14, 2024
1 parent ffad053 commit c147a33
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
[submodule "extern/CommonLibSSE-NG"]
path = extern/CommonLibSSE-NG
url = https://github.com/alandtse/CommonLibVR.git

[submodule "extern/Streamline"]
path = extern/Streamline
url = https://github.com/FlayaN/Streamline.git
[submodule "extern/FidelityFX-SDK"]
path = extern/FidelityFX-SDK
url = https://github.com/MapleHinata/FidelityFX-SDK.git
[submodule "extern/FidelityFX-SDK-DX12"]
path = extern/FidelityFX-SDK-DX12
url = https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ find_package(unordered_dense CONFIG REQUIRED)
find_package(efsw CONFIG REQUIRED)
find_package(Tracy CONFIG REQUIRED)
add_subdirectory(${CMAKE_SOURCE_DIR}/cmake/Streamline)
include(FidelityFX-SDK)
# include(FidelityFX-SDK)
include(FidelityFX-SDK-DX12)

target_compile_definitions(
${PROJECT_NAME}
Expand Down
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"name": "msvc",
"hidden": true,
"cacheVariables": {
"CMAKE_CXX_FLAGS": "/EHsc /MP /W4 /WX $penv{CXXFLAGS}"
"CMAKE_CXX_FLAGS": "/EHsc /MP /W4 $penv{CXXFLAGS}"
},
"generator": "Visual Studio 17 2022",
"vendor": {
Expand Down
20 changes: 20 additions & 0 deletions cmake/FidelityFX-SDK-DX12.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
set(FFX_API_VK OFF)
set(FFX_API_DX12 ON)
set(FFX_BRIXELIZER ON)
set(FFX_ALL OFF)
set(FFX_FSR3 ON)
set(FFX_FSR ON)
set(FFX_AUTO_COMPILE_SHADERS 1)

add_subdirectory(${CMAKE_SOURCE_DIR}/extern/FidelityFX-SDK-DX12/sdk)

target_link_libraries(
${PROJECT_NAME}
PRIVATE
ffx_frameinterpolation_x64
ffx_fsr3_x64
ffx_fsr3upscaler_x64
ffx_opticalflow_x64
ffx_backend_dx12_x64
ffx_brixelizer_x64
)
2 changes: 1 addition & 1 deletion cmake/FidelityFX-SDK.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FFX_API_VK OFF)
set(FFX_API_DX12 ON)
set(FFX_API_DX12 OFF)
set(FFX_ALL OFF)
set(FFX_FSR3 ON)
set(FFX_FSR ON)
Expand Down
1 change: 1 addition & 0 deletions extern/FidelityFX-SDK-DX12
Submodule FidelityFX-SDK-DX12 added at 54fbaa
4 changes: 3 additions & 1 deletion src/FidelityFX.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#pragma once

#include <FidelityFX/host/backends/dx11/ffx_dx11.h>
//#include <FidelityFX/host/backends/dx11/ffx_dx11.h>
#include <FidelityFX/host/backends/dx12/ffx_dx12.h>

#include <FidelityFX/host/ffx_brixelizer.h>

#include <FidelityFX/host/ffx_fsr3.h>
#include <FidelityFX/host/ffx_interface.h>

Expand Down

0 comments on commit c147a33

Please sign in to comment.