diff --git a/mesa-32/.signature b/mesa-32/.signature index 033475f0..71804c73 100644 --- a/mesa-32/.signature +++ b/mesa-32/.signature @@ -1,10 +1,7 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXbIkKD9AApRlIyU528Vbw2w2QYRU7acTxR2OFvC1HW7TUWSSXfYrB2HJz+IsvPp4z8twDWJD931NWwXCWNFmDAM= -SHA256 (Pkgfile) = 5329dbb91d102511b6e42b3782f833846c9d5f095ffc16ab58502611626150fd +RWSwxGo/zH7eXdjCV4C1VwX3lELwbHTba7Z0xbQ4lAqIoAG9boA9iJNVwKtvbtv7b3cIv4BQWhU8qkMilTJ0gCXa/iK825iBFAo= +SHA256 (Pkgfile) = 8fd38f6627ae42a872ad765adb2fdb3aac154021243ec78d3858e534b57a98dd SHA256 (.footprint) = 8ce6513ba8b8d5d9e6945d7e6a0a24d670cf0485e11ba374e4d8bcc576fb2caa SHA256 (mesa-24.3.1.tar.xz) = 9c795900449ce5bc7c526ba0ab3532a22c3c951cab7e0dd9de5fcac41b0843af -SHA256 (0001-dri-don-t-fetch-X11-modifiers-if-we-don-t-support-th.patch) = 2c20fee505be9a1f08546b63457b8378b0f1fcff58e60c03378b7de0a87a1e81 -SHA256 (0002-egl-wayland-only-supply-LINEAR-modifier-when-support.patch) = a58e6d0631da6dd077530136bb44f0233cd279fc75e3b65b495ec90be16db91a -SHA256 (0003-egl-wayland-fallback-to-implicit-modifiers-if-advert.patch) = 606acb4073f46c7ca7edec96b6af06619642f3bbcd6afab2c57bff26266b917f SHA256 (x86-linux-gnu) = eb378917565b88d9b73fe01d5a55241955e3f5f437da6fe59349b48ea1d4ebc9 SHA256 (x86-linux-gnu-ccache) = c35b9505a9b4500b50a4425d90a393304bd532621e9233e056a7f3d98f622125 diff --git a/mesa-32/0001-dri-don-t-fetch-X11-modifiers-if-we-don-t-support-th.patch b/mesa-32/0001-dri-don-t-fetch-X11-modifiers-if-we-don-t-support-th.patch deleted file mode 100644 index a5800354..00000000 --- a/mesa-32/0001-dri-don-t-fetch-X11-modifiers-if-we-don-t-support-th.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Simon Ser -Date: Sat, 7 Dec 2024 13:10:04 +0100 -Subject: [PATCH] dri: don't fetch X11 modifiers if we don't support them - -If we supply modifiers to dri_create_image_with_modifiers() and -the driver doesn't support them, the function will fail. The X11 -server always supports implicit modifiers so we can always fall -back to that. - -Signed-off-by: Simon Ser -Fixes: 4c065158927d ("dri: revert INVALID modifier special-casing") ---- - src/gallium/frontends/dri/loader_dri3_helper.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/gallium/frontends/dri/loader_dri3_helper.c b/src/gallium/frontends/dri/loader_dri3_helper.c -index 268ec3d86c8a..e1f51619c5fa 100644 ---- a/src/gallium/frontends/dri/loader_dri3_helper.c -+++ b/src/gallium/frontends/dri/loader_dri3_helper.c -@@ -36,9 +36,11 @@ - - #include "loader_dri_helper.h" - #include "loader_dri3_helper.h" -+#include "pipe/p_screen.h" - #include "util/macros.h" - #include "util/simple_mtx.h" - #include "drm-uapi/drm_fourcc.h" -+#include "dri_screen.h" - #include "dri_util.h" - - /** -@@ -1401,7 +1403,7 @@ dri3_alloc_render_buffer(struct loader_dri3_drawable *draw, unsigned int fourcc, - - if (draw->dri_screen_render_gpu == draw->dri_screen_display_gpu) { - #ifdef HAVE_X11_DRM -- if (draw->multiplanes_available) { -+ if (draw->multiplanes_available && draw->dri_screen_render_gpu->base.screen->resource_create_with_modifiers) { - xcb_dri3_get_supported_modifiers_cookie_t mod_cookie; - xcb_dri3_get_supported_modifiers_reply_t *mod_reply; - xcb_generic_error_t *error = NULL; diff --git a/mesa-32/0002-egl-wayland-only-supply-LINEAR-modifier-when-support.patch b/mesa-32/0002-egl-wayland-only-supply-LINEAR-modifier-when-support.patch deleted file mode 100644 index 526c6347..00000000 --- a/mesa-32/0002-egl-wayland-only-supply-LINEAR-modifier-when-support.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Simon Ser -Date: Sat, 7 Dec 2024 13:12:40 +0100 -Subject: [PATCH] egl/wayland: only supply LINEAR modifier when supported - -If we supply modifiers to dri_create_image_with_modifiers() and -the driver doesn't support them, the function will fail. We pass -__DRI_IMAGE_USE_LINEAR anyways so stripping the modifier is fine. - -Signed-off-by: Simon Ser -Fixes: 4c065158927d ("dri: revert INVALID modifier special-casing") ---- - src/egl/drivers/dri2/platform_wayland.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c -index 513d2d0709b1..472665a36b0d 100644 ---- a/src/egl/drivers/dri2/platform_wayland.c -+++ b/src/egl/drivers/dri2/platform_wayland.c -@@ -45,11 +45,13 @@ - #include "util/u_vector.h" - #include "util/format/u_formats.h" - #include "main/glconfig.h" -+#include "pipe/p_screen.h" - #include "egl_dri2.h" - #include "eglglobals.h" - #include "kopper_interface.h" - #include "loader.h" - #include "loader_dri_helper.h" -+#include "dri_screen.h" - #include "dri_util.h" - #include - -@@ -1193,14 +1195,25 @@ get_back_bo(struct dri2_egl_surface *dri2_surf) - if (dri2_dpy->fd_render_gpu != dri2_dpy->fd_display_gpu && - dri2_surf->back->linear_copy == NULL) { - uint64_t linear_mod = DRM_FORMAT_MOD_LINEAR; -+ const uint64_t *render_modifiers = NULL, *display_modifiers = NULL; -+ unsigned int render_num_modifiers = 0, display_num_modifiers = 0; - struct dri_image *linear_copy_display_gpu_image = NULL; - -+ if (dri2_dpy->dri_screen_render_gpu->base.screen->resource_create_with_modifiers) { -+ render_modifiers = &linear_mod; -+ render_num_modifiers = 1; -+ } -+ if (dri2_dpy->dri_screen_display_gpu->base.screen->resource_create_with_modifiers) { -+ display_modifiers = &linear_mod; -+ display_num_modifiers = 1; -+ } -+ - if (dri2_dpy->dri_screen_display_gpu) { - linear_copy_display_gpu_image = dri_create_image_with_modifiers( - dri2_dpy->dri_screen_display_gpu, - dri2_surf->base.Width, dri2_surf->base.Height, - linear_pipe_format, use_flags | __DRI_IMAGE_USE_LINEAR, -- &linear_mod, 1, NULL); -+ display_modifiers, display_num_modifiers, NULL); - - if (linear_copy_display_gpu_image) { - int i, ret = 1; -@@ -1285,7 +1298,7 @@ get_back_bo(struct dri2_egl_surface *dri2_surf) - dri2_dpy->dri_screen_render_gpu, - dri2_surf->base.Width, dri2_surf->base.Height, - linear_pipe_format, use_flags | __DRI_IMAGE_USE_LINEAR, -- &linear_mod, 1, NULL); -+ render_modifiers, render_num_modifiers, NULL); - } - - if (dri2_surf->back->linear_copy == NULL) diff --git a/mesa-32/0003-egl-wayland-fallback-to-implicit-modifiers-if-advert.patch b/mesa-32/0003-egl-wayland-fallback-to-implicit-modifiers-if-advert.patch deleted file mode 100644 index 72a79081..00000000 --- a/mesa-32/0003-egl-wayland-fallback-to-implicit-modifiers-if-advert.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Simon Ser -Date: Sat, 7 Dec 2024 13:15:57 +0100 -Subject: [PATCH] egl/wayland: fallback to implicit modifiers if advertised by - compositor - -The Wayland protocol defines INVALID as a special marker indicating -that implicit modifiers are supported. If the driver doesn't support -explicit modifiers and the compositor advertises support for implicit -modifiers, fallback to these. - -This effectively restores logic removed in 4c065158927d, but only -for the specific case of Wayland instead of affecting all APIs. -(Wayland is one of the few APIs defining a special meaning for -INVALID.) - -Signed-off-by: Simon Ser -Fixes: 4c065158927d ("dri: revert INVALID modifier special-casing") ---- - src/egl/drivers/dri2/platform_wayland.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c -index 472665a36b0d..2406bc18b744 100644 ---- a/src/egl/drivers/dri2/platform_wayland.c -+++ b/src/egl/drivers/dri2/platform_wayland.c -@@ -1010,6 +1010,7 @@ create_dri_image(struct dri2_egl_surface *dri2_surf, - uint64_t *modifiers; - unsigned int num_modifiers; - struct u_vector *modifiers_present; -+ bool implicit_mod_supported; - - assert(visual_idx != -1); - -@@ -1049,6 +1050,25 @@ create_dri_image(struct dri2_egl_surface *dri2_surf, - num_modifiers = u_vector_length(modifiers_present); - } - -+ if (!dri2_dpy->dri_screen_render_gpu->base.screen->resource_create_with_modifiers) { -+ /* We don't support explicit modifiers, check if the compositor supports -+ * implicit modifiers. */ -+ implicit_mod_supported = false; -+ for (unsigned int i = 0; i < num_modifiers; i++) { -+ if (modifiers[i] == DRM_FORMAT_MOD_INVALID) { -+ implicit_mod_supported = true; -+ break; -+ } -+ } -+ -+ if (!implicit_mod_supported) { -+ return; -+ } -+ -+ num_modifiers = 0; -+ modifiers = NULL; -+ } -+ - /* For the purposes of this function, an INVALID modifier on - * its own means the modifiers aren't supported. */ - if (num_modifiers == 0 || diff --git a/mesa-32/Pkgfile b/mesa-32/Pkgfile index 4466db9d..68a7c7a5 100644 --- a/mesa-32/Pkgfile +++ b/mesa-32/Pkgfile @@ -8,9 +8,6 @@ name=mesa-32 version=24.3.1 release=2 source=(https://archive.mesa3d.org/mesa-$version.tar.xz - 0001-dri-don-t-fetch-X11-modifiers-if-we-don-t-support-th.patch - 0002-egl-wayland-only-supply-LINEAR-modifier-when-support.patch - 0003-egl-wayland-fallback-to-implicit-modifiers-if-advert.patch x86-linux-gnu x86-linux-gnu-ccache) build() { @@ -43,10 +40,6 @@ build() { printf '%s' "$version-$release" > mesa-$version/VERSION - patch -Np1 -d mesa-$version -i $SRC/0001-dri-don-t-fetch-X11-modifiers-if-we-don-t-support-th.patch - patch -Np1 -d mesa-$version -i $SRC/0002-egl-wayland-only-supply-LINEAR-modifier-when-support.patch - patch -Np1 -d mesa-$version -i $SRC/0003-egl-wayland-fallback-to-implicit-modifiers-if-advert.patch - meson setup mesa-$version build $PKGMK_MESA \ --cross-file=$SRC/$_cross_file \ --prefix=/usr \