xrRender: FrameGraph lighting, ReSTIR RT, DLSS/DLAA fixes

.github/workflows/cibuild.yml

@@ -73,6 +73,7 @@ jobs:
     env:
       CFLAGS: "-w"
       CXXFLAGS: "-w"
+      HOMEBREW_NO_AUTO_UPDATE: 1
 
     strategy:
       fail-fast: false
@@ -91,7 +92,13 @@ jobs:
         - { name: Alpine,    os: ubuntu-latest,    arch: x86,     cc: gcc,   shell: 'alpine.sh {0}', flags: "-DXRAY_LINKER=mold", }
         - { name: Fedora,    os: ubuntu-latest,    arch: x86_64,  cc: gcc,   container: 'fedora:latest', }
         #- { name: Haiku,     os: ubuntu-latest,    arch: x86_64,  cc: x86_64-unknown-haiku-gcc, cxx: x86_64-unknown-haiku-g++, container: 'haiku/cross-compiler:x86_64-r1beta4', }
-        - { name: macOS,     os: macos-latest,     arch: arm64,   cc: clang, threads: 3 }
+        - { name: AppImage,  os: ubuntu-latest,    arch: amd64,   cc: gcc,   flags: "-DBUILD_SHARED_LIBS=OFF", linuxdeploy: linuxdeploy-x86_64.AppImage }
+        - { name: AppImage,  os: ubuntu-24.04-arm, arch: arm64,   cc: gcc,   flags: "-DBUILD_SHARED_LIBS=OFF", linuxdeploy: linuxdeploy-aarch64.AppImage }
+        # macOS images have tighter concurrency limits; keep the matrix minimal.
+        # Pin the deployment target so newer runner images don't pass an unsupported
+        # system version (e.g. 25.4.0) down to AppleClang/LuaJIT architecture detection.
+        - { name: macOS,          os: macos-latest,    arch: arm64,  cc: clang, threads: 3, flags: "-DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 -DCPACK_GENERATOR=ZIP" }
+        - { name: macOS Intel,    os: macos-15-intel,  arch: x86_64, cc: clang, flags: "-DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 -DCPACK_GENERATOR=ZIP" }
 
         configuration: [Debug, Mixed, Release, ReleaseMasterGold]
 
@@ -105,7 +112,7 @@ jobs:
         packages: build-base cmake git mold sdl2-dev lzo-dev libjpeg-turbo-dev openal-soft-dev libogg-dev libtheora-dev libvorbis-dev
 
     - name: Install Ubuntu packages
-      if: ${{ matrix.platform.name == 'Ubuntu' }}
+      if: ${{ matrix.platform.name == 'Ubuntu' || matrix.platform.name == 'AppImage' }}
       run: |
           sudo dpkg --add-architecture ${{ matrix.platform.arch }}
           sudo apt-get update -qq
@@ -125,13 +132,18 @@ jobs:
     - name: Install macOS packages
       if: ${{ startsWith(matrix.platform.name, 'macOS') }}
       run: |
-          brew update
-          brew install sdl2 lzo libogg libvorbis theora
+          brew install ccache cmake sdl2 lzo libogg libvorbis theora openal-soft jpeg-turbo
 
     - name: Install Fedora packages
       if: ${{ matrix.platform.name == 'Fedora' }}
       run: dnf install -y git gcc gcc-c++ rpmdevtools cmake SDL2-devel lzo-devel libjpeg-turbo-devel openal-soft-devel libogg-devel libtheora-devel libvorbis-devel
 
+    - name: Install AppImage linuxdeploy
+      if: ${{ matrix.platform.name == 'AppImage' }}
+      uses: pcolby/install-linuxdeploy@v1
+      with:
+        plugins: appimage
+
     - name: Set environment variables
       if: ${{ matrix.platform.cc != '' && matrix.platform.cxx != '' }}
       run: |
@@ -142,24 +154,56 @@ jobs:
       with:
         submodules: recursive
 
