Removed unnecessary 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft patch

3 files changed, 2 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 736aa69cc51f..b2a803d0791a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mesa-git
 	pkgdesc = an open-source implementation of the OpenGL specification, git version
-	pkgver = 23.0.0_devel.163974.bafbe7c23a1.d41d8cd98f00b204e9800998ecf8427e
+	pkgver = 23.0.0_devel.164692.980df9ede18.5269a95f00c4d6964d487d9dbd94f62b
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -62,15 +62,12 @@ pkgbase = mesa-git
 	conflicts = vulkan-swrast
 	conflicts = mesa-libgl
 	source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main
-	source = 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
 	source = 0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
 	source = LICENSE
 	md5sums = SKIP
-	md5sums = 102af8525e4c1f266cc54b038d1b9314
 	md5sums = 094f900983f68bec0325bd29d4789ad5
 	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
 	sha512sums = SKIP
-	sha512sums = 4ff7c359f08aedb1fb6eb2c6bb34bafa399edfa7916cd6cce7844bb38795e84c0265324e3fc7d37237d4824f029cb04da176bcf476785fd2e35a8b0ce4f8a394
 	sha512sums = 5dd0cb8affa9cfe6e7d94f59b8e23727036fd8ab76938321f8d266315f30611584da6f6277fe2aa920130483302adab5e57e2bc08f1bd3c62ea57b3e4b007305
 	sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
 
diff --git a/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch b/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
deleted file mode 100644
index 19c21a04115e..000000000000
--- a/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
-Date: Sun, 12 Jun 2022 23:59:05 +0300
-Subject: [PATCH] anv: force MEDIA_INTERFACE_DESCRIPTOR_LOAD reemit after
- 3D->GPGPU switch
-
-Seems to fix a hang in Age of Empire 4 where the HW is hung on a
-PIPE_CONTROL after a GPGPU_WALKER but no
-MEDIA_INTERFACE_DESCRIPTOR_LOAD was emitted since the switch from 3D
-to GPGPU.
-
-This would happen in the following case :
-
-   vkCmdBindPipeline(COMPUTE, cs_pipeline);
-   vkCmdDispatch(...);
-   vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
-   vkCmdDraw(...);
-   vkCmdDispatch(...);
-
-Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
----
- src/intel/vulkan/genX_cmd_buffer.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
-index 1aa997f2ade2..2e9979c8f63e 100644
---- a/src/intel/vulkan/genX_cmd_buffer.c
-+++ b/src/intel/vulkan/genX_cmd_buffer.c
-@@ -5955,6 +5955,11 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer *cmd_buffer,
-    }
- #endif
- 
-+#if GFX_VERx10 == 120
-+   if (pipeline == _3D)
-+      cmd_buffer->state.compute.pipeline_dirty = true;
-+#endif
-+
-    /* From "BXML » GT » MI » vol1a GPU Overview » [Instruction]
-     * PIPELINE_SELECT [DevBWR+]":
-     *
diff --git a/PKGBUILD b/PKGBUILD
index e439d711ee33..bd0e27cfa76c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=mesa-git
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=23.0.0_devel.163975.a3249415e23.5269a95f00c4d6964d487d9dbd94f62b
+pkgver=23.0.0_devel.164934.b64afc1d37a.932463d268438ce945b21718552d92ab
 pkgrel=1
 arch=('x86_64')
 makedepends=('git' 'python-mako' 'xorgproto'
@@ -26,15 +26,12 @@ conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-laye
 url="https://www.mesa3d.org"
 license=('custom')
 source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main'
-        '0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch'
         '0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch'
         'LICENSE')
 md5sums=('SKIP'
-         '102af8525e4c1f266cc54b038d1b9314'
          '094f900983f68bec0325bd29d4789ad5'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 sha512sums=('SKIP'
-            '4ff7c359f08aedb1fb6eb2c6bb34bafa399edfa7916cd6cce7844bb38795e84c0265324e3fc7d37237d4824f029cb04da176bcf476785fd2e35a8b0ce4f8a394'
             '5dd0cb8affa9cfe6e7d94f59b8e23727036fd8ab76938321f8d266315f30611584da6f6277fe2aa920130483302adab5e57e2bc08f1bd3c62ea57b3e4b007305'
             '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')