From 08768e3d25599a28556acd622c81b17a00c7dbe7 Mon Sep 17 00:00:00 2001
From: Jens Peters <jp7677@gmail.com>
Date: Fri, 19 Jan 2024 18:37:09 +0100
Subject: [PATCH 1/4] meta: Update usage section

---
 README.md | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 1535e5d6..710cd98c 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ While originally being developed for usage with Unreal Engine 4, most notably fo
 
 ## Requirements
 
-This implementation is supposed to be used on Linux using Wine or derivatives like Proton. Usage on Windows is discouraged. Please do not replace `nvapi.dll`/`nvapi64.dll` on Windows from NVIDIA's driver package with this version. DXVK-NVAPI uses several DXVK and VKD3D-Proton extension points, thus using DXVK (D3D11 and DXGI) is a requirement. Using Wine's D3D11 or DXGI will fail. Usage of DXVK-NVAPI is not restricted to NVIDIA GPUs, though the default behavior is to skip GPUs not running the NVIDIA proprietary driver. Some entry points offer no functionality or make no sense when a different GPU vendor is detected.
+This implementation is supposed to be used on Linux using Wine or derivatives like Proton. Usage on Windows is discouraged. Please do not replace `nvapi.dll`/`nvapi64.dll` on Windows from NVIDIA's driver package with this version. DXVK-NVAPI uses several DXVK and VKD3D-Proton extension points, thus using DXVK (D3D11 and DXGI) is a requirement. Using Wine's D3D11 or DXGI implementation will fail. Usage of DXVK-NVAPI is not restricted to NVIDIA GPUs, though the default behavior is to skip GPUs not running the NVIDIA proprietary driver. Some entry points offer no functionality or make no sense when a different GPU vendor is detected. DLSS requires an NVIDIA GPU, Turing or newer, running the proprietary driver.
 
 When available, DXVK-NVAPI uses NVIDIA's NVML management library to query temperature, utilization and others for NVIDIA GPUs. See [wine-nvml](https://github.com/Saancreed/wine-nvml) how to add NVML support to Wine/Proton.
 
@@ -38,39 +38,35 @@ Prebuilt binaries of release versions are available at <https://github.com/jp767
 
 ## How to use
 
-Using DXVK-NVAPI in Proton, Lutris or Wine requires DXVK to see the GPU as an NVIDIA GPU.
+Support for DXVK-NVAPI has been added to popular game launchers. See their respective documentation for usage and updates of DXVK-NVAPI.    
 
