diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index cc9975c..7c5ea9a 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Feb 16 12:00:17 UTC 2020 - Stefan Dirsch + +- Update to version 19.3.4 + * changes all over the tree, but aco and anv are leading the + way in changes +- supersedes u_Revert_gallium_Fix_big-endian_addressing_of_non-bitmask_array_formats.patch + ------------------------------------------------------------------- Thu Feb 6 11:32:05 UTC 2020 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 974c438..9f2b45f 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 19.3.3 +%define _version 19.3.4 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -110,7 +110,7 @@ %endif Name: Mesa-drivers -Version: 19.3.3 +Version: 19.3.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_gallium_Fix_big-endian_addressing_of_non-bitmask_array_formats.patch # never to be upstreamed Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch @@ -748,8 +747,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %endif %endif %patch2 -p1 -# reverse apply since it caused a regression in rendering on s390x (bsc#1162252) -%patch3 -p1 %patch54 -p1 %patch58 -p1 %patch61 -p1 diff --git a/Mesa.changes b/Mesa.changes index cc9975c..7c5ea9a 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Feb 16 12:00:17 UTC 2020 - Stefan Dirsch + +- Update to version 19.3.4 + * changes all over the tree, but aco and anv are leading the + way in changes +- supersedes u_Revert_gallium_Fix_big-endian_addressing_of_non-bitmask_array_formats.patch + ------------------------------------------------------------------- Thu Feb 6 11:32:05 UTC 2020 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 457980b..e2ecf6f 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 19.3.3 +%define _version 19.3.4 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -109,7 +109,7 @@ %endif Name: Mesa -Version: 19.3.3 +Version: 19.3.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_gallium_Fix_big-endian_addressing_of_non-bitmask_array_formats.patch # never to be upstreamed Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch @@ -747,8 +746,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %endif %endif %patch2 -p1 -# reverse apply since it caused a regression in rendering on s390x (bsc#1162252) -%patch3 -p1 %patch54 -p1 %patch58 -p1 %patch61 -p1 diff --git a/mesa-19.3.3.tar.xz b/mesa-19.3.3.tar.xz deleted file mode 100644 index f45c7a1..0000000 --- a/mesa-19.3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81ce4810bb25d61300f8104856461f4d49cf7cb794aa70cb572312e370c39f09 -size 11938700 diff --git a/mesa-19.3.3.tar.xz.sig b/mesa-19.3.3.tar.xz.sig deleted file mode 100644 index 229229c..0000000 Binary files a/mesa-19.3.3.tar.xz.sig and /dev/null differ diff --git a/mesa-19.3.4.tar.xz b/mesa-19.3.4.tar.xz new file mode 100644 index 0000000..9c037cb --- /dev/null +++ b/mesa-19.3.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4 +size 11968288 diff --git a/mesa-19.3.4.tar.xz.sig b/mesa-19.3.4.tar.xz.sig new file mode 100644 index 0000000..04e2445 Binary files /dev/null and b/mesa-19.3.4.tar.xz.sig differ diff --git a/u_Revert_gallium_Fix_big-endian_addressing_of_non-bitmask_array_formats.patch b/u_Revert_gallium_Fix_big-endian_addressing_of_non-bitmask_array_formats.patch deleted file mode 100644 index 5e6a7a9..0000000 --- a/u_Revert_gallium_Fix_big-endian_addressing_of_non-bitmask_array_formats.patch +++ /dev/null @@ -1,58 +0,0 @@ -This reverts the functional part of commit -d17ff2f7, leaving the unit test for -mesa/pipe agreement on what's an array. - -The issue is that the util_channel_desc.shift values on array formats are -not used for bit addressing in memory, they're bit addressing within a -word treating a pixel of the format as a native type, as seen by -llvmpipe's use of the values to do shifts (see -lp_build_unpack_arith_rgba_aos() for example). This means the values are -nonsensical for 3-byte RGB, but then llvmpipe doesn't expose those formats -so it works out. - -I still want to clean up our big-endian format handling at some point, but -let's fix the s390x regression first, sort out our format unit tests in -CI, then be able to refactor with confidence. - -Fixes: d17ff2f7 ("gallium: Fix big-endian addressing of non-bitmask array formats.") -Closes: #2440 -Closes: #2472 - -diff --git a/src/gallium/auxiliary/util/u_format_parse.py b/src/util/gallium/auxiliary/u_format_parse.py -index 541ae69d4dc662e16c08ed7c27a9e65534a4b08f..b9627055cda3f5277bddc1936614a983f1359d00 100644 ---- a/src/gallium/auxiliary/util/u_format_parse.py -+++ b/src/gallium/auxiliary/util/u_format_parse.py -@@ -379,27 +379,16 @@ def parse(filename): - channel.shift = le_shift - le_shift += channel.size - -+ be_shift = 0 -+ for channel in be_channels[3::-1]: -+ channel.shift = be_shift -+ be_shift += channel.size -+ -+ assert le_shift == be_shift - for i in range(4): - assert (le_swizzles[i] != SWIZZLE_NONE) == (be_swizzles[i] != SWIZZLE_NONE) - - format = Format(name, layout, block_width, block_height, block_depth, le_channels, le_swizzles, be_channels, be_swizzles, colorspace) -- -- if format.is_array() and not format.is_bitmask(): -- # Formats accessed as arrays by the pack functions (R32G32_FLOAT or -- # R8G8B8_UNORM, for example) should not be channel-ordering-reversed -- # for BE. -- # Note that __eq__ on channels ignores .shift! -- assert(format.be_channels == format.le_channels) -- assert(format.be_swizzles == format.le_swizzles) -- format.be_channels = format.le_channels -- else: -- be_shift = 0 -- for channel in format.be_channels[3::-1]: -- channel.shift = be_shift -- be_shift += channel.size -- -- assert le_shift == be_shift -- - formats.append(format) - return formats -