[PR PATCH] mesa: update to version 23.3.0.

[SpidFightFR <SpidFightFR@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 718 bytes --]

There is a new pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-mesa
https://github.com/void-linux/void-packages/pull/47494

mesa: update to version 23.3.0.
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


Hey lads, a PR to update mesa to version 23.3.0, i hope it will be less of a mess for raytracing than 23.2.1 tho...!
It'll be a draft for now, as i'm testing this out, once that's done, i'll go public.

A patch file from https://github.com/void-linux/void-packages/pull/47494.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-mesa-47494.patch --]
[-- Type: text/x-diff, Size: 7350 bytes --]

From 3948090d952f5751716763dca1961c21863e46ac Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Thu, 30 Nov 2023 00:05:27 +0100
Subject: [PATCH] mesa: update to version 23.3.0.

---
 ...ch64-force-persistent-buffers-to-GTT.patch | 39 ----------
 ...bce3e249a34665b2c42b20bfdbdc7f32147f.patch | 76 ++-----------------
 srcpkgs/mesa/template                         |  6 +-
 3 files changed, 10 insertions(+), 111 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch

diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
deleted file mode 100644
index 0890a795306b0..0000000000000
--- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gist.github.com/jnettlet/4dd6e43bcd5a551df29b12d3212e6edd
-
-From d72aa8ae74ffb7329003f9f23ffa05833af951ab Mon Sep 17 00:00:00 2001
-From: Jon Nettleton <jon@solid-run.com>
-Date: Fri, 14 Aug 2020 13:36:08 +0200
-Subject: [PATCH] radeonsi: On Aarch64 force persistent buffers to GTT
-
-This fixes a glamore corruption issue on the HoneyComb and by
-internet reports should also fix problems seen on Huaweii
-Kunpeng hardware.
-
-The root cause of the corruption needs to be worked out, but
-this patch also adds a noticable performance improvement. The
-aquarium webgl demo under chromium increases from 39-49 FPS
-when 5000 fish being rendered is selected.  Glmark scores also
-improve by ~200 with no specific tests showing any regression.
-
-Signed-off-by: Jon Nettleton <jon@solid-run.com>
----
- src/gallium/drivers/radeonsi/si_buffer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
-index 6b58aebee2d..c9e983367a0 100644
---- a/src/gallium/drivers/radeonsi/si_buffer.c
-+++ b/src/gallium/drivers/radeonsi/si_buffer.c
-@@ -91,6 +91,10 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
-        */
-       if (!sscreen->info.is_amdgpu)
-          res->domains = RADEON_DOMAIN_GTT;
-+
-+#if defined(PIPE_ARCH_AARCH64)
-+      res->domains = RADEON_DOMAIN_GTT;
-+#endif
-    }
- 
-    /* Tiled textures are unmappable. Always put them in VRAM. */
--- 
-2.26.2
diff --git a/srcpkgs/mesa/patches/9590bce3e249a34665b2c42b20bfdbdc7f32147f.patch b/srcpkgs/mesa/patches/9590bce3e249a34665b2c42b20bfdbdc7f32147f.patch
index debefd3999d32..63ecaecd16e9d 100644
--- a/srcpkgs/mesa/patches/9590bce3e249a34665b2c42b20bfdbdc7f32147f.patch
+++ b/srcpkgs/mesa/patches/9590bce3e249a34665b2c42b20bfdbdc7f32147f.patch
@@ -1,75 +1,13 @@
-From 9590bce3e249a34665b2c42b20bfdbdc7f32147f Mon Sep 17 00:00:00 2001
-From: WinLinux1028 <reimu@hakurei.win>
-Date: Tue, 11 Jul 2023 18:16:01 +0900
-Subject: [PATCH] radeonsi: prefix function with si_ to prevent name collision
-
-Fixed a build error caused by multiple gfx11_init_query symbols when building with iris and radeonsi specified in gallium-drivers.
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9238
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24045>
----
- src/gallium/drivers/radeonsi/gfx11_query.c | 4 ++--
- src/gallium/drivers/radeonsi/si_pipe.c     | 4 ++--
- src/gallium/drivers/radeonsi/si_pipe.h     | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
 diff --git a/src/gallium/drivers/radeonsi/gfx11_query.c b/src/gallium/drivers/radeonsi/gfx11_query.c
