diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98bba65b..c8ebdc29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,8 +9,8 @@ on: env: WOWEE_AMD_FSR2_REPO: https://github.com/GPUOpen-Effects/FidelityFX-FSR2.git WOWEE_AMD_FSR2_REF: master - WOWEE_FFX_SDK_REPO: https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK.git - WOWEE_FFX_SDK_REF: v1.1.4 + WOWEE_FFX_SDK_REPO: https://github.com/Kelsidavis/FidelityFX-SDK.git + WOWEE_FFX_SDK_REF: main jobs: build: @@ -87,11 +87,14 @@ jobs: set -euo pipefail SDK_DIR="$PWD/extern/FidelityFX-SDK/sdk" test -f "$SDK_DIR/include/FidelityFX/host/ffx_frameinterpolation.h" - test -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" - test -f "$SDK_DIR/src/backends/vk/CMakeShadersFrameinterpolation.txt" - test -f "$SDK_DIR/src/backends/vk/CMakeShadersOpticalflow.txt" - echo "FidelityFX-SDK Vulkan framegen files detected." + if [ -f "$SDK_DIR/include/FidelityFX/gpu/frameinterpolation/ffx_frameinterpolation_callbacks_glsl.h" ] \ + && [ -f "$SDK_DIR/include/FidelityFX/gpu/opticalflow/ffx_opticalflow_callbacks_glsl.h" ] \ + && [ -f "$SDK_DIR/src/backends/vk/CMakeShadersFrameinterpolation.txt" ] \ + && [ -f "$SDK_DIR/src/backends/vk/CMakeShadersOpticalflow.txt" ]; then + 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) run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWOWEE_ENABLE_AMD_FSR2=ON diff --git a/README.md b/README.md index 9973b3a4..bb86887a 100644 --- a/README.md +++ b/README.md @@ -187,9 +187,9 @@ make -j$(nproc) - Build scripts and CI also fetch: - `extern/FidelityFX-SDK` - Source URL: - - `https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK.git` + - `https://github.com/Kelsidavis/FidelityFX-SDK.git` - Ref: - - `v1.1.4` (depth-1 clone) + - `main` (depth-1 clone) - Override with env vars: - `WOWEE_FFX_SDK_REPO=https://github.com//FidelityFX-SDK.git` - `WOWEE_FFX_SDK_REF=` diff --git a/build.ps1 b/build.ps1 index 206b9909..31d8ff09 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,8 +33,8 @@ function Ensure-Fsr2Sdk { function Ensure-FidelityFxSdk { $sdkDir = Join-Path $ScriptDir "extern\FidelityFX-SDK" $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" } - $sdkRef = if ($env:WOWEE_FFX_SDK_REF) { $env:WOWEE_FFX_SDK_REF } else { "v1.1.4" } + $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 { "main" } if (Test-Path $sdkHeader) { return } if (-not (Get-Command git -ErrorAction SilentlyContinue)) { diff --git a/build.sh b/build.sh index 4a7f3f41..cfc49367 100755 --- a/build.sh +++ b/build.sh @@ -25,8 +25,8 @@ ensure_fsr2_sdk() { ensure_fidelityfx_sdk() { local sdk_dir="extern/FidelityFX-SDK" 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_ref="${WOWEE_FFX_SDK_REF:-v1.1.4}" + local sdk_repo="${WOWEE_FFX_SDK_REPO:-https://github.com/Kelsidavis/FidelityFX-SDK.git}" + local sdk_ref="${WOWEE_FFX_SDK_REF:-main}" if [ -f "$sdk_header" ]; then return fi diff --git a/docs/AMD_FSR2_INTEGRATION.md b/docs/AMD_FSR2_INTEGRATION.md index b96d5fef..b1cd4dcb 100644 --- a/docs/AMD_FSR2_INTEGRATION.md +++ b/docs/AMD_FSR2_INTEGRATION.md @@ -13,12 +13,12 @@ AMD SDK checkout path: 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: -- `WOWEE_FFX_SDK_REPO` (default: `https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK.git`) -- `WOWEE_FFX_SDK_REF` (default: `v1.1.4`) +- `WOWEE_FFX_SDK_REPO` (default: `https://github.com/Kelsidavis/FidelityFX-SDK.git`) +- `WOWEE_FFX_SDK_REF` (default: `main`) Detection expects: diff --git a/rebuild.ps1 b/rebuild.ps1 index bcc951ba..8616d73c 100644 --- a/rebuild.ps1 +++ b/rebuild.ps1 @@ -33,8 +33,8 @@ function Ensure-Fsr2Sdk { function Ensure-FidelityFxSdk { $sdkDir = Join-Path $ScriptDir "extern\FidelityFX-SDK" $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" } - $sdkRef = if ($env:WOWEE_FFX_SDK_REF) { $env:WOWEE_FFX_SDK_REF } else { "v1.1.4" } + $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 { "main" } if (Test-Path $sdkHeader) { return } if (-not (Get-Command git -ErrorAction SilentlyContinue)) { diff --git a/rebuild.sh b/rebuild.sh index 04e02b88..e9f26dfd 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -25,8 +25,8 @@ ensure_fsr2_sdk() { ensure_fidelityfx_sdk() { local sdk_dir="extern/FidelityFX-SDK" 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_ref="${WOWEE_FFX_SDK_REF:-v1.1.4}" + local sdk_repo="${WOWEE_FFX_SDK_REPO:-https://github.com/Kelsidavis/FidelityFX-SDK.git}" + local sdk_ref="${WOWEE_FFX_SDK_REF:-main}" if [ -f "$sdk_header" ]; then return fi