pool/Mesa
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 777801 from X11:XOrg

Browse Source 
- use 7G disk constraints also for x86_64 and i586 (bsc#1164488) 

- only use 'BuildRequires:llvm-devel >= 9.0.0' for TW/factory; for 
  older products still use 'BuildRequires: llvm9-devel'; fixed
  build on openSUSE Leap 15.2

- 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

OBS-URL: https://build.opensuse.org/request/show/777801
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=370
This commit is contained in:
Dominique Leuenberger 2020-02-22 17:59:09 +00:00 committed by Git OBS Bridge
commit 4459a2306a
10 changed files with 53 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Mesa-drivers.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Fri Feb 21 05:09:10 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- use 7G disk constraints also for x86_64 and i586 (bsc#1164488)
-------------------------------------------------------------------
Tue Feb 18 15:16:13 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- only use 'BuildRequires:llvm-devel >= 9.0.0' for TW/factory; for
older products still use 'BuildRequires: llvm9-devel'; fixed
build on openSUSE Leap 15.2
-------------------------------------------------------------------
Sun Feb 16 12:00:17 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com>

11
Mesa-drivers.spec
View File

@ -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
@ -215,7 +214,7 @@ BuildRequires: pkgconfig(wayland-protocols) >= 1.8
BuildRequires: pkgconfig(wayland-server) >= 1.11
%endif
%if 0%{with_llvm}
%if 0%{?is_opensuse}
%if 0%{?suse_version} >= 1550
BuildRequires: llvm-devel >= 9.0.0
%else
BuildRequires: llvm9-devel
@ -737,7 +736,7 @@ programs against the XA state tracker.
rm -rf docs/README.{VMS,WIN32,OS2}
%if 0%{with_llvm}
%if 0%{?is_opensuse}
%if 0%{?suse_version} >= 1550
%if %{pkg_vcmp llvm-devel >= 9.0}
%patch1 -p1
%endif
@ -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

20
Mesa.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Fri Feb 21 05:09:10 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- use 7G disk constraints also for x86_64 and i586 (bsc#1164488)
-------------------------------------------------------------------
Tue Feb 18 15:16:13 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- only use 'BuildRequires:llvm-devel >= 9.0.0' for TW/factory; for
older products still use 'BuildRequires: llvm9-devel'; fixed
build on openSUSE Leap 15.2
-------------------------------------------------------------------
Sun Feb 16 12:00:17 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com>

11
Mesa.spec
View File

@ -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
@ -214,7 +213,7 @@ BuildRequires: pkgconfig(wayland-protocols) >= 1.8
BuildRequires: pkgconfig(wayland-server) >= 1.11
%endif
%if 0%{with_llvm}
%if 0%{?is_opensuse}
%if 0%{?suse_version} >= 1550
BuildRequires: llvm-devel >= 9.0.0
%else
BuildRequires: llvm9-devel
@ -736,7 +735,7 @@ programs against the XA state tracker.
rm -rf docs/README.{VMS,WIN32,OS2}
%if 0%{with_llvm}
%if 0%{?is_opensuse}
%if 0%{?suse_version} >= 1550
%if %{pkg_vcmp llvm-devel >= 9.0}
%patch1 -p1
%endif
@ -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

2
_constraints
View File

@ -4,6 +4,8 @@
<arch>ppc</arch>
<arch>ppc64</arch>
<arch>ppc64le</arch>
<arch>x86_64</arch>
<arch>i586</arch>
</conditions>
<hardware>
<disk>

3
mesa-19.3.3.tar.xz
View File

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

BIN
mesa-19.3.3.tar.xz.sig
View File

Binary file not shown.

3
mesa-19.3.4.tar.xz Normal file
View File

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

BIN
mesa-19.3.4.tar.xz.sig Normal file
View File

Binary file not shown.

58
u_Revert_gallium_Fix_big-endian_addressing_of_non-bitmask_array_formats.patch
View File

@ -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