-index bfcd8e2511050..2a331cc3bda25 100644
+index 792afdc..0c94ae0 100644
 --- a/src/gallium/drivers/radeonsi/gfx11_query.c
 +++ b/src/gallium/drivers/radeonsi/gfx11_query.c
-@@ -422,13 +422,13 @@ struct pipe_query *gfx11_sh_query_create(struct si_screen *screen, enum pipe_que
-    return (struct pipe_query *)query;
+@@ -21,7 +21,7 @@ static void emit_shader_query(struct si_context *sctx, unsigned index)
+    qbuf->head += sizeof(struct gfx11_sh_query_buffer_mem);
  }
  
--void gfx11_init_query(struct si_context *sctx)
-+void si_gfx11_init_query(struct si_context *sctx)
+-static void gfx11_release_query_buffers(struct si_context *sctx,
++static void si_gfx11_init_query(struct si_context *sctx,
+                                         struct gfx11_sh_query_buffer *first,
+                                         struct gfx11_sh_query_buffer *last)
  {
-    list_inithead(&sctx->shader_query_buffers);
-    sctx->atoms.s.shader_query.emit = emit_shader_query;
- }
- 
--void gfx11_destroy_query(struct si_context *sctx)
-+void si_gfx11_destroy_query(struct si_context *sctx)
- {
-    if (!sctx->shader_query_buffers.next)
-       return;
-diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
-index fb5c02c473b96..2b4fceb89b198 100644
---- a/src/gallium/drivers/radeonsi/si_pipe.c
-+++ b/src/gallium/drivers/radeonsi/si_pipe.c
-@@ -192,7 +192,7 @@ static void si_destroy_context(struct pipe_context *context)
-    si_release_all_descriptors(sctx);
- 
-    if (sctx->gfx_level >= GFX10 && sctx->has_graphics)
--      gfx11_destroy_query(sctx);
-+      si_gfx11_destroy_query(sctx);
- 
-    if (sctx->sqtt) {
-       struct si_screen *sscreen = sctx->screen;
-@@ -637,7 +637,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign
-    /* Initialize graphics-only context functions. */
-    if (sctx->has_graphics) {
-       if (sctx->gfx_level >= GFX10)
--         gfx11_init_query(sctx);
-+         si_gfx11_init_query(sctx);
-       si_init_msaa_functions(sctx);
-       si_init_shader_functions(sctx);
-       si_init_state_functions(sctx);
-diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
-index 55f1d1788f1a1..389716854f9a6 100644
---- a/src/gallium/drivers/radeonsi/si_pipe.h
-+++ b/src/gallium/drivers/radeonsi/si_pipe.h
-@@ -1616,8 +1616,8 @@ void *si_create_query_result_cs(struct si_context *sctx);
- void *gfx11_create_sh_query_result_cs(struct si_context *sctx);
- 
- /* gfx11_query.c */
--void gfx11_init_query(struct si_context *sctx);
--void gfx11_destroy_query(struct si_context *sctx);
-+void si_gfx11_init_query(struct si_context *sctx);
-+void si_gfx11_destroy_query(struct si_context *sctx);
- 
- /* si_test_image_copy_region.c */
- void si_test_image_copy_region(struct si_screen *sscreen);
--- 
-GitLab
-
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index f36ebe5938041..ae9f8420a489e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=23.2.1
-revision=2
+version=23.3.0
+revision=1
 build_style=meson
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc
+checksum=50f729dd60ed6335b989095baad81ef5edf7cfdd4b4b48b9b955917cb07d69c5
 
 build_options="wayland"
 build_options_default="wayland"