From 47287a121a4a8c38f70f63d6ef3e87d259d317c8 Mon Sep 17 00:00:00 2001 From: Kelsi Date: Sun, 8 Mar 2026 21:22:21 -0700 Subject: [PATCH] Fix AMD FSR2 CI by removing Wine permutation generation --- .github/workflows/build.yml | 74 +++++-------------------------------- 1 file changed, 9 insertions(+), 65 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca36f60d..940d4f36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,8 +102,7 @@ jobs: libswscale-dev \ libavutil-dev \ libunicorn-dev \ - libx11-dev \ - wine64 + libx11-dev sudo apt-get install -y libstorm-dev || true - name: Fetch AMD FSR2 SDK @@ -111,74 +110,19 @@ jobs: rm -rf extern/FidelityFX-FSR2 git clone --depth 1 https://github.com/GPUOpen-Effects/FidelityFX-FSR2.git extern/FidelityFX-FSR2 - - name: Generate AMD FSR2 Vulkan permutation headers + - name: Verify AMD FSR2 Vulkan permutation headers run: | set -euo pipefail SDK_DIR="$PWD/extern/FidelityFX-FSR2" - SHADER_DIR="$SDK_DIR/src/ffx-fsr2-api/shaders" OUT_DIR="$SDK_DIR/src/ffx-fsr2-api/vk/shaders" - SC="$SDK_DIR/tools/sc/FidelityFX_SC.exe" - - BASE_ARGS=( - -reflection - -deps=gcc - -DFFX_GPU=1 - -DFFX_FSR2_OPTION_UPSAMPLE_SAMPLERS_USE_DATA_HALF=0 - -DFFX_FSR2_OPTION_ACCUMULATE_SAMPLERS_USE_DATA_HALF=0 - -DFFX_FSR2_OPTION_REPROJECT_SAMPLERS_USE_DATA_HALF=1 - -DFFX_FSR2_OPTION_POSTPROCESSLOCKSTATUS_SAMPLERS_USE_DATA_HALF=0 - -DFFX_FSR2_OPTION_UPSAMPLE_USE_LANCZOS_TYPE=2 - -compiler=glslang - -e - main - --target-env - vulkan1.1 - -S - comp - -Os - -DFFX_GLSL=1 - -DFFX_FSR2_OPTION_HDR_COLOR_INPUT={0,1} - -DFFX_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS={0,1} - -DFFX_FSR2_OPTION_JITTERED_MOTION_VECTORS={0,1} - -DFFX_FSR2_OPTION_INVERTED_DEPTH={0,1} - -DFFX_FSR2_OPTION_APPLY_SHARPENING={0,1} - ) - - REPROJECT_PERM_ARGS=( - -DFFX_FSR2_OPTION_REPROJECT_USE_LANCZOS_TYPE={0,1} - ) - - PASSES=( - ffx_fsr2_tcr_autogen_pass - ffx_fsr2_autogen_reactive_pass - ffx_fsr2_accumulate_pass - ffx_fsr2_compute_luminance_pyramid_pass - ffx_fsr2_depth_clip_pass - ffx_fsr2_lock_pass - ffx_fsr2_reconstruct_previous_depth_pass - ffx_fsr2_rcas_pass - ) - - for pass in "${PASSES[@]}"; do - HALF_ARG="-DFFX_HALF={0,1}" - PERM_ARGS=("${BASE_ARGS[@]}") - if [ "$pass" = "ffx_fsr2_compute_luminance_pyramid_pass" ]; then - HALF_ARG="-DFFX_HALF=0" - fi - - # Only passes that include reproject path should receive this option permutation. - if [ "$pass" = "ffx_fsr2_accumulate_pass" ] || [ "$pass" = "ffx_fsr2_rcas_pass" ]; then - PERM_ARGS+=("${REPROJECT_PERM_ARGS[@]}") - fi - - wine "$SC" "${PERM_ARGS[@]}" "$HALF_ARG" \ - "-name=${pass}" \ - "-I${SHADER_DIR}" \ - "-output=${OUT_DIR}" \ - "${SHADER_DIR}/${pass}.glsl" - done - + test -f "$OUT_DIR/ffx_fsr2_tcr_autogen_pass_permutations.h" + test -f "$OUT_DIR/ffx_fsr2_autogen_reactive_pass_permutations.h" test -f "$OUT_DIR/ffx_fsr2_accumulate_pass_permutations.h" + test -f "$OUT_DIR/ffx_fsr2_compute_luminance_pyramid_pass_permutations.h" + test -f "$OUT_DIR/ffx_fsr2_depth_clip_pass_permutations.h" + test -f "$OUT_DIR/ffx_fsr2_lock_pass_permutations.h" + test -f "$OUT_DIR/ffx_fsr2_reconstruct_previous_depth_pass_permutations.h" + test -f "$OUT_DIR/ffx_fsr2_rcas_pass_permutations.h" - name: Configure (AMD ON) run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWOWEE_ENABLE_AMD_FSR2=ON