+    - name: Configure ccache
+      if: ${{ startsWith(matrix.platform.name, 'macOS') }}
+      run: |
+        echo "CCACHE_DIR=$HOME/.ccache" >> $GITHUB_ENV
+        mkdir -p "$HOME/.ccache"
+
+    - name: Restore ccache
+      if: ${{ startsWith(matrix.platform.name, 'macOS') }}
+      uses: actions/cache@main
+      with:
+        path: ~/.ccache
+        key: ccache-${{ runner.os }}-${{ matrix.platform.arch }}-${{ matrix.configuration }}-${{ hashFiles('CMakeLists.txt', 'cmake/**', 'src/**/CMakeLists.txt', 'Externals/**/CMakeLists.txt') }}
+        restore-keys: |
+          ccache-${{ runner.os }}-${{ matrix.platform.arch }}-${{ matrix.configuration }}-
+          ccache-${{ runner.os }}-${{ matrix.platform.arch }}-
+
     - name: Run CMake
       run: cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DCMAKE_UNITY_BUILD=ON ${{ matrix.platform.flags }} --log-level VERBOSE
 
     - name: Run CMake Build
       id: cmake-build
       run: cmake --build build --config ${{ matrix.configuration }} --parallel ${{ matrix.platform.threads || 4 }}
 
+    - name: Show ccache stats
+      if: ${{ startsWith(matrix.platform.name, 'macOS') }}
+      run: ccache -s || true
+
+    # TODO: Merge this step with 'Make AppImage' once we switch to CMake 4.2 which directly supports AppImage generation with CPack
+    # https://cmake.org/cmake/help/latest/cpack_gen/appimage.html
     - name: Make package
-      if: ${{ steps.cmake-build.outcome == 'success' }}
+      if: ${{ steps.cmake-build.outcome == 'success' && matrix.platform.name != 'AppImage' }}
       id: make-package
       #continue-on-error: true
       working-directory: build
       run: |
           cpack -B artifacts -C ${{ matrix.configuration }} -DCPACK_THREADS=${{ matrix.platform.threads || 4 }}
           file artifacts/openxray*.*
 
+    - name: Make AppImage
+      if: ${{ steps.cmake-build.outcome == 'success' && matrix.platform.name == 'AppImage' }}
+      id: make-appimage
+      run: |
+          DESTDIR=AppDir cmake --install build --prefix /usr
+          ${{ matrix.platform.linuxdeploy }} --appdir AppDir --output appimage --executable AppDir/usr/bin/xr_3da --desktop-file AppDir/usr/share/applications/openxray_cop.desktop --desktop-file AppDir/usr/share/applications/openxray_cs.desktop --desktop-file AppDir/usr/share/applications/openxray_soc.desktop --icon-file AppDir/usr/share/icons/hicolor/64x64/apps/openxray_cop.png --icon-file AppDir/usr/share/icons/hicolor/64x64/apps/openxray_cs.png --icon-file AppDir/usr/share/icons/hicolor/64x64/apps/openxray_soc.png
+          mkdir -p build/artifacts
+          mv *.AppImage build/artifacts/openxray-${{ matrix.configuration }}-${{ matrix.platform.arch }}.AppImage
+          file build/artifacts/openxray*.*
+
     - name: Upload OpenXRay artifact
-      if: ${{ steps.make-package.outcome == 'success' }}
+      if: ${{ steps.make-package.outcome == 'success' || steps.make-appimage.outcome == 'success' }}
       uses: actions/upload-artifact@main
       with:
         name: ${{ matrix.platform.name }} ${{ matrix.configuration }} ${{ matrix.platform.arch }} (${{ matrix.platform.cc }} github-${{ github.run_number }})
@@ -176,8 +220,10 @@ jobs:
       fail-fast: false
       matrix:
         platform:
