SHA256
1
0
forked from pool/Mesa

Accepting request 894262 from home:Guillaume_G:branches:X11:XOrg

- Add swrast to vulkan
- Enable vulkan on %{arm} and aarch64 with: swrast, amd, 
  broadcom and freedreno

OBS-URL: https://build.opensuse.org/request/show/894262
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1041
This commit is contained in:
Stefan Dirsch 2021-05-22 09:30:52 +00:00 committed by Git OBS Bridge
parent 4a3bff3014
commit feb8a3baf5
4 changed files with 158 additions and 2 deletions

View File

@ -6,6 +6,13 @@ Thu May 20 10:25:35 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
* mostly AMD and Intel changes as usual, but also a decent amount
of ARM fixes and more
-------------------------------------------------------------------
Wed May 19 08:29:07 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add swrast to vulkan
- Enable vulkan on %{arm} and aarch64 with: swrast, amd,
broadcom and freedreno
-------------------------------------------------------------------
Fri May 14 03:24:24 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -70,6 +70,11 @@
%define with_opencl 1
%ifarch %{ix86} x86_64
%define with_vulkan 1
%define vulkan_drivers swrast,amd,intel
%endif
%ifarch %{arm} aarch64
%define with_vulkan 1
%define vulkan_drivers swrast,amd,broadcom,freedreno
%endif
%endif
@ -650,11 +655,41 @@ Supplements: xf86-video-ati
%description -n libvulkan_radeon
This package contains the Vulkan parts for Mesa.
%package -n libvulkan_lvp
Summary: Mesa vulkan driver for LVP
Group: System/Libraries
%description -n libvulkan_lvp
This package contains the Vulkan parts for Mesa.
%ifarch %{arm} aarch64
%package -n libvulkan_broadcom
Summary: Mesa vulkan driver for Broadcom
Group: System/Libraries
%description -n libvulkan_broadcom
This package contains the Vulkan parts for Mesa.
%package -n libvulkan_freedreno
Summary: Mesa vulkan driver for Freedreno
Group: System/Libraries
%description -n libvulkan_freedreno
This package contains the Vulkan parts for Mesa.
%endif
%package -n Mesa-libVulkan-devel
Summary: Mesa's Vulkan development files
Group: Development/Libraries/C and C++
%ifarch %{ix86} x86_64
Requires: libvulkan_intel = %{version}
%endif
Requires: libvulkan_lvp = %{version}
Requires: libvulkan_radeon = %{version}
%ifarch %arm} aarch64
Requires: libvulkan_broadcom = %{version}
Requires: libvulkan_freedreno = %{version}
%endif
%description -n Mesa-libVulkan-devel
This package contains the development files for Mesa's Vulkan implementation.
@ -662,8 +697,15 @@ This package contains the development files for Mesa's Vulkan implementation.
%package -n Mesa-vulkan-device-select
Summary: Vulkan layer to select Vulkan devices provided by Mesa
Group: System/Libraries
%ifarch %{ix86} x86_64
Requires: libvulkan_intel = %{version}
%endif
Requires: libvulkan_lvp = %{version}
Requires: libvulkan_radeon = %{version}
%ifarch %arm} aarch64
Requires: libvulkan_broadcom = %{version}
Requires: libvulkan_freedreno = %{version}
%endif
%description -n Mesa-vulkan-device-select
This package contains the VK_MESA_device_select Vulkan layer
@ -671,8 +713,15 @@ This package contains the VK_MESA_device_select Vulkan layer
%package -n Mesa-vulkan-overlay
Summary: Mesa Vulkan Overlay layer
Group: System/Libraries
%ifarch %{ix86} x86_64
Requires: libvulkan_intel = %{version}
%endif
Requires: libvulkan_lvp = %{version}
Requires: libvulkan_radeon = %{version}
%ifarch %arm} aarch64
Requires: libvulkan_broadcom = %{version}
Requires: libvulkan_freedreno = %{version}
%endif
%description -n Mesa-vulkan-overlay
This package contains the VK_MESA_Overlay Vulkan layer
@ -777,7 +826,7 @@ egl_platforms=x11,wayland
-Dgallium-xa=true \
%endif
%if 0%{with_vulkan}
-Dvulkan-drivers=intel,amd \
-Dvulkan-drivers=%{?vulkan_drivers} \
-Dvulkan-layers=device-select,overlay \
%else
-Dvulkan-drivers= \
@ -1120,11 +1169,13 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%endif
%if 0%{with_vulkan}
%ifarch %{ix86} x86_64
%files -n libvulkan_intel
%dir %{_datadir}/vulkan
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/intel_icd.*.json
%{_libdir}/libvulkan_intel.so
%endif
%files -n libvulkan_radeon
%{_libdir}/libvulkan_radeon.so
@ -1132,6 +1183,26 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/radeon_icd.*.json
%files -n libvulkan_lvp
%{_libdir}/libvulkan_lvp.so
%dir %{_datadir}/vulkan
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/lvp_icd.*.json
%ifarch %{arm} aarch64
%files -n libvulkan_broadcom
%{_libdir}/libvulkan_broadcom.so
%dir %{_datadir}/vulkan
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/broadcom_icd.*.json
%files -n libvulkan_freedreno
%{_libdir}/libvulkan_freedreno.so
%dir %{_datadir}/vulkan
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/freedreno_icd.*.json
%endif
%files -n Mesa-libVulkan-devel
%dir %{_includedir}/vulkan

