[arch-commits] Commit in mesa/trunk (5 files)

2020-05-15 Thread Laurent Carlier via arch-commits 
Date: Friday, May 15, 2020 @ 16:50:34
  Author: lcarlier
Revision: 383701

upgpkg: mesa 20.0.7-1: upstream update 20.0.7

Added:
  mesa/trunk/0001-omx-fix-build-with-gcc-10.patch
  mesa/trunk/0001-swr-Fix-build-with-GCC-10.patch
Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-egl-allow-INVALID-format-for-linux_dmabuf.patch
  mesa/trunk/0002-egl-wayland-Fix-zwp_linux_dmabuf-usage.patch

--+
 0001-egl-allow-INVALID-format-for-linux_dmabuf.patch |   84 -
 0001-omx-fix-build-with-gcc-10.patch |   40 
 0001-swr-Fix-build-with-GCC-10.patch |   56 +++
 0002-egl-wayland-Fix-zwp_linux_dmabuf-usage.patch|   71 --
 PKGBUILD |   21 ++--
 5 files changed, 106 insertions(+), 166 deletions(-)

Deleted: 0001-egl-allow-INVALID-format-for-linux_dmabuf.patch
===
--- 0001-egl-allow-INVALID-format-for-linux_dmabuf.patch2020-05-15 
16:26:32 UTC (rev 383700)
+++ 0001-egl-allow-INVALID-format-for-linux_dmabuf.patch2020-05-15 
16:50:34 UTC (rev 383701)
@@ -1,84 +0,0 @@
-From c71ea55be7c1dbb58d56df9c6cfa69718fdf5d6a Mon Sep 17 00:00:00 2001
-From: Ivan Molodetskikh 
-Date: Fri, 27 Sep 2019 00:45:39 +0300
-Subject: [PATCH 1/2] egl: allow INVALID format for linux_dmabuf
-
-As per
-https://gitlab.freedesktop.org/wayland/wayland-protocols/commit/fb9b2a87317c77e26283da5f6c9559d709f6fdcd,
-the compositor may advertise DRM_FORMAT_MOD_INVALID as a supported
-modifier. This patch makes mesa recognize this fact and allow
-linux_dmabuf usage with the INVALID modifier in this case.
-
-In case the driver doesn't support modifiers, we can still use
-linux-dmabuf protocol instead of the legacy wl_drm interface to create
-wl_buffers. This will help compositors to handle these buffers better.
-
-In this commit, the INVALID modifier is allowed to be added to the list
-of supported modifiers, and create_wl_buffer will be able to use
-linux_dmabuf with an INVALID modifier if the compositor advertised it as
-supported.
-
-Signed-off-by: Ivan Molodetskikh 
-Tested-by: Marge Bot 

-Part-of: 

- src/egl/drivers/dri2/platform_wayland.c | 29 -
- 1 file changed, 24 insertions(+), 5 deletions(-)
-
-diff --git a/src/egl/drivers/dri2/platform_wayland.c 
b/src/egl/drivers/dri2/platform_wayland.c
-index 71bcb04a77b..324ac2357da 100644
 a/src/egl/drivers/dri2/platform_wayland.c
