- update to Mesa 20.0.4

* emergency release, which reverts a serious SPIR-V regression
    in the 20.0.3 release.
- supersedes U_Revert-spirv-Implement-OpCopyObject-and-OpCopyLogica.patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=941

Mesa-drivers.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr  3 15:25:42 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- update to Mesa 20.0.4
+  * emergency release, which reverts a serious SPIR-V regression
+    in the 20.0.3 release.
+- supersedes U_Revert-spirv-Implement-OpCopyObject-and-OpCopyLogica.patch
+
 -------------------------------------------------------------------
 Fri Apr  3 08:38:51 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 

Mesa-drivers.spec

@@ -42,7 +42,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 20.0.3
+%define _version 20.0.4
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -110,7 +110,7 @@
 %endif
 
 Name:           Mesa-drivers
-Version:        20.0.3
+Version:        20.0.4
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -126,7 +126,6 @@ Source6:        %{name}-rpmlintrc
 Source7:        Mesa.keyring
 Patch1:         n_opencl_dep_libclang.patch
 Patch2:         n_add-Mesa-headers-again.patch
-Patch3:         U_Revert-spirv-Implement-OpCopyObject-and-OpCopyLogica.patch
 # never to be upstreamed
 Patch54:        n_drirc-disable-rgb10-for-chromium-on-amd.patch
 Patch58:        u_dep_xcb.patch
@@ -745,7 +744,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %endif
 %endif
 %patch2 -p1
-%patch3 -p1
 %patch54 -p1
 %patch58 -p1
 

Mesa.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr  3 15:25:42 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- update to Mesa 20.0.4
+  * emergency release, which reverts a serious SPIR-V regression
+    in the 20.0.3 release.
+- supersedes U_Revert-spirv-Implement-OpCopyObject-and-OpCopyLogica.patch
+
 -------------------------------------------------------------------
 Fri Apr  3 08:38:51 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 

Mesa.spec

@@ -41,7 +41,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 20.0.3
+%define _version 20.0.4
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -109,7 +109,7 @@
 %endif
 
 Name:           Mesa
-Version:        20.0.3
+Version:        20.0.4
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -125,7 +125,6 @@ Source6:        %{name}-rpmlintrc
 Source7:        Mesa.keyring
 Patch1:         n_opencl_dep_libclang.patch
 Patch2:         n_add-Mesa-headers-again.patch
-Patch3:         U_Revert-spirv-Implement-OpCopyObject-and-OpCopyLogica.patch
 # never to be upstreamed
 Patch54:        n_drirc-disable-rgb10-for-chromium-on-amd.patch
 Patch58:        u_dep_xcb.patch
@@ -744,7 +743,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %endif
 %endif
 %patch2 -p1
-%patch3 -p1
 %patch54 -p1
 %patch58 -p1
 

U_Revert-spirv-Implement-OpCopyObject-and-OpCopyLogica.patch

@@ -1,52 +0,0 @@
-From 68f325b256d96dca923f6c7d84bc6faf43911245 Mon Sep 17 00:00:00 2001
-From: Jason Ekstrand <jason@jlekstrand.net>
-Date: Wed, 1 Apr 2020 12:40:34 -0500
-Subject: [PATCH] Revert "spirv: Implement OpCopyObject and OpCopyLogical as
- blind copies"
-
-This reverts commit 7a53e67816ed9baf7d825ed60ee59f0c05f9df48.
----
- src/compiler/spirv/spirv_to_nir.c | 26 +++-----------------------
- 1 file changed, 3 insertions(+), 23 deletions(-)
-
-diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
-index a60b1cba1bd..61abc727278 100644
---- a/src/compiler/spirv/spirv_to_nir.c
-+++ b/src/compiler/spirv/spirv_to_nir.c
-@@ -3553,30 +3553,10 @@ vtn_handle_composite(struct vtn_builder *b, SpvOp opcode,
-                                  w + 5, count - 5);
-       break;
- 
-+   case SpvOpCopyLogical:
-    case SpvOpCopyObject:
--   case SpvOpCopyLogical: {
--      struct vtn_value *src = vtn_untyped_value(b, w[3]);
--      struct vtn_value *dst = vtn_push_value(b, w[2], src->value_type);
--      if (opcode == SpvOpCopyObject) {
--         vtn_fail_if(dst->type->id != src->type->id,
--                     "Result Type of OpCopyObject must equal Operand type");
--      } else {
--         assert(opcode == SpvOpCopyLogical);
--         /* The logical type matching rules should guarantee we have exactly
--          * the same GLSL type which means that, if it's an SSA value, we
--          * don't actually need to clone it; we can just copy it blind.
--          */
--         vtn_fail_if(dst->type->type != src->type->type,
--                     "Result Type of OpCopyLogical must logically match "
--                     "the Operand type");
--      }
--      struct vtn_value src_copy = *src;
--      src_copy.name = dst->name;
--      src_copy.decoration = dst->decoration;
--      src_copy.type = dst->type;
--      *dst = src_copy;
--      return;
--   }
-+      ssa = vtn_composite_copy(b, vtn_ssa_value(b, w[3]));
-+      break;
- 
-    default:
-       vtn_fail_with_opcode("unknown composite operation", opcode);
--- 
-2.16.4
-

mesa-20.0.3.tar.xz

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

mesa-20.0.4.tar.xz

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