Remove upstreamed VR patch

3 files changed, 2 insertions, 133 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94a0b9b0b99e..c5e761a76b15 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vulkan-nouveau-git
 	pkgdesc = Nouveau Vulkan (NVK) EXPERIMENTAL Mesa driver with some additions (Git version)
-	pkgver = 24.0.branchpoint.r1743.g876db91
+	pkgver = 24.0.branchpoint.r1759.gf933536
 	pkgrel = 1
 	url = https://gitlab.freedesktop.org/mesa/mesa
 	install = vulkan-nouveau-git.install
@@ -33,12 +33,10 @@ pkgbase = vulkan-nouveau-git
 	source = git+https://gitlab.freedesktop.org/mesa/mesa.git
 	source = nak-iadd3-imad.patch
 	source = nvk-memory-budget.patch
-	source = nvk-vr-support.patch
 	source = LICENSE
 	sha512sums = SKIP
 	sha512sums = 6c4ed4c9c7dce79debb77cd9b828f628088101936c4e2b2994e56723f86e61799b278a9333f08813082d0a4153ac41870669da8ac47106aa20c7fc7dee8812e8
 	sha512sums = 4da33481cf0c4ccab193ff4fff652a98ef7940b10d12c0e3a69280236ddc9463c7813d390c5461af0478f98a6f223736a1eec14986d72a4b0f51edb28e713d95
-	sha512sums = dd4c1cd059fa103b2effb3d835cf6485fb4e294c1217a94482052f803a7e88d63f452db7e1cc2d86656bf7b3340606ab685578d346f157d19e35f1b283bd04f3
 	sha512sums = f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7
 
 pkgname = vulkan-nouveau-git
diff --git a/PKGBUILD b/PKGBUILD
index 5694cfaddeeb..33119fd929b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=vulkan-nouveau-git
 pkgdesc="Nouveau Vulkan (NVK) EXPERIMENTAL Mesa driver with some additions (Git version)"
-pkgver=24.0.branchpoint.r1743.g876db91
+pkgver=24.0.branchpoint.r1759.gf933536
 pkgrel=1
 arch=('x86_64')
 depends=('libdrm' 'libxshmfence' 'libx11' 'systemd-libs' 'vulkan-icd-loader' 'wayland')
