Accepting request 448929 from home:mimi_vx:branches:X11:XOrg

- update to 13.0.3
+ dropped U_cso-don-t-release-sampler-states-that-are-bound.patch
* fdo#77662 Fail to render to different faces of depth-stencil cube map
* fdo#92234 [BDW] GPU hang in Shogun2
* fdo#98329 dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_depth16_depth_buffer
* fdo#99038 dEQP-EGL.functional.negative_api.create_pixmap_surface crashes
* many radeonsi and i965 bugfixes

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

Mesa.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jan  5 19:11:14 UTC 2017 - mimi.vx@gmail.com
+
+- update to 13.0.3
++ dropped U_cso-don-t-release-sampler-states-that-are-bound.patch
+* fdo#77662 Fail to render to different faces of depth-stencil cube map
+* fdo#92234 [BDW] GPU hang in Shogun2
+* fdo#98329 dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_depth16_depth_buffer
+* fdo#99038 dEQP-EGL.functional.negative_api.create_pixmap_surface crashes
+* many radeonsi and i965 bugfixes
+
 -------------------------------------------------------------------
 Thu Dec 15 07:39:30 UTC 2016 - dmueller@suse.com
 

Mesa.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package Mesa
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 13.0.2
+%define _version 13.0.3
 %define with_opencl 0
 %define with_vulkan 0
 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
@@ -49,7 +49,7 @@
 %endif
 
 Name:           Mesa
-Version:        13.0.2
+Version:        13.0.3
 Release:        0
 Summary:        System for rendering interactive 3-D graphics
 License:        MIT
@@ -74,8 +74,6 @@ Patch15:        u_mesa-8.0-llvmpipe-shmget.patch
 Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
 # never to be upstreamed
 Patch21:        n_Define-GLAPIVAR-separate-from-GLAPI.patch
-# Already upstream
-Patch22:        U_cso-don-t-release-sampler-states-that-are-bound.patch
 
 # Nouveau multithreading workarounds from https://github.com/imirkin/mesa/commits/locking
 Patch61:        N_01-WIP-nouveau-add-locking.patch
@@ -605,7 +603,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch13 -p1
 %patch18 -p1
 %patch21 -p1
-%patch22 -p1
 
 %if %{use_broken_nouveau_locking_patches}
 %patch61 -p1

U_cso-don-t-release-sampler-states-that-are-bound.patch

@@ -1,39 +0,0 @@
-From: Marek Olšák <marek.olsak@amd.com>
-Date: Fri Dec 2 15:39:25 2016 +0100
-Subject: [PATCH]cso: don't release sampler states that are bound
-Patch-mainline: 6dc96de303290e8d1fc294da478c4f370be98dea
-Git-repo: git://anongit.freedesktop.org/mesa/mesa
-Git-commit: 6dc96de303290e8d1fc294da478c4f370be98dea
-References: boo#1015012 fdo#93649
-Signed-off-by: Max Staudt <mstaudt@suse.de>
-
-This fixes random radeonsi GPU hangs in Batman Arkham: Origins (Wine) and
-probably many other games too.
-
-cso_cache deletes sampler states when the cache size is too big and doesn't
-check which sampler states are bound, causing use-after-free in drivers.
-Because of that, radeonsi uploaded garbage sampler states and the hardware
-went bananas. Other drivers may have experienced similar issues.
-
-Cc: 12.0 13.0 <mesa-stable@lists.freedesktop.org>
-Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
-Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
----
- src/gallium/auxiliary/cso_cache/cso_cache.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/gallium/auxiliary/cso_cache/cso_cache.c b/src/gallium/auxiliary/cso_cache/cso_cache.c
-index b240c93..1f3be4b 100644
---- a/src/gallium/auxiliary/cso_cache/cso_cache.c
-+++ b/src/gallium/auxiliary/cso_cache/cso_cache.c
-@@ -188,7 +188,9 @@ cso_insert_state(struct cso_cache *sc,
-                  void *state)
- {
-    struct cso_hash *hash = _cso_hash_for_type(sc, type);
--   sanitize_hash(sc, hash, type, sc->max_size);
-+
-+   if (type != CSO_SAMPLER)
-+      sanitize_hash(sc, hash, type, sc->max_size);
- 
-    return cso_hash_insert(hash, hash_key, state);
- }

mesa-13.0.2.tar.xz

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

mesa-13.0.3.tar.xz

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