Accepting request 1237561 from X11:XOrg

OBS-URL: https://build.opensuse.org/request/show/1237561
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=528

0001-dri-don-t-fetch-X11-modifiers-if-we-don-t-support-th.patch

@@ -1,44 +0,0 @@
-From 35852799aef8efdb4516c51913f86cd7d795a8d7 Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Sat, 7 Dec 2024 13:10:04 +0100
-Subject: [PATCH 1/3] 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 <contact@emersion.fr>
-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 268ec3d86c8..e1f51619c5f 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;
--- 
-2.43.0
-

0001-dril-Fixup-order-of-pixel-formats-in-drilConfigs.patch

@@ -1,82 +0,0 @@
-From 917e7e7df07b4523f1160e2a32d5e3ece3d74287 Mon Sep 17 00:00:00 2001
-From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-Date: Mon, 4 Nov 2024 17:45:45 +1100
-Subject: [PATCH] dril: Fixup order of pixel formats in drilConfigs
-
-Having the RGB* formats before the BGR* formats in the table causes
-problems where under some circumstances, some applications end up
-with the wrong colors.
-
-The repro case for me is: Xvnc + mutter + chromium
-
-There was an existing comment in dri_fill_in_modes() which explained
-the problem. This was lost when dril_target.c was created.
-
-Fixes: ec7afd2c24c ("dril: rework config creation")
-Fixes: 3de62b2f9a6 ("gallium/dril: Compatibility stub for the legacy DRI loader interface")
-
-Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
----
- src/gallium/targets/dril/dril_target.c | 36 +++++++++++++++++++-------
- 1 file changed, 27 insertions(+), 9 deletions(-)
-
-diff --git a/src/gallium/targets/dril/dril_target.c b/src/gallium/targets/dril/dril_target.c
-index 672d50a4182..583728e4093 100644
---- a/src/gallium/targets/dril/dril_target.c
-+++ b/src/gallium/targets/dril/dril_target.c
-@@ -47,25 +47,43 @@
-    CONFIG_ZS(color, PIPE_FORMAT_Z16_UNORM), \
-    CONFIG_ZS(color, PIPE_FORMAT_NONE) \
- 
-+/*
-+ * (copy of a comment in dri_screen.c:dri_fill_in_modes())
-+ *
-+ * The 32-bit RGBA format must not precede the 32-bit BGRA format.
-+ * Likewise for RGBX and BGRX.  Otherwise, the GLX client and the GLX
-+ * server may disagree on which format the GLXFBConfig represents,
-+ * resulting in swapped color channels.
-+ *
-+ * The problem, as of 2017-05-30:
-+ * When matching a GLXFBConfig to a __DRIconfig, GLX ignores the channel
-+ * order and chooses the first __DRIconfig with the expected channel
-+ * sizes. Specifically, GLX compares the GLXFBConfig's and __DRIconfig's
-+ * __DRI_ATTRIB_{CHANNEL}_SIZE but ignores __DRI_ATTRIB_{CHANNEL}_MASK.
-+ *
-+ * EGL does not suffer from this problem. It correctly compares the
-+ * channel masks when matching EGLConfig to __DRIconfig.
-+ */
-+
- static const struct gl_config drilConfigs[] = {
--   CONFIG(PIPE_FORMAT_R8G8B8A8_UNORM),
--   CONFIG(PIPE_FORMAT_R8G8B8X8_UNORM),
-    CONFIG(PIPE_FORMAT_B8G8R8A8_UNORM),
-    CONFIG(PIPE_FORMAT_B8G8R8X8_UNORM),
--   CONFIG(PIPE_FORMAT_R10G10B10A2_UNORM),
--   CONFIG(PIPE_FORMAT_R10G10B10X2_UNORM),
-+   CONFIG(PIPE_FORMAT_R8G8B8A8_UNORM),
-+   CONFIG(PIPE_FORMAT_R8G8B8X8_UNORM),
-    CONFIG(PIPE_FORMAT_B10G10R10A2_UNORM),
-    CONFIG(PIPE_FORMAT_B10G10R10X2_UNORM),
--   CONFIG(PIPE_FORMAT_R5G6B5_UNORM),
--   CONFIG(PIPE_FORMAT_R5G5B5A1_UNORM),
--   CONFIG(PIPE_FORMAT_R5G5B5X1_UNORM),
--   CONFIG(PIPE_FORMAT_R4G4B4A4_UNORM),
--   CONFIG(PIPE_FORMAT_R4G4B4X4_UNORM),
-+   CONFIG(PIPE_FORMAT_R10G10B10A2_UNORM),
-+   CONFIG(PIPE_FORMAT_R10G10B10X2_UNORM),
-    CONFIG(PIPE_FORMAT_B5G6R5_UNORM),
-    CONFIG(PIPE_FORMAT_B5G5R5A1_UNORM),
-    CONFIG(PIPE_FORMAT_B5G5R5X1_UNORM),
-    CONFIG(PIPE_FORMAT_B4G4R4A4_UNORM),
-    CONFIG(PIPE_FORMAT_B4G4R4X4_UNORM),
-+   CONFIG(PIPE_FORMAT_R5G6B5_UNORM),
-+   CONFIG(PIPE_FORMAT_R5G5B5A1_UNORM),
-+   CONFIG(PIPE_FORMAT_R5G5B5X1_UNORM),
-+   CONFIG(PIPE_FORMAT_R4G4B4A4_UNORM),
-+   CONFIG(PIPE_FORMAT_R4G4B4X4_UNORM),
- };
- 
- #define RGB UTIL_FORMAT_COLORSPACE_RGB
--- 
-2.43.0
-

0002-egl-wayland-only-supply-LINEAR-modifier-when-support.patch