-+++ b/src/egl/drivers/dri2/platform_wayland.c
-@@ -522,6 +522,13 @@ get_back_bo(struct dri2_egl_surface *dri2_surf)
-modifiers = u_vector_tail(_dpy->wl_modifiers[visual_idx]);
-num_modifiers = u_vector_length(_dpy->wl_modifiers[visual_idx]);
- 
-+   if (num_modifiers == 1 && modifiers[0] == DRM_FORMAT_MOD_INVALID) {
-+  /* For the purposes of this function, an INVALID modifier on its own
-+   * means the modifiers aren't supported.
-+   */
-+  num_modifiers = 0;
-+   }
-+
-/* Substitute dri image format if server does not support original format 
*/
-if (!BITSET_TEST(dri2_dpy->formats, visual_idx))
-   linear_dri_image_format = 
dri2_wl_visuals[visual_idx].alt_dri_image_format;
-@@ -917,7 +924,23 @@ create_wl_buffer(struct dri2_egl_display *dri2_dpy,
-   }
-}
- 
--   if (dri2_dpy->wl_dmabuf && modifier != DRM_FORMAT_MOD_INVALID) {
-+   bool supported_modifier = false;
-+   if (modifier != DRM_FORMAT_MOD_INVALID) {
-+  supported_modifier = true;
-+   } else {
-+  int visual_idx = dri2_wl_visual_idx_from_fourcc(fourcc);
-+  assert(visual_idx != -1);
-+
-+  uint64_t *mod;
-+  u_vector_foreach(mod, _dpy->wl_modifiers[visual_idx]) {
-+ if (*mod == DRM_FORMAT_MOD_INVALID) {
-+supported_modifier = true;
-+break;
-+ }
-+  }
-+   }
-+
-+   if (dri2_dpy->wl_dmabuf && supported_modifier) {
-   struct zwp_linux_buffer_params_v1 *params;
-   int i;
- 
-@@ -1290,10 +1313,6 @@ dmabuf_handle_modifier(void *data, struct 
zwp_linux_dmabuf_v1 *dmabuf,
-if (visual_idx == -1)
-   return;
- 
--   if (modifier_hi == (DRM_FORMAT_MOD_INVALID >> 32) &&
--   modifier_lo == (DRM_FORMAT_MOD_INVALID & 0x))
--  return;
--
-BITSET_SET(dri2_dpy->formats, visual_idx);
- 
-mod = u_vector_add(_dpy->wl_modifiers[visual_idx]);
--- 
-2.26.2
-

Added: 0001-omx-fix-build-with-gcc-10.patch
===
--- 0001-omx-fix-build-with-gcc-10.patch(rev 0)
+++ 0001-omx-fix-build-with-gcc-10.patch2020-05-15 16:50:34 UTC (rev 
383701)
@@ -0,0 +1,40 @@
+From 283e815339a15fa99039c69f1e225269790ae955 Mon Sep 17 00:00:00 2001
+From: Pierre-Eric Pelloux-Prayer 
+Date: Thu, 5 Mar

[arch-commits] Commit in mesa/trunk (5 files)

2016-09-05 Thread Laurent Carlier 
Date: Monday, September 5, 2016 @ 18:46:44
  Author: lcarlier
Revision: 275777

upgpkg: mesa 12.0.2-1

upstream update 12.0.2

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch
  mesa/trunk/0001-i965-import-prime-buffers-in-the-current-context-not.patch
  mesa/trunk/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch
  mesa/trunk/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch

-+
 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch|   17 --
 0001-i965-import-prime-buffers-in-the-current-context-not.patch |   66 
 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch   |   76 
--
 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch  |   38 -
 PKGBUILD|   27 ---
 5 files changed, 5 insertions(+), 219 deletions(-)

Deleted: 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch
===
--- 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch2016-09-05 17:45:40 UTC 
(rev 275776)
+++ 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch2016-09-05 18:46:44 UTC 
(rev 275777)
@@ -1,17 +0,0 @@
-diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp 
b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
-index 7564119..38e2c4a 100644
 a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
-+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
-@@ -6058,7 +6058,11 @@ st_translate_program(
-   inputSemanticName[i], inputSemanticIndex[i],
-   interpMode[i], 0, interpLocation[i],
-   array_id, array_size);
--i += array_size - 1;
-+
-+GLuint base_attr = inputSlotToAttr[i];
-+while (i + 1 < numInputs &&
-+   inputSlotToAttr[i + 1] < base_attr + array_size)
-+   ++i;
-  }
-  else {
- t->inputs[i] = ureg_DECL_fs_input_cyl_centroid(ureg,

Deleted: 0001-i965-import-prime-buffers-in-the-current-context-not.patch
===
--- 0001-i965-import-prime-buffers-in-the-current-context-not.patch 
2016-09-05 17:45:40 UTC (rev 275776)
+++ 0001-i965-import-prime-buffers-in-the-current-context-not.patch 
2016-09-05 18:46:44 UTC (rev 275777)
@@ -1,66 +0,0 @@
-From e180e9e3c830d3611a6cf7d32e988b4c28d20942 Mon Sep 17 00:00:00 2001
-From: Martin Peres 
-Date: Wed, 3 Aug 2016 12:58:23 +0300
-Subject: [PATCH] i965: import prime buffers in the current context, not screen
-
-This mirrors the codepath taken by DRI2 in IntelSetTexBuffer2() and
-fixes many applications when using DRI3:
- - Totem with libva on hw-accelerated decoding
- - obs-studio, using Window Capture (Xcomposite) as a Source
- - gstreamer with VAAPI
-
-Cc: mesa-sta...@lists.freedesktop.org
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759
-Signed-off-by: Martin Peres 

- src/mesa/drivers/dri/i965/intel_screen.c | 25 +++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/src/mesa/drivers/dri/i965/intel_screen.c 
b/src/mesa/drivers/dri/i965/intel_screen.c
-index ae51c40..169d578 100644
 a/src/mesa/drivers/dri/i965/intel_screen.c
-+++ b/src/mesa/drivers/dri/i965/intel_screen.c
-@@ -702,8 +702,11 @@ intel_create_image_from_fds(__DRIscreen *screen,
- int *fds, int num_fds, int *strides, int *offsets,
- void *loaderPrivate)
- {
-+   GET_CURRENT_CONTEXT(ctx);
-struct intel_screen *intelScreen = screen->driverPrivate;
-+   struct brw_context *brw = brw_context(ctx);
-struct intel_image_format *f;
-+   dri_bufmgr *bufmgr;
-__DRIimage *image;
-int i, index;
- 
-@@ -744,8 +747,26 @@ intel_create_image_from_fds(__DRIscreen *screen,
-  size = end;
-}
- 
--   image->bo = drm_intel_bo_gem_create_from_prime(intelScreen->bufmgr,
--  fds[0], size);
-+   /* Let's import the buffer into the current context instead of the current
-+* screen as some applications like gstreamer, totem, or obs create 
multiple
-+* X connections which end up creating multiple screens and thus multiple
-+* buffer managers. They then proceed to use a different X connection than
-+* the one used by the currently-bound context to call GLXBindTexImageExt()
-+* which should then import the buffer in the current bound context and not
-+* the current screen. This is done properly upstairs for texture 
management
-+* so we need to mirror this behaviour if we don't want the kernel 
rejecting
-+* our pushbuffers as the buffer would not have been imported by the same
-+* buffer manager that sent the pushbuffer referencing it.
-+*
-+*