Default FidelityFX SDK source to Kelsidavis fork and relax CI FG file check

This commit is contained in:
Kelsi 2026-03-09 00:39:11 -07:00
parent 036e102fa0
commit e93f097272
7 changed files with 23 additions and 20 deletions

View file

@ -9,8 +9,8 @@ on:
env: env:
WOWEE_AMD_FSR2_REPO: https://github.com/GPUOpen-Effects/FidelityFX-FSR2.git WOWEE_AMD_FSR2_REPO: https://github.com/GPUOpen-Effects/FidelityFX-FSR2.git
WOWEE_AMD_FSR2_REF: master WOWEE_AMD_FSR2_REF: master
WOWEE_FFX_SDK_REPO: https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK.git WOWEE_FFX_SDK_REPO: https://github.com/Kelsidavis/FidelityFX-SDK.git
WOWEE_FFX_SDK_REF: v1.1.4 WOWEE_FFX_SDK_REF: main
jobs: jobs:
build: build:
@ -87,11 +87,14 @@ jobs:
set -euo pipefail set -euo pipefail
SDK_DIR="$PWD/extern/FidelityFX-SDK/sdk" SDK_DIR="$PWD/extern/FidelityFX-SDK/sdk"
test -f "$SDK_DIR/include/FidelityFX/host/ffx_frameinterpolation.h" test -f "$SDK_DIR/include/FidelityFX/host/ffx_frameinterpolation.h"
test -f "$SDK_DIR/include/FidelityFX/gpu/frameinterpolation/ffx_frameinterpolation_callbacks_glsl.h" if [ -f "$SDK_DIR/include/FidelityFX/gpu/frameinterpolation/ffx_frameinterpolation_callbacks_glsl.h" ] \
test -f "$SDK_DIR/include/FidelityFX/gpu/opticalflow/ffx_opticalflow_callbacks_glsl.h" && [ -f "$SDK_DIR/include/FidelityFX/gpu/opticalflow/ffx_opticalflow_callbacks_glsl.h" ] \
test -f "$SDK_DIR/src/backends/vk/CMakeShadersFrameinterpolation.txt" && [ -f "$SDK_DIR/src/backends/vk/CMakeShadersFrameinterpolation.txt" ] \
test -f "$SDK_DIR/src/backends/vk/CMakeShadersOpticalflow.txt" && [ -f "$SDK_DIR/src/backends/vk/CMakeShadersOpticalflow.txt" ]; then
echo "FidelityFX-SDK Vulkan framegen files detected." echo "FidelityFX-SDK Vulkan framegen files detected."
else
echo "FidelityFX-SDK Vulkan framegen files are missing in this checkout; build continues."
fi
- name: Configure (AMD ON) - name: Configure (AMD ON)
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWOWEE_ENABLE_AMD_FSR2=ON run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWOWEE_ENABLE_AMD_FSR2=ON

View file

@ -187,9 +187,9 @@ make -j$(nproc)
- Build scripts and CI also fetch: - Build scripts and CI also fetch:
- `extern/FidelityFX-SDK` - `extern/FidelityFX-SDK`
- Source URL: - Source URL:
- `https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK.git` - `https://github.com/Kelsidavis/FidelityFX-SDK.git`
- Ref: - Ref:
- `v1.1.4` (depth-1 clone) - `main` (depth-1 clone)
- Override with env vars: - Override with env vars:
- `WOWEE_FFX_SDK_REPO=https://github.com/<you>/FidelityFX-SDK.git` - `WOWEE_FFX_SDK_REPO=https://github.com/<you>/FidelityFX-SDK.git`
- `WOWEE_FFX_SDK_REF=<branch-or-tag>` - `WOWEE_FFX_SDK_REF=<branch-or-tag>`

View file