View File

@ -6,6 +6,13 @@ Thu May 20 10:25:35 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
* mostly AMD and Intel changes as usual, but also a decent amount
of ARM fixes and more
-------------------------------------------------------------------
Wed May 19 08:29:07 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add swrast to vulkan
- Enable vulkan on %{arm} and aarch64 with: swrast, amd,
broadcom and freedreno
-------------------------------------------------------------------
Fri May 14 03:24:24 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -69,6 +69,11 @@
%define with_opencl 1
%ifarch %{ix86} x86_64
%define with_vulkan 1
%define vulkan_drivers swrast,amd,intel
%endif
%ifarch %{arm} aarch64
%define with_vulkan 1
%define vulkan_drivers swrast,amd,broadcom,freedreno
%endif
%endif
@ -649,11 +654,41 @@ Supplements: xf86-video-ati
%description -n libvulkan_radeon
This package contains the Vulkan parts for Mesa.
%package -n libvulkan_lvp
Summary: Mesa vulkan driver for LVP
Group: System/Libraries
%description -n libvulkan_lvp
This package contains the Vulkan parts for Mesa.
%ifarch %{arm} aarch64
%package -n libvulkan_broadcom
Summary: Mesa vulkan driver for Broadcom
Group: System/Libraries
%description -n libvulkan_broadcom
This package contains the Vulkan parts for Mesa.
%package -n libvulkan_freedreno
Summary: Mesa vulkan driver for Freedreno
Group: System/Libraries
%description -n libvulkan_freedreno
This package contains the Vulkan parts for Mesa.
%endif
%package -n Mesa-libVulkan-devel
Summary: Mesa's Vulkan development files
Group: Development/Libraries/C and C++
%ifarch %{ix86} x86_64
Requires: libvulkan_intel = %{version}
%endif
Requires: libvulkan_lvp = %{version}
Requires: libvulkan_radeon = %{version}
%ifarch %arm} aarch64
Requires: libvulkan_broadcom = %{version}
Requires: libvulkan_freedreno = %{version}
%endif
%description -n Mesa-libVulkan-devel
This package contains the development files for Mesa's Vulkan implementation.
@ -661,8 +696,15 @@ This package contains the development files for Mesa's Vulkan implementation.
%package -n Mesa-vulkan-device-select
Summary: Vulkan layer to select Vulkan devices provided by Mesa
Group: System/Libraries
%ifarch %{ix86} x86_64
Requires: libvulkan_intel = %{version}
%endif
Requires: libvulkan_lvp = %{version}
Requires: libvulkan_radeon = %{version}
%ifarch %arm} aarch64
Requires: libvulkan_broadcom = %{version}
Requires: libvulkan_freedreno = %{version}
%endif
%description -n Mesa-vulkan-device-select
This package contains the VK_MESA_device_select Vulkan layer
@ -670,8 +712,15 @@ This package contains the VK_MESA_device_select Vulkan layer
%package -n Mesa-vulkan-overlay
Summary: Mesa Vulkan Overlay layer
Group: System/Libraries
%ifarch %{ix86} x86_64
Requires: libvulkan_intel = %{version}
%endif
Requires: libvulkan_lvp = %{version}
Requires: libvulkan_radeon = %{version}
%ifarch %arm} aarch64
Requires: libvulkan_broadcom = %{version}
Requires: libvulkan_freedreno = %{version}
%endif
%description -n Mesa-vulkan-overlay
This package contains the VK_MESA_Overlay Vulkan layer
@ -776,7 +825,7 @@ egl_platforms=x11,wayland
-Dgallium-xa=true \
%endif
%if 0%{with_vulkan}
-Dvulkan-drivers=intel,amd \
-Dvulkan-drivers=%{?vulkan_drivers} \
-Dvulkan-layers=device-select,overlay \
%else
-Dvulkan-drivers= \
@ -1119,11 +1168,13 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%endif
%if 0%{with_vulkan}
%ifarch %{ix86} x86_64
%files -n libvulkan_intel
%dir %{_datadir}/vulkan
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/intel_icd.*.json
%{_libdir}/libvulkan_intel.so
%endif
%files -n libvulkan_radeon
%{_libdir}/libvulkan_radeon.so
@ -1131,6 +1182,26 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/radeon_icd.*.json
%files -n libvulkan_lvp
%{_libdir}/libvulkan_lvp.so
%dir %{_datadir}/vulkan
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/lvp_icd.*.json
%ifarch %{arm} aarch64
%files -n libvulkan_broadcom
%{_libdir}/libvulkan_broadcom.so
%dir %{_datadir}/vulkan
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/broadcom_icd.*.json
%files -n libvulkan_freedreno
%{_libdir}/libvulkan_freedreno.so
%dir %{_datadir}/vulkan
%dir %{_datadir}/vulkan/icd.d
%{_datadir}/vulkan/icd.d/freedreno_icd.*.json
%endif
%files -n Mesa-libVulkan-devel
%dir %{_includedir}/vulkan