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

[Laurent Carlier]

    Date: Saturday, February 22, 2020 @ 16:36:18
  Author: lcarlier
Revision: 376045

upgpkg: mesa 20.0.0-2: Fix FS#65580

Added:
  mesa/trunk/0001-iris-handle-the-failure-of-converting-unsupported-yu.patch
Modified:
  mesa/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch |   54 ++++++++++
 PKGBUILD                                                        |   15 ++
 2 files changed, 66 insertions(+), 3 deletions(-)

Added: 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch
===================================================================
--- 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch	                        (rev 0)
+++ 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch	2020-02-22 16:36:18 UTC (rev 376045)
@@ -0,0 +1,54 @@
+From 4d3f535ebb341ddce05e5b1750fcf17c6c4166c9 Mon Sep 17 00:00:00 2001
+From: James Xiong <james.xiong at intel.com>
+Date: Wed, 20 Nov 2019 15:59:00 -0800
+Subject: [PATCH] iris: handle the failure of converting unsupported yuv
+ formats to isl
+
+Signed-off-by: James Xiong <james.xiong at intel.com>
+Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
+(cherry picked from commit d8569baaed1a38cf3da9e45375fa2267d9a1eeb0)
+
+Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3898>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3898>
+Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
+---
+ src/gallium/drivers/iris/iris_formats.c  | 6 +++++-
+ src/gallium/drivers/iris/iris_resource.c | 3 ++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/drivers/iris/iris_formats.c b/src/gallium/drivers/iris/iris_formats.c
+index f6344cc7543..a35b663a53c 100644
+--- a/src/gallium/drivers/iris/iris_formats.c
++++ b/src/gallium/drivers/iris/iris_formats.c
+@@ -338,9 +338,13 @@ iris_format_for_usage(const struct gen_device_info *devinfo,
+                       isl_surf_usage_flags_t usage)
+ {
+    enum isl_format format = iris_isl_format_for_pipe_format(pformat);
+-   const struct isl_format_layout *fmtl = isl_format_get_layout(format);
+    struct isl_swizzle swizzle = ISL_SWIZZLE_IDENTITY;
+ 
++   if (format == ISL_FORMAT_UNSUPPORTED)
++      return (struct iris_format_info) { .fmt = format, .swizzle = swizzle };
++
++   const struct isl_format_layout *fmtl = isl_format_get_layout(format);
++
+    if (!util_format_is_srgb(pformat)) {
+       if (util_format_is_intensity(pformat)) {
+          swizzle = ISL_SWIZZLE(RED, RED, RED, RED);
+diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
+index bdd715df2c9..7ca6097840a 100644
+--- a/src/gallium/drivers/iris/iris_resource.c
++++ b/src/gallium/drivers/iris/iris_resource.c
+@@ -85,7 +85,8 @@ modifier_is_supported(const struct gen_device_info *devinfo,
+ 
+       enum isl_format linear_format = isl_format_srgb_to_linear(rt_format);
+ 
+-      if (!isl_format_supports_ccs_e(devinfo, linear_format))
++      if (linear_format == ISL_FORMAT_UNSUPPORTED ||
++          !isl_format_supports_ccs_e(devinfo, linear_format))
+          return false;
+ 
+       return devinfo->gen >= 9 && devinfo->gen <= 11;
+-- 
+2.25.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-22 16:06:12 UTC (rev 376044)
+++ PKGBUILD	2020-02-22 16:36:18 UTC (rev 376045)
@@ -5,7 +5,7 @@
 pkgname=('vulkan-mesa-layer' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
 pkgver=20.0.0
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
              'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd'
@@ -14,10 +14,12 @@
 url="https://www.mesa3d.org/"
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-        LICENSE)
+        LICENSE
+	0001-iris-handle-the-failure-of-converting-unsupported-yu.patch)
 sha512sums=('3968820029434682fb6644947c76e12b6bb991a3d05cb519a6ea971ecc4aa9b21d03f84b9a452cc21cc77a7981db9e40dd2dfd3ea3dee85b3dd88a59b4842bbb'
             'SKIP'
-            'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
+            'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
+            'dc14204b32dfc9c04506b9ee1b0ed070c516fb60771b4330ab9f83efb02be0e206a34a1b01acda624c7c3984275b9d7ba6ea5c1f9ec4447a7cc561cc5abdf759')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov at gmail.com>
               '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty at igalia.com>
               'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>
@@ -24,6 +26,13 @@
               'A5CC9FEC93F2F837CB044912336909B6B25FADFA'  # Juan A. Suarez Romero <jasuarez at igalia.com>
               '71C4B75620BC75708B4BDB254C95FAAB3EB073EC') # Dylan Baker <dylan at pnwbakers.com>
 
+prepare() {
+  cd mesa-$pkgver
+
+  # FS#65580 - merged upstream
+  patch -Np1 -i ../0001-iris-handle-the-failure-of-converting-unsupported-yu.patch
+}
+
 build() {
   arch-meson mesa-$pkgver build \
     -D b_lto=false \