@@ -18,12 +18,10 @@ license=('MIT AND BSD-3-Clause AND SGI-B-2.0')
 source=("git+${url}.git"
         nak-iadd3-imad.patch
         nvk-memory-budget.patch
-        nvk-vr-support.patch
         LICENSE)
 sha512sums=('SKIP'
             '6c4ed4c9c7dce79debb77cd9b828f628088101936c4e2b2994e56723f86e61799b278a9333f08813082d0a4153ac41870669da8ac47106aa20c7fc7dee8812e8'
             '4da33481cf0c4ccab193ff4fff652a98ef7940b10d12c0e3a69280236ddc9463c7813d390c5461af0478f98a6f223736a1eec14986d72a4b0f51edb28e713d95'
-            'dd4c1cd059fa103b2effb3d835cf6485fb4e294c1217a94482052f803a7e88d63f452db7e1cc2d86656bf7b3340606ab685578d346f157d19e35f1b283bd04f3'
             'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
 install="${pkgname}.install"
 
@@ -58,10 +56,6 @@ prepare() {
   # (improves performance greatly in certain cases)
   patch ${_patch_opts} ../nak-iadd3-imad.patch
 
-  # Add support for VR-related extensions (https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27654)
-  # (seems to work with xrgears and Monado direct mode)
-  patch ${_patch_opts} ../nvk-vr-support.patch
-
   # Add ESO/GPL support (https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27024)
   # (enables shader precompile in DXVK and some Vulkan games; helps greatly in Overwatch 2)
   # TODO: Add this once fatal driver crashes on Overwatch 2 are fixed (I get a lot of BAR errors)
diff --git a/nvk-vr-support.patch b/nvk-vr-support.patch
deleted file mode 100644
index e01239a5aaf3..000000000000
--- a/nvk-vr-support.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 4b576c3b73f828d7dba4c7649e80b1624f3ce7bb Mon Sep 17 00:00:00 2001
-From: "Echo J." <aidas957@gmail.com>
-Date: Fri, 16 Feb 2024 15:12:42 +0200
-Subject: [PATCH] nvk: Implement the VR-related display extensions
-
-xrgears in Monado direct mode seems to work (I haven't tried running
-CTS tests though)
----
- src/nouveau/vulkan/nvk_instance.c        |  7 +++++++
- src/nouveau/vulkan/nvk_physical_device.c | 15 +++++++++++++--
- src/nouveau/vulkan/nvk_physical_device.h |  1 +
- src/nouveau/vulkan/nvk_wsi.c             |  2 +-
- 4 files changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/src/nouveau/vulkan/nvk_instance.c b/src/nouveau/vulkan/nvk_instance.c
-index dc72f5020e4..71230f3a28b 100644
---- a/src/nouveau/vulkan/nvk_instance.c
-+++ b/src/nouveau/vulkan/nvk_instance.c
-@@ -41,6 +41,13 @@ static const struct vk_instance_extension_table instance_extensions = {
- #ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT
-    .EXT_acquire_xlib_display = true,
- #endif
-+#ifdef VK_USE_PLATFORM_DISPLAY_KHR
-+   .KHR_display = true,
-+   .KHR_get_display_properties2 = true,
-+   .EXT_direct_mode_display = true,
-+   .EXT_display_surface_counter = true,
-+   .EXT_acquire_drm_display = true,
-+#endif
- #ifndef VK_USE_PLATFORM_WIN32_KHR
-    .EXT_headless_surface = true,
- #endif
-diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
-index 086a72fd33b..8242c75452e 100644
---- a/src/nouveau/vulkan/nvk_physical_device.c
-+++ b/src/nouveau/vulkan/nvk_physical_device.c
-@@ -21,6 +21,7 @@
- #include "vulkan/runtime/vk_shader_module.h"
- #include "vulkan/wsi/wsi_common.h"
- 
-+#include <fcntl.h>
- #include <sys/stat.h>
- #include <sys/sysmacros.h>
- #include <xf86drm.h>
-@@ -929,6 +930,7 @@ nvk_create_drm_physical_device(struct vk_instance *_instance,
- {
-    struct nvk_instance *instance = (struct nvk_instance *)_instance;
-    VkResult result;
-+   int master_fd = -1;
- 
-    if (!(drm_device->available_nodes & (1 << DRM_NODE_RENDER)))
-       return VK_ERROR_INCOMPATIBLE_DRIVER;
-@@ -1036,6 +1038,10 @@ nvk_create_drm_physical_device(struct vk_instance *_instance,
-       properties.drmHasPrimary = true;
-       properties.drmPrimaryMajor = major(st.st_rdev);
-       properties.drmPrimaryMinor = minor(st.st_rdev);
-+
-+      /* TODO: Test if the FD is usable? */
-+      if (instance->vk.enabled_extensions.KHR_display)
-+         master_fd = open(drm_device->nodes[DRM_NODE_PRIMARY], O_RDWR | O_CLOEXEC);
-    }
- 
-    result = vk_physical_device_init(&pdev->vk, &instance->vk,
-@@ -1044,9 +1050,10 @@ nvk_create_drm_physical_device(struct vk_instance *_instance,
-                                     &properties,
-                                     &dispatch_table);
-    if (result != VK_SUCCESS)
--      goto fail_alloc;
-+      goto fail_master_fd;
- 
-    pdev->render_dev = render_dev;
-+   pdev->master_fd = master_fd;
-    pdev->info = info;
-    pdev->debug_flags = debug_flags;
- 
-@@ -1127,7 +1134,9 @@ fail_disk_cache:
-    nak_compiler_destroy(pdev->nak);
- fail_init:
-    vk_physical_device_finish(&pdev->vk);
--fail_alloc:
-+fail_master_fd:
-+   if (master_fd >= 0)
-+      close(master_fd);
-    vk_free(&instance->vk.alloc, pdev);
-    return result;
- }
-@@ -1141,6 +1150,8 @@ nvk_physical_device_destroy(struct vk_physical_device *vk_pdev)
-    nvk_finish_wsi(pdev);
-    nvk_physical_device_free_disk_cache(pdev);
-    nak_compiler_destroy(pdev->nak);
-+   if (pdev->master_fd >= 0)
-+      close(pdev->master_fd);
-    vk_physical_device_finish(&pdev->vk);
-    vk_free(&pdev->vk.instance->alloc, pdev);
- }
-diff --git a/src/nouveau/vulkan/nvk_physical_device.h b/src/nouveau/vulkan/nvk_physical_device.h
-index d5c4bac91d9..a6894d3c25d 100644
---- a/src/nouveau/vulkan/nvk_physical_device.h
-+++ b/src/nouveau/vulkan/nvk_physical_device.h
-@@ -31,6 +31,7 @@ struct nvk_physical_device {
-    enum nvk_debug debug_flags;
-    dev_t render_dev;
-    dev_t primary_dev;
-+   int master_fd;
-    struct nak_compiler *nak;
-    struct wsi_device wsi_device;
- 
-diff --git a/src/nouveau/vulkan/nvk_wsi.c b/src/nouveau/vulkan/nvk_wsi.c
-index 761b5a11812..91efd72c84d 100644
---- a/src/nouveau/vulkan/nvk_wsi.c
-+++ b/src/nouveau/vulkan/nvk_wsi.c
-@@ -24,7 +24,7 @@ nvk_init_wsi(struct nvk_physical_device *pdev)
-    result = wsi_device_init(&pdev->wsi_device,
-                             nvk_physical_device_to_handle(pdev),
-                             nvk_wsi_proc_addr, &pdev->vk.instance->alloc,
--                            -1, &nvk_physical_device_instance(pdev)->dri_options, &wsi_options);
-+                            pdev->master_fd, &nvk_physical_device_instance(pdev)->dri_options, &wsi_options);
-    if (result != VK_SUCCESS)
-       return result;
- 
--- 
-2.43.1
-