@@ -1,72 +0,0 @@
-From 3c78ff12864e87d5a293cea55ebd1ae9ca3e6df0 Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Sat, 7 Dec 2024 13:12:40 +0100
-Subject: [PATCH 2/3] 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 <contact@emersion.fr>
-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 513d2d0709b..472665a36b0 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 <loader_wayland_helper.h>
- 
-@@ -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)
--- 
-2.43.0
-

0003-egl-wayland-fallback-to-implicit-modifiers-if-advert.patch

@@ -1,63 +0,0 @@
-From bf278ee26628898b674d86d39198babe0174f8bf Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Sat, 7 Dec 2024 13:15:57 +0100
-Subject: [PATCH 3/3] 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 <contact@emersion.fr>
-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 472665a36b0..2406bc18b74 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 ||
--- 
-2.43.0
-

U_egl-x11-sw-fix-partial-image-uploads.patch

@@ -1,52 +0,0 @@
-From 5903c215ab5b4c5d3bb1c952c0c784b78a0412fc Mon Sep 17 00:00:00 2001
-From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
-Date: Tue, 13 Feb 2024 13:10:30 -0500
-Subject: [PATCH] egl/x11/sw: fix partial image uploads
-
-* swrast allocates images aligned to 64x64 tiles, which results in images
-  that are larger than the window. PutImage requests must be clamped on
-  the y-axis to avoid uploading/damaging out-of-bounds regions
-* winsys coords are y-inverted
-
-cc: mesa-stable
-
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29910>
-(cherry picked from commit 6088a0bf51dd6bdfe39d9160a748bdde016f2c96)
----
- .pick_status.json                   | 2 +-
- src/egl/drivers/dri2/platform_x11.c | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/.pick_status.json b/.pick_status.json
-index cc044e5e788..802f9799d23 100644
---- a/.pick_status.json
-+++ b/.pick_status.json
-@@ -164,7 +164,7 @@
-         "description": "egl/x11/sw: fix partial image uploads",
-         "nominated": true,
-         "nomination_type": 0,
--        "resolution": 0,
-+        "resolution": 1,
-         "main_sha": null,
-         "because_sha": null,
-         "notes": null
-diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
-index 97436a0254b..e0d9ddb343e 100644
---- a/src/egl/drivers/dri2/platform_x11.c
-+++ b/src/egl/drivers/dri2/platform_x11.c
-@@ -174,6 +174,11 @@ swrastPutImage(__DRIdrawable *draw, int op, int x, int y, int w, int h,
-       return;
-    }
- 
-+   /* clamp to drawable size */
-+   if (y + h > dri2_surf->base.Height)
-+      h = dri2_surf->base.Height - y;
-+   /* y-invert */
-+   y = dri2_surf->base.Height - y - h;
-    if (size < max_req_len) {
-       cookie = xcb_put_image(
-          dri2_dpy->conn, XCB_IMAGE_FORMAT_Z_PIXMAP, dri2_surf->drawable, gc, w,
--- 
-2.43.0
-

U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch

@@ -1,31 +0,0 @@
-From 8b35da91b23afc65256b78a59d116fd09544cd28 Mon Sep 17 00:00:00 2001
-From: David Rosca <david.rosca@amd.com>
-Date: Mon, 5 Aug 2024 09:14:37 +0200
-Subject: [PATCH] radeonsi/vcn: Add decode DPB buffers as CS dependency
-
-This is needed to ensure correct synchronization in kernel eg. when it
-moves the buffers between VRAM and GTT.
-
-Reviewed-by: Boyuan Zhang <Boyuan.Zhang@amd.com>
-(cherry picked from commit 0c024bbe641b092bbbc751baae54a37642794de0)
-
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30537>
----
- src/gallium/drivers/radeonsi/radeon_vcn_dec.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
-index ede5f9d7c1a5..9e3d0b88493b 100644
---- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
-+++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
-@@ -1838,6 +1838,7 @@ static unsigned rvcn_dec_dynamic_dpb_t2_message(struct radeon_decoder *dec, rvcn
-                RVID_ERR("Ref list from application is incorrect, using dummy buffer instead.\n");
-                addr = dec->ws->buffer_get_virtual_address(dummy->dpb.res->buf);
-             }
-+            dec->ws->cs_add_buffer(&dec->cs, d->dpb.res->buf, RADEON_USAGE_READWRITE | RADEON_USAGE_SYNCHRONIZED, RADEON_DOMAIN_VRAM);
-             dynamic_dpb_t2->dpbAddrLo[i] = addr;
-             dynamic_dpb_t2->dpbAddrHi[i] = addr >> 32;
-             ++dynamic_dpb_t2->dpbArraySize;
--- 
-2.43.0
-

mesa-24.1.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63236426b25a745ba6aa2d6daf8cd769d5ea01887b0745ab7124d2ef33a9020d
-size 29086488

mesa-24.1.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7cf7c6f665263ad0122889c1d4b076654c1eedea7a2f38c69c8c51579937ade1
-size 29106920

mesa-24.2.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b68c4a6f204c1999815a457299f81c41ba7bf48c4674b0b2d1d8864f41f3709
-size 29568568

mesa-24.2.7.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0ce37228679647268a83b3652d859dcf23d6f6430d751489d4464f6de6459fd
-size 29589968

mesa-24.3.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97813fe65028ef21b4d4e54164563059e8408d8fee3489a2323468d198bf2efc
-size 30566304

mesa-24.3.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c795900449ce5bc7c526ba0ab3532a22c3c951cab7e0dd9de5fcac41b0843af
-size 30611028

proc-macro2-1.0.70.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b
-size 44343

syn-2.0.39.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a
-size 244129