+        # FreeBSD package repositories may be ahead of the VM image; tell pkg to
+        # ignore the OS version mismatch so packages still install.
         - { name: FreeBSD, os: freebsd, os-version: '14.3', arch: x86_64,
-            install-cmd: "sudo pkg update && sudo pkg install -y cmake sdl2 lzo2 jpeg-turbo openal-soft libogg libtheora libvorbis"
+            install-cmd: "sudo env IGNORE_OSVERSION=yes pkg update && sudo env IGNORE_OSVERSION=yes pkg install -y cmake sdl2 lzo2 jpeg-turbo openal-soft libogg libtheora libvorbis"
           }
         - { name: OpenBSD, os: openbsd, os-version: '7.6',  arch: x86_64,
             install-cmd: "sudo pkg_add cmake SDL2 lzo2 jpeg openal libogg libtheora libvorbis",
@@ -196,7 +242,7 @@ jobs:
         submodules: recursive
 
     - name: Setup ${{ matrix.platform.name }} and packages
-      uses: cross-platform-actions/action@v0.30.0
+      uses: cross-platform-actions/action@v0.32.0
       with:
         operating_system: ${{ matrix.platform.os }}
         architecture: ${{ matrix.platform.arch }}
@@ -209,7 +255,7 @@ jobs:
         run: ${{ matrix.platform.install-cmd }}
 
     - name: Run CMake
-      uses: cross-platform-actions/action@v0.30.0
+      uses: cross-platform-actions/action@v0.32.0
       with:
         operating_system: ${{ matrix.platform.os }}
         architecture: ${{ matrix.platform.arch }}
@@ -222,7 +268,7 @@ jobs:
         run: cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.Configuration }} -DCMAKE_UNITY_BUILD=ON --log-level VERBOSE
 
     - name: Run CMake Build
-      uses: cross-platform-actions/action@v0.30.0
+      uses: cross-platform-actions/action@v0.32.0
       with:
         operating_system: ${{ matrix.platform.os }}
         architecture: ${{ matrix.platform.arch }}
@@ -233,3 +279,30 @@ jobs:
         shutdown_vm: false
         sync_files: false
         run: cmake --build build --config ${{ matrix.Configuration }} --parallel 4
+
+  flatpak:
+    name: Flatpak ${{ matrix.platform.arch }}
+    runs-on: ${{ matrix.platform.os }}
+
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-25.08
+      options: --privileged
+
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - arch: x86_64
+            os: ubuntu-latest
+          - arch: aarch64
+            os: ubuntu-24.04-arm
+
+    steps:
+      - uses: actions/checkout@main
+
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        with:
+          bundle: io.github.OpenXRay.xray-16-${{ matrix.platform.arch }}-${{ github.run_number }}.flatpak
+          manifest-path: misc/flatpak/manifest.yml
+          arch: ${{ matrix.platform.arch }}
+          verbose: true

.github/workflows/labeler.yml

@@ -11,7 +11,7 @@ permissions:
 
 jobs:
   labeler:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
     - name: on new pull request
       if: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.opened == true || github.event.pull_request.reopened == true }}

.github/workflows/mirror.yml

@@ -5,27 +5,33 @@ on: [push, delete, workflow_dispatch]
 jobs:
   mirror:
     if: github.repository == 'OpenXRay/xray-16'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Bitbucket.org
-        uses: pixta-dev/repository-mirroring-action@v1.1.1
+        uses: Xottab-DUTY/git-mirror@v1.0.0
         with:
-          target_repo_url: git@bitbucket.org:OpenXRay/xray-16.git
-          ssh_private_key: ${{ secrets.RABOTYAGA_BITBUCKET_PRIVATE_SSH_KEY }}
+          target: git@bitbucket.org:OpenXRay/xray-16.git
+          password: ${{ secrets.RABOTYAGA_BITBUCKET_PRIVATE_SSH_KEY }}
+          push_args: "--tags --prune --force"
+          refspec: "refs/remotes/origin/*:refs/heads/*"
 
       - name: gitflic.ru
-        uses: pixta-dev/repository-mirroring-action@v1.1.1
+        uses: Xottab-DUTY/git-mirror@v1.0.0
         with:
-          target_repo_url: git@gitflic.ru:openxray/xray-16.git
-          ssh_private_key: ${{ secrets.GITFLIC_PRIVATE_SSH_KEY }}
+          target: git@gitflic.ru:openxray/xray-16.git
+          password: ${{ secrets.GITFLIC_PRIVATE_SSH_KEY }}
+          push_args: "--tags --prune --force"
+          refspec: "refs/remotes/origin/*:refs/heads/*"
 
       - name: abf.io
         continue-on-error: true
-        uses: pixta-dev/repository-mirroring-action@v1.1.1
+        uses: Xottab-DUTY/git-mirror@v1.0.0
         with:
