patches: Update vulkan headers

loathingKernel · Nov 22, 2023 · 4925ece · 4925ece
1 parent cffa2f6
commit 4925ece
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 42 deletions.
diff --git a/patches/proton/80-nv_low_latency_dxvk.patch b/patches/proton/80-nv_low_latency_dxvk.patch
@@ -1,24 +1,7 @@
-From e6e806dcce98b22f90a8859162cadd74669af4d6 Mon Sep 17 00:00:00 2001
-From: Eric Sullivan <esullivan@nvidia.com>
-Date: Sun, 8 Oct 2023 23:54:00 -0700
-Subject: [PATCH 1/2] Update Vulkan headers.
-
----
- include/vulkan | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/vulkan b/include/vulkan
-index 85c2334e92e..bbe0f575ebd 160000
---- a/include/vulkan
-+++ b/include/vulkan
-@@ -1 +1 @@
--Subproject commit 85c2334e92e215cce34e8e0ed8b2dce4700f4a50
-+Subproject commit bbe0f575ebd6098369f0ac6c6a43532732ed0ba6
-
 From 2518e1c71e64679be3f38c622f8294e9354e44a0 Mon Sep 17 00:00:00 2001
 From: Eric Sullivan <esullivan@nvidia.com>
 Date: Mon, 9 Oct 2023 01:51:16 -0700
-Subject: [PATCH 2/2] Add VK_NV_low_latency2 support
+Subject: [PATCH] Add VK_NV_low_latency2 support
 
 This commit add support for the VK_NV_low_latency2 extension, and
 implements the ID3DLowLatencyDevice interface.

diff --git a/patches/proton/81-nv_low_latency_vkd3d_proton.patch b/patches/proton/81-nv_low_latency_vkd3d_proton.patch
@@ -1,24 +1,7 @@
-From 56565ab8587c5785e63bd4cf4eb9e905d4affcf4 Mon Sep 17 00:00:00 2001
-From: Eric Sullivan <esullivan@nvidia.com>
-Date: Sun, 8 Oct 2023 22:46:03 -0700
-Subject: [PATCH 1/2] khronos: Update Vulkan headers
-
----
- subprojects/Vulkan-Headers | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/subprojects/Vulkan-Headers b/subprojects/Vulkan-Headers
-index a0c76b4ef7..bbe0f575eb 160000
---- a/subprojects/Vulkan-Headers
-+++ b/subprojects/Vulkan-Headers
-@@ -1 +1 @@
--Subproject commit a0c76b4ef76e219483755ff61dce6b67ff79f24b
-+Subproject commit bbe0f575ebd6098369f0ac6c6a43532732ed0ba6
-
 From dd574726b5c94824c7f0ee847aaf677f04892503 Mon Sep 17 00:00:00 2001
 From: Eric Sullivan <esullivan@nvidia.com>
 Date: Thu, 7 Sep 2023 09:27:14 -0700
-Subject: [PATCH 2/2] vkd3d: Add support for VK_NV_low_latency2
+Subject: [PATCH] vkd3d: Add support for VK_NV_low_latency2
 
 This commit add support for the VK_NV_low_latency2 extension, and
 implements the ID3DLowLatencyDevice, and ID3D12CommandQueueExt

diff --git a/patches/protonprep-valve-staging.sh b/patches/protonprep-valve-staging.sh
@@ -378,18 +378,26 @@
     cd ..
 
     echo "DXVK: -Nvidia Reflex- Add NV low latency support"
-    pushd dxvk; patch -Np1 < ../patches/proton/80-nv_low_latency_dxvk.patch; popd
+    pushd dxvk
+    pushd include/vulkan; git checkout bbe0f575ebd6098369f0ac6c6a43532732ed0ba6; popd
+    patch -Np1 < ../patches/proton/80-nv_low_latency_dxvk.patch
+    popd
 
     echo "VKD3D-PROTON: -Nvidia Reflex- Add NV low latency support"
-    pushd vkd3d-proton; patch -Np1 < ../patches/proton/81-nv_low_latency_vkd3d_proton.patch; popd
+    pushd vkd3d-proton
+    pushd khronos/Vulkan-Headers; git checkout bbe0f575ebd6098369f0ac6c6a43532732ed0ba6; popd
+    patch -Np1 < ../patches/proton/81-nv_low_latency_vkd3d_proton.patch
+    popd
 
     echo "DXVK-NVAPI: -Nvidia Reflex- Add support for Reflex"
-    pushd dxvk-nvapi; patch -Np1 < ../patches/proton/82-nv_low_latency_dxvk_nvapi.patch; popd
+    pushd dxvk-nvapi
+    patch -Np1 < ../patches/proton/82-nv_low_latency_dxvk_nvapi.patch
+    popd
 
     echo "WINE: -Nvidia Reflex- Support VK_NV_low_latency2"
-    pushd wine; patch -Np1 < ../patches/proton/83-nv_low_latency_wine.patch; popd
-
-    git submodule update --recursive
+    pushd wine
+    patch -Np1 < ../patches/proton/83-nv_low_latency_wine.patch
+    popd
 
 ### END PROTON-GE ADDITIONAL CUSTOM PATCHES ###
 ### END WINE PATCHING ###