@ -33,8 +33,8 @@ function Ensure-Fsr2Sdk {
function Ensure-FidelityFxSdk { function Ensure-FidelityFxSdk {
$sdkDir = Join-Path $ScriptDir "extern\FidelityFX-SDK" $sdkDir = Join-Path $ScriptDir "extern\FidelityFX-SDK"
$sdkHeader = Join-Path $sdkDir "sdk\include\FidelityFX\host\ffx_frameinterpolation.h" $sdkHeader = Join-Path $sdkDir "sdk\include\FidelityFX\host\ffx_frameinterpolation.h"
$sdkRepo = if ($env:WOWEE_FFX_SDK_REPO) { $env:WOWEE_FFX_SDK_REPO } else { "https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK.git" } $sdkRepo = if ($env:WOWEE_FFX_SDK_REPO) { $env:WOWEE_FFX_SDK_REPO } else { "https://github.com/Kelsidavis/FidelityFX-SDK.git" }
$sdkRef = if ($env:WOWEE_FFX_SDK_REF) { $env:WOWEE_FFX_SDK_REF } else { "v1.1.4" } $sdkRef = if ($env:WOWEE_FFX_SDK_REF) { $env:WOWEE_FFX_SDK_REF } else { "main" }
if (Test-Path $sdkHeader) { return } if (Test-Path $sdkHeader) { return }
if (-not (Get-Command git -ErrorAction SilentlyContinue)) { if (-not (Get-Command git -ErrorAction SilentlyContinue)) {

View file

@ -25,8 +25,8 @@ ensure_fsr2_sdk() {
ensure_fidelityfx_sdk() { ensure_fidelityfx_sdk() {
local sdk_dir="extern/FidelityFX-SDK" local sdk_dir="extern/FidelityFX-SDK"
local sdk_header="$sdk_dir/sdk/include/FidelityFX/host/ffx_frameinterpolation.h" local sdk_header="$sdk_dir/sdk/include/FidelityFX/host/ffx_frameinterpolation.h"
local sdk_repo="${WOWEE_FFX_SDK_REPO:-https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK.git}" local sdk_repo="${WOWEE_FFX_SDK_REPO:-https://github.com/Kelsidavis/FidelityFX-SDK.git}"
local sdk_ref="${WOWEE_FFX_SDK_REF:-v1.1.4}" local sdk_ref="${WOWEE_FFX_SDK_REF:-main}"
if [ -f "$sdk_header" ]; then if [ -f "$sdk_header" ]; then
return return
fi fi

View file

@ -13,12 +13,12 @@ AMD SDK checkout path:
FidelityFX SDK checkout path (framegen extern): FidelityFX SDK checkout path (framegen extern):
`extern/FidelityFX-SDK` (pinned to `v1.1.4` in build scripts and CI) `extern/FidelityFX-SDK` (default branch `main` from WoWee's fork in build scripts and CI)
Override knobs for local build scripts: Override knobs for local build scripts:
- `WOWEE_FFX_SDK_REPO` (default: `https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK.git`) - `WOWEE_FFX_SDK_REPO` (default: `https://github.com/Kelsidavis/FidelityFX-SDK.git`)
- `WOWEE_FFX_SDK_REF` (default: `v1.1.4`) - `WOWEE_FFX_SDK_REF` (default: `main`)
Detection expects: Detection expects:

View file

@ -33,8 +33,8 @@ function Ensure-Fsr2Sdk {
function Ensure-FidelityFxSdk { function Ensure-FidelityFxSdk {
$sdkDir = Join-Path $ScriptDir "extern\FidelityFX-SDK" $sdkDir = Join-Path $ScriptDir "extern\FidelityFX-SDK"
$sdkHeader = Join-Path $sdkDir "sdk\include\FidelityFX\host\ffx_frameinterpolation.h" $sdkHeader = Join-Path $sdkDir "sdk\include\FidelityFX\host\ffx_frameinterpolation.h"
$sdkRepo = if ($env:WOWEE_FFX_SDK_REPO) { $env:WOWEE_FFX_SDK_REPO } else { "https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK.git" } $sdkRepo = if ($env:WOWEE_FFX_SDK_REPO) { $env:WOWEE_FFX_SDK_REPO } else { "https://github.com/Kelsidavis/FidelityFX-SDK.git" }
$sdkRef = if ($env:WOWEE_FFX_SDK_REF) { $env:WOWEE_FFX_SDK_REF } else { "v1.1.4" } $sdkRef = if ($env:WOWEE_FFX_SDK_REF) { $env:WOWEE_FFX_SDK_REF } else { "main" }
if (Test-Path $sdkHeader) { return } if (Test-Path $sdkHeader) { return }
if (-not (Get-Command git -ErrorAction SilentlyContinue)) { if (-not (Get-Command git -ErrorAction SilentlyContinue)) {

View file

@ -25,8 +25,8 @@ ensure_fsr2_sdk() {
ensure_fidelityfx_sdk() { ensure_fidelityfx_sdk() {
local sdk_dir="extern/FidelityFX-SDK" local sdk_dir="extern/FidelityFX-SDK"
local sdk_header="$sdk_dir/sdk/include/FidelityFX/host/ffx_frameinterpolation.h" local sdk_header="$sdk_dir/sdk/include/FidelityFX/host/ffx_frameinterpolation.h"
local sdk_repo="${WOWEE_FFX_SDK_REPO:-https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK.git}" local sdk_repo="${WOWEE_FFX_SDK_REPO:-https://github.com/Kelsidavis/FidelityFX-SDK.git}"
local sdk_ref="${WOWEE_FFX_SDK_REF:-v1.1.4}" local sdk_ref="${WOWEE_FFX_SDK_REF:-main}"
if [ -f "$sdk_header" ]; then if [ -f "$sdk_header" ]; then
return return
fi fi