From bf7f23de09259b20be3dbb974d09b6b745614573c8f827636bf704d7577d2e11 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 18 Sep 2017 14:53:14 +0000 Subject: [PATCH] Accepting request 526977 from home:mimi_vx:branches:X11:XOrg - update to 17.2.1 * drop upstreamed patches n_force-xlocale-funcs.patch u_gallivm-correct-channel-shift-logic-on-big-endian.patch u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch * fdo#100613 - Regression in Mesa 17 on s390x (zSystems) * fdo#101709 - [llvmpipe] piglit gl-1.0-scissor-offscreen regression * fdo#102454 - glibc 2.26 doesn't provide anymore xlocale.h * fdo#102467 - [src/mesa/state_tracker/st_cb_readpixels.c:178]: (warning) Redundant assignment * fdo#102502 - [bisected] Kodi crashes since commit 707d2e8b - gallium: fold u_trim_pipe_prim call from st/mesa to drivers * many fixes for RADV a glsl OBS-URL: https://build.opensuse.org/request/show/526977 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=647 --- Mesa.changes | 17 ++++ Mesa.spec | 11 +-- mesa-17.2.0.tar.xz | 3 - mesa-17.2.0.tar.xz.sig | Bin 566 -> 0 bytes mesa-17.2.1.tar.xz | 3 + mesa-17.2.1.tar.xz.sig | Bin 0 -> 566 bytes n_force-xlocale-funcs.patch | 27 ------- ...ct-channel-shift-logic-on-big-endian.patch | 42 ---------- ...d_gather_elem_vec-BE-fix-for-3x16-lo.patch | 76 ------------------ 9 files changed, 22 insertions(+), 157 deletions(-) delete mode 100644 mesa-17.2.0.tar.xz delete mode 100644 mesa-17.2.0.tar.xz.sig create mode 100644 mesa-17.2.1.tar.xz create mode 100644 mesa-17.2.1.tar.xz.sig delete mode 100644 n_force-xlocale-funcs.patch delete mode 100644 u_gallivm-correct-channel-shift-logic-on-big-endian.patch delete mode 100644 u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch diff --git a/Mesa.changes b/Mesa.changes index d574e9e..1e8df7c 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Sep 18 08:38:41 UTC 2017 - mimi.vx@gmail.com + +- update to 17.2.1 + * drop upstreamed patches + n_force-xlocale-funcs.patch + u_gallivm-correct-channel-shift-logic-on-big-endian.patch + u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch + * fdo#100613 - Regression in Mesa 17 on s390x (zSystems) + * fdo#101709 - [llvmpipe] piglit gl-1.0-scissor-offscreen regression + * fdo#102454 - glibc 2.26 doesn't provide anymore xlocale.h + * fdo#102467 - [src/mesa/state_tracker/st_cb_readpixels.c:178]: (warning) + Redundant assignment + * fdo#102502 - [bisected] Kodi crashes since commit 707d2e8b - gallium: + fold u_trim_pipe_prim call from st/mesa to drivers + * many fixes for RADV a glsl + ------------------------------------------------------------------- Thu Sep 7 10:16:43 UTC 2017 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 166d27c..ab3c805 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -22,7 +22,7 @@ %endif %define glamor 1 %define _name_archive mesa -%define _version 17.2.0 +%define _version 17.2.1 %define with_opencl 0 %define with_vulkan 0 %ifarch %ix86 x86_64 %arm aarch64 ppc ppc64 ppc64le s390x @@ -54,7 +54,7 @@ %endif Name: Mesa -Version: 17.2.0 +Version: 17.2.1 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT @@ -81,13 +81,9 @@ 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 -# never to be upstreamed -Patch22: n_force-xlocale-funcs.patch # currently needed for libglvnd support Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch Patch32: archlinux_glvnd-fix-gl-dot-pc.patch -Patch40: u_gallivm-correct-channel-shift-logic-on-big-endian.patch -Patch41: u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch Patch42: u_r600-Add-support-for-B5G5R5A1.patch Patch43: u_svga-Fix-build-on-ppc64le.patch @@ -656,15 +652,12 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch12 -p1 %patch18 -p1 %patch21 -p1 -%patch22 -p1 %if 0%{?libglvnd} %patch31 -p1 %patch32 -p1 %endif -%patch40 -p1 -%patch41 -p1 %patch42 -p1 %patch43 -p1 diff --git a/mesa-17.2.0.tar.xz b/mesa-17.2.0.tar.xz deleted file mode 100644 index 9800de8..0000000 --- a/mesa-17.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943 -size 10335284 diff --git a/mesa-17.2.0.tar.xz.sig b/mesa-17.2.0.tar.xz.sig deleted file mode 100644 index 051c0fe21cf6204803b79cadbe000b0dd78beee6389836065b290f3982192e52..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+O1GaDue&B6-Ik?vCt~anO>q!j-0$Ht#tpExM5bdrv zuq^9I4ML?4|7TS=5>l1Au@vzmQ*HzlExFskPjc>Z;1?$=7M2*i{FtfGoW;S6SznhR zZv#pk)HVT>+7`Cbc)uGru{XHIY@lK`ou-h6os^zj+)#NjFon9+)xMeTuz|844J4sQ zHVX@W(4qDl=~^#twW#e_;fX{rYY$>x#iLQy6Hz*CKP~)SGcr*8e#{m^b~WIwoTzrq zC{e~UREQ=?itmF_4{2lur<`CAJY|hliUkV^&V8Z3`m*O4t?c_vD{#k+(SQa-47Gy} ze9LtN=AS!5HP{g@Uu|xM-KD8{O{Z>@jG?G{!ZDw^2V23Xa`WKmK7%`WU8l1!N-$jz z_WeYTe-}Wq``7B0Louf~cBzZYQsr+VcA`LIwT^zSCCNlTq&>wJd5aO1Q%?1}dBU;9S+xz}4AYBf7xcn>GrHVypr)f- zShbT3z?<7Xb)g3fq(F#+dhwgSSssGyAQ7}FVgc0b{NPy)9JaD=mh^)qf{DeA>AI!FBw)wp0f EP!xj)p#T5? diff --git a/mesa-17.2.1.tar.xz b/mesa-17.2.1.tar.xz new file mode 100644 index 0000000..75c14e0 --- /dev/null +++ b/mesa-17.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e +size 10414776 diff --git a/mesa-17.2.1.tar.xz.sig b/mesa-17.2.1.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..377ccc5b4209222a0acf7f86acbf4be4233ccd5766405c58a0e712293a668b0b GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+O1GaDue&B6-Ik?vCt~anO>q!j-0$INR8vqIk5bdrv zuq^9I4cb5u0HbM(3M@DY8S$?EUpY^WXuJ07>BSWC-EQHuiNom<0jc~hi)%AL=0`k4{?_-sZ#yn~_uh+xh(Uh=TJl7^{->V!XFAWslt z84S#|USf_=hU4+Pe~P}%nbI!3Vp5laLyM@mi0W-tpCB0lhL({HT0I=aX-6$j4U=a+ zj-ab)j=O5r5OS4JghFUO$OHFFk=9YN<@fUlxK5=Cdub{+EIy5%(Q-!nm?x>DLEcYK zL@K;g5cdY~c9_)ekWOpc_GvOl9Ls1iJu9tP7``3B-Z4o&HG+QAg(83Fj=n*@LE7c< z>M=5Fb^P9R8KTZNDs%D8i{CqC+8DD<2$o+3b$m2w=+Csf!`gO0Z1xop*EAL76l)mZ zUf>9~zd!rX63hUc(kT5hxNUkFCgXakY^(5}=T&X91vY Eo< -Subject: Force use of strtod_l and friends -Patch-mainline: never -References: boo#1055929 - -With glibc 2.26, xlocale.h got removed, but the used functions -are available as part of local.h since POSIX2008, so use them -unconditionally. -This is necessary to fix strod with non-EN locales. - -Index: mesa-17.1.6/src/util/strtod.c -=================================================================== ---- mesa-17.1.6.orig/src/util/strtod.c -+++ mesa-17.1.6/src/util/strtod.c -@@ -28,11 +28,9 @@ - - #ifdef _GNU_SOURCE - #include --#ifdef HAVE_XLOCALE_H --#include -+#define HAVE_XLOCALE_H - static locale_t loc; - #endif --#endif - - #include "strtod.h" - diff --git a/u_gallivm-correct-channel-shift-logic-on-big-endian.patch b/u_gallivm-correct-channel-shift-logic-on-big-endian.patch deleted file mode 100644 index f348f79..0000000 --- a/u_gallivm-correct-channel-shift-logic-on-big-endian.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ab0e1e38ab9e8b23602af21d1b43e98afbf80e45 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Fri, 21 Apr 2017 15:22:14 -0400 -Subject: [PATCH] gallivm: correct channel shift logic on big endian - -lp_build_fetch_rgba_soa fetches a texel from a texture. -Part of that process involves first gathering the element -together from memory into a packed format, and then breaking -out the individual color channels into separate, parallel -arrays. - -The code fails to account for endianess when reading the packed -values. - -This commit attempts to correct the problem by reversing the order -the packed values are read on big endian systems. ---- - src/gallium/auxiliary/gallivm/lp_bld_format_soa.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c -index 98eb694..22c19b1 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c -+++ b/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c -@@ -650,7 +650,13 @@ lp_build_fetch_rgba_soa(struct gallivm_state *gallivm, - for (i = 0; i < format_desc->nr_channels; i++) { - struct util_format_channel_description chan_desc = format_desc->channel[i]; - unsigned blockbits = type.width; -- unsigned vec_nr = chan_desc.shift / type.width; -+ unsigned vec_nr; -+ -+#ifdef PIPE_ARCH_BIG_ENDIAN -+ vec_nr = (format_desc->block.bits - (chan_desc.shift + chan_desc.size)) / type.width; -+#else -+ vec_nr = chan_desc.shift / type.width; -+#endif - chan_desc.shift %= type.width; - - output[i] = lp_build_extract_soa_chan(&bld, --- -1.8.3.1 - diff --git a/u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch b/u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch deleted file mode 100644 index feb3c7c..0000000 --- a/u_llvmpipe-lp_build_gather_elem_vec-BE-fix-for-3x16-lo.patch +++ /dev/null @@ -1,76 +0,0 @@ -From d3135d11bb77235324a21ccaa23be6df836c9870 Mon Sep 17 00:00:00 2001 -From: Ben Crocker -Date: Tue, 22 Aug 2017 13:43:29 -0400 -Subject: [PATCH] llvmpipe: lp_build_gather_elem_vec BE fix for 3x16 load - -Fix loading of a 3x16 vector as a single 48-bit load -on big-endian systems (PPC64, S390). - -Roland Scheidegger's commit e827d9175675aaa6cfc0b981e2a80685fb7b3a74 -plus Ray Strode's patch reduce pre-Roland Piglit failures from ~4000 to ~2000. -This patch fixes three of the four regressions observed by Ray: - -- draw-vertices -- draw-vertices-half-float -- draw-vertices-half-float_gles2 - -One regression remains: -- draw-vertices-2101010 - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100613 -Cc: "17.2" "17.1" - -Signed-off-by: Ben Crocker ---- - src/gallium/auxiliary/gallivm/lp_bld_gather.c | 30 +++++++++++++++++++++++++-- - 1 file changed, 28 insertions(+), 2 deletions(-) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_gather.c b/src/gallium/auxiliary/gallivm/lp_bld_gather.c -index ccd0376..7d11dcd 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_gather.c -+++ b/src/gallium/auxiliary/gallivm/lp_bld_gather.c -@@ -234,13 +234,39 @@ lp_build_gather_elem_vec(struct gallivm_state *gallivm, - */ - res = LLVMBuildZExt(gallivm->builder, res, dst_elem_type, ""); - -- if (vector_justify) { - #ifdef PIPE_ARCH_BIG_ENDIAN -+ if (vector_justify) { - res = LLVMBuildShl(gallivm->builder, res, - LLVMConstInt(dst_elem_type, - dst_type.width - src_width, 0), ""); --#endif - } -+ if (src_width == 48) { -+ /* Load 3x16 bit vector. -+ * The sequence of loads on big-endian hardware proceeds as follows. -+ * 16-bit fields are denoted by X, Y, Z, and 0. In memory, the sequence -+ * of three fields appears in the order X, Y, Z. -+ * -+ * Load 32-bit word: 0.0.X.Y -+ * Load 16-bit halfword: 0.0.0.Z -+ * Rotate left: 0.X.Y.0 -+ * Bitwise OR: 0.X.Y.Z -+ * -+ * The order in which we need the fields in the result is 0.Z.Y.X, -+ * the same as on little-endian; permute 16-bit fields accordingly -+ * within 64-bit register: -+ */ -+ LLVMValueRef shuffles[4] = { -+ lp_build_const_int32(gallivm, 2), -+ lp_build_const_int32(gallivm, 1), -+ lp_build_const_int32(gallivm, 0), -+ lp_build_const_int32(gallivm, 3), -+ }; -+ res = LLVMBuildBitCast(gallivm->builder, res, -+ lp_build_vec_type(gallivm, lp_type_uint_vec(16, 4*16)), ""); -+ res = LLVMBuildShuffleVector(gallivm->builder, res, res, LLVMConstVector(shuffles, 4), ""); -+ res = LLVMBuildBitCast(gallivm->builder, res, dst_elem_type, ""); -+ } -+#endif - } - } - return res; --- -2.7.4 -