-          target_repo_url: git@abf.io:openxray/xray-16.git
-          ssh_private_key: ${{ secrets.ABF_IO_PRIVATE_SSH_KEY }}
+          target: git@abf.io:openxray/xray-16.git
+          password: ${{ secrets.ABF_IO_PRIVATE_SSH_KEY }}
+          push_args: "--tags --prune --force"
+          refspec: "refs/remotes/origin/*:refs/heads/*"

.github/workflows/stylecheck.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install
         run: sudo apt-get install moreutils
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install
         run: sudo apt-get install dos2unix recode
@@ -75,7 +75,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.gitignore

@@ -8,8 +8,19 @@
 # exclude binaries and temporary files
 [Bb]in/
 [Bb]uild*/
+bin-rafx/
 cmake_builds/
 
+# Local RAFX checkouts / scratch (not vendored for this branch)
+Externals/rafx/
+Externals/rafx-proj/
+.tmp_classic_sun/
+
+# Local WIP / machine-specific (not for the framegraph branch)
+framegraph_docs/STATUS.md
+.DS_Store
+**/.DS_Store
+
 # User-specific files
 *.user
 *.user.props
@@ -23,3 +34,7 @@ cmake_builds/
 
 # exclude doxygen output
 doc/doxygen/html/*
+
+# Screen Space Shaders reference
+refs/ssfx/
+ScreenSpaceShaders_Update23_5.zip

.gitmodules

@@ -30,7 +30,7 @@
 	url = https://github.com/pattonkan/sse2rvv.git
 [submodule "Externals/nvrhi"]
 	path = Externals/nvrhi
-	url = git@github.com:yohjimane/NVRHI.git
+	url = https://github.com/yohjimane/NVRHI.git
 	branch = main
 [submodule "Externals/slang"]
 	path = Externals/slang
@@ -55,5 +55,5 @@
 	url = https://github.com/skypjack/entt.git
 [submodule "Externals/MoltenVK"]
 	path = Externals/MoltenVK
-	url = git@github.com:yohjimane/MoltenVK.git
+	url = https://github.com/yohjimane/MoltenVK.git
 	branch = main

.vscode/launch.json

@@ -103,10 +103,10 @@
       "options": [
         "Debug",
         "Release",
-        "MinSizeRel",
-        "RelWithDebInfo"
+        "Mixed",
+        "ReleaseMasterGold"
       ],
-      "default": "Debug"
+      "default": "ReleaseMasterGold"
     }
   ]
 }

.vscode/tasks.json

@@ -51,7 +51,7 @@
       "options": {
         "cwd": "${workspaceFolder}/bin"
       },
-      "command": "cmake --build . -j${CPU_COUNT}",
+      "command": "cmake --build . -j$(nproc --all)",
       "dependsOn": [
         "Configure"
       ]
@@ -101,10 +101,10 @@
       "options": [
         "Debug",
         "Release",
-        "MinSizeRel",
-        "RelWithDebInfo"
+        "Mixed",
+        "ReleaseMasterGold"
       ],
-      "default": "Debug"
+      "default": "ReleaseMasterGold"
     }
   ]
 }

CMakeLists.txt

@@ -23,6 +23,9 @@ option(XRAY_USE_LUAJIT   "Use LuaJIT"                 ON)
 option(XRAY_USE_ASAN     "Use AddressSanitizer"       OFF)
 option(XRAY_ENABLE_TRACY "Enable tracy profiler"      OFF)
 option(XRAY_USE_AI_PBR   "Enable AI PBR texture converter (requires ONNX Runtime)" OFF)
+option(XRAY_USE_FSR      "Enable AMD FSR / Ray Regeneration / FidelityFX Denoiser (requires SDK)" OFF)
+option(XRAY_USE_DLSS     "Enable NVIDIA DLSS / NGX (requires SDK)" OFF)
+option(XRAY_USE_NRD      "Enable NVIDIA NRD denoise via NRDIntegration+NRI (Linux Vulkan: -DXRAY_USE_NRD=ON)" OFF)
 
 include(XRay.Build)
 include(XRay.Windows.Externals)