-- Spoof an NVIDIA GPU when running a non-NVIDIA GPU with `dxgi.customVendorId = 10de` set in a DXVK configuration file, see [dxvk.conf](https://github.com/doitsujin/dxvk/blob/master/dxvk.conf).
-
-### Proton
+### Steam Play / Proton
 
 Proton 8.0 includes DXVK-NVAPI and enables it by default for a lot of titles.
 
 - Use `PROTON_ENABLE_NVAPI=1` as game launch argument in Steam to enable DXVK-NVAPI for other titles.
-- Copy and replace `nvapi.dll`/`nvapi64.dll` into the `dist/lib/wine/nvapi`/`dist/lib64/wine/nvapi` folder of your Proton installation, e.g. in `~/.steam/steam/steamapps/common/Proton 8.0/` if you want to manually update the included version.
-
-Proton Experimental Bleeding Edge additionally always contains the latest DXVK-NVAPI development (master) version.
-
-Proton 7.0 includes DXVK-NVAPI, but it is disabled by default. This version also needs `PROTON_HIDE_NVIDIA_GPU=0` for certain titles that don't rely on D3D for obtaining the current GPU type and have this Proton setting applied.
-
-### Lutris
+- Copy and replace `nvapi.dll`/`nvapi64.dll` into the `dist/lib/wine/nvapi`/`dist/lib64/wine/nvapi` folder of your Proton installation, e.g. in `~/.steam/steam/steamapps/common/Proton 8.0/` for manually updating the included version.
 
-DXVK-NVAPI is enabled by default since Lutris 0.5.9. It's updated automatically.
+Proton Experimental 8.0 can force-enable DXVK-NVAPI for non-NVIDIA GPUs when setting `PROTON_FORCE_NVAPI=1`. Proton Experimental Bleeding Edge additionally always contains the latest DXVK-NVAPI development (master) version.
 
-- To use a custom version, copy a folder with that version containing `x32`/`x64` with `nvapi.dll`/`nvapi64.dll` of corresponding architecture inside them, into `~/.local/share/lutris/runtime/dxvk-nvapi/`. Edit the "DXVK-NVAPI version" field in the Lutris settings to the name of that folder.
-
-### Wine
+### Wine / Wine-Staging
 
 Wine does not includes DXVK-NVAPI.
 
 - Copy `nvapi.dll`/`nvapi64.dll` into the `syswow64`/`system32` folder of your x86/x64 Wine prefix.
-- Ensure that Wine uses the native version of `nvapi`/`nvapi64`, e.g. with `WINEDLLOVERRIDES=nvapi,nvapi64=n`.
+- Ensure that Wine uses the native version of `nvapi`/`nvapi64`, e.g. with `WINEDLLOVERRIDES=nvapi,nvapi64=n`. This applies only to Wine versions that ship their own NVAPI implementation, e.g. Wine-Staging older than 7.22. Generally this is no longer needed nowadays.
 - Ensure that DXVK is installed in your x86/x64 Wine prefix.
 - Ensure that Wine uses DXVK's `dxgi.dll`, e.g. with `WINEDLLOVERRIDES=dxgi=n`.
 - Set `DXVK_ENABLE_NVAPI=1` to disable DXVK's `nvapiHack` in DXVK.
 
 DXVK 1.10 and older does not support `DXVK_ENABLE_NVAPI`. Disable the `nvapiHack` in DXVK 1.10 and older with `dxgi.nvapiHack = False` set in a DXVK configuration file, see [dxvk.conf](https://github.com/doitsujin/dxvk/blob/master/dxvk.conf).
 
+### Non-NVIDIA GPUs or non-proprietary driver
+
+Using DXVK-NVAPI with other GPU vendors / drivers has very limited use. Outside of testing, only Reflex (LatencyFlex) or HDR entry points provide benefits. This requires DXVK to see the GPU as an NVIDIA GPU. Use `DXVK_CONFIG="dxgi.hideAmdGpu = True"` to spoof an AMD GPU as NVIDIA GPU. Use `DXVK_CONFIG="dxgi.customVendorId = 10de"` for generally spoofing an NVIDIA GPU. 
+
+Setting `DXVK_NVAPI_ALLOW_OTHER_DRIVERS=1` is needed for successful DXVK-NVAPI initialization when using a driver other than the NVIDIA proprietary driver like RADV or NVK. Overriding the reported driver version is additionally recommended. The reported GPU arrchitecture for other drivers is always Pascal to prevent attempts to initialize DLSS. This behavior cannot be changed without modifying the source code.
+
 ## Tweaks, debugging and troubleshooting
 
 See the [DXVK-NVAPI Wiki](https://github.com/jp7677/dxvk-nvapi/wiki) for common issues and workarounds.
@@ -78,7 +74,7 @@ See the [DXVK-NVAPI Wiki](https://github.com/jp7677/dxvk-nvapi/wiki) for common
 The following environment variables tweak DXVK-NVAPI's runtime behavior:
 
 - `DXVK_NVAPI_DRIVER_VERSION` lets you override the reported driver version. Valid values are numbers between 100 and 99999. Use e.g. `DXVK_NVAPI_DRIVER_VERSION=47141` to report driver version `471.41`.
-- `DXVK_NVAPI_ALLOW_OTHER_DRIVERS`, when set to `1`, lets you use DXVK-NVAPI without running an NVIDIA card on NVIDIA's proprietary driver. Useful for using D3D11 extensions on a non-NVIDIA GPU.
+- `DXVK_NVAPI_ALLOW_OTHER_DRIVERS`, when set to `1`, lets you use DXVK-NVAPI without running an NVIDIA card on NVIDIA's proprietary driver.
 - `DXVK_NVAPI_LOG_LEVEL` set to `info` prints log statements. The default behavior omits any logging. Please fill an issue if using log servery `info` creates log spam. There are no other log levels.
 - `DXVK_NVAPI_LOG_PATH` enables file logging additionally to console output and sets the path where the log file `dxvk-nvapi.log` should be written to. Log statements are appended to an existing file. Please remove this file once in a while to prevent excessive grow. This requires `DXVK_NVAPI_LOG_LEVEL` set to `info`.
 

From 018d57552745900c12fa75a200f31b2835fb813f Mon Sep 17 00:00:00 2001
From: Jens Peters <jp7677@gmail.com>
Date: Fri, 19 Jan 2024 18:50:38 +0100
Subject: [PATCH 2/4] ci: Use idental workflow conditions

Also renames.
---
 .../{artifacts.yml => build-test-package-linux.yml}    |  2 +-
 .../{test-build-windows.yml => build-test-windows.yml} | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
 rename .github/workflows/{artifacts.yml => build-test-package-linux.yml} (98%)
 rename .github/workflows/{test-build-windows.yml => build-test-windows.yml} (92%)

diff --git a/.github/workflows/artifacts.yml b/.github/workflows/build-test-package-linux.yml
similarity index 98%
rename from .github/workflows/artifacts.yml
rename to .github/workflows/build-test-package-linux.yml
index b9ef8db6..ece9f01b 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/build-test-package-linux.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-artifacts:
+  build-test-package-linux:
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/test-build-windows.yml b/.github/workflows/build-test-windows.yml
similarity index 92%
rename from .github/workflows/test-build-windows.yml
rename to .github/workflows/build-test-windows.yml
index f86a878a..4272a282 100644
--- a/.github/workflows/test-build-windows.yml
+++ b/.github/workflows/build-test-windows.yml
@@ -1,9 +1,15 @@
 name: Build and test on Windows
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  push:
+    branches: [ master ]
+    tags: [ v* ]
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
 
 jobs:
-  build-set-windows:
+  build-test-windows:
     runs-on: windows-2022
 
     steps:

From c5e39309f9130aa5da1e8f19ac198145f5f4b736 Mon Sep 17 00:00:00 2001
From: Jens Peters <jp7677@gmail.com>
Date: Fri, 19 Jan 2024 18:51:18 +0100
Subject: [PATCH 3/4] ci: Use idental checkout strategy

---
 .github/workflows/build-test-windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml
index 4272a282..83ab4736 100644
--- a/.github/workflows/build-test-windows.yml
+++ b/.github/workflows/build-test-windows.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - name: Checkout code
-      id: checkout-code
       uses: actions/checkout@v3
       with:
         submodules: recursive
+        fetch-depth: 0
 
     - name: Setup Meson
       shell: pwsh

From 40e39453e836f0be9f95a13eb370b7fdbb7d2dc0 Mon Sep 17 00:00:00 2001
From: Jens Peters <jp7677@gmail.com>
Date: Fri, 19 Jan 2024 19:01:52 +0100
Subject: [PATCH 4/4] ci: Add dependabot for github actions

---
 dependabot.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 dependabot.yml

diff --git a/dependabot.yml b/dependabot.yml
new file mode 100644
index 00000000..5ace4600
--- /dev/null
+++ b/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"