* [Buildroot] [PATCH v3 2/3] package/mesa3d: provides libgl not only with DRI drivers
2016-07-17 16:27 [Buildroot] [PATCH v3 1/3] package/mesa3d: add optional support for libsha1 Bernd Kuhls
@ 2016-07-17 16:27 ` Bernd Kuhls
2016-09-20 18:03 ` Thomas Petazzoni
2016-07-17 16:27 ` [Buildroot] [PATCH v3 3/3] package/mesa3d: add support for Intel Vulkan driver Bernd Kuhls
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Bernd Kuhls @ 2016-07-17 16:27 UTC (permalink / raw)
To: buildroot
This patch is a follow-up for
https://github.com/buildroot/buildroot/commit/999d4a263118ab8581190d3e3c8bdc471896628f
libGL.so and support files are not only available with DRI drivers but
also with Gallium drivers, in fact mesa3d can be built without any
driver enabled - unless X.org is disabled it will provide libGL.so.
Tested using this defconfig:
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_KODI=y
BR2_PACKAGE_KODI_VISUALISATION_WAVEFORHUE=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_XORG7=y
Fixes
http://autobuild.buildroot.net/results/d97/d97a80e6de066a7dea08b284eab24fc44b11d661/
kodi-visualisation-waveforhue detects OpenGL installed by mesa3d but the
kodi package itself does not select libglew before because mesa3d was
not listed as a provider for libgl in the buildroot build system.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v3: fixed X.org comment typo (Yann)
moved before the Vulkan driver patch and rebased (Yann)
v2: never released
package/mesa3d/Config.in | 9 ++++-----
package/mesa3d/mesa3d.mk | 9 +++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 45ca69c..a7c8743 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -6,6 +6,7 @@ menuconfig BR2_PACKAGE_MESA3D
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_EXPAT
+ select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XPROTO_GLPROTO if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7
@@ -28,15 +29,10 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
config BR2_PACKAGE_MESA3D_DRI_DRIVER
select BR2_PACKAGE_MESA3D_DRIVER
- select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO
select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XPROTO_DRI3PROTO
bool
-config BR2_PACKAGE_PROVIDES_LIBGL
- default "mesa3d" if BR2_PACKAGE_MESA3D_DRI_DRIVER && \
- BR2_PACKAGE_XORG7
-
config BR2_PACKAGE_MESA3D_DRIVER
bool
@@ -163,6 +159,9 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES
endif # BR2_PACKAGE_MESA3D_DRIVER
+config BR2_PACKAGE_PROVIDES_LIBGL
+ default "mesa3d" if BR2_PACKAGE_XORG7
+
config BR2_PACKAGE_PROVIDES_LIBEGL
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 19dec49..3be8831 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -109,10 +109,6 @@ endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y)
MESA3D_DEPENDENCIES += xlib_libXxf86vm
endif
-# libGL is only provided for a full xorg stack
-ifeq ($(BR2_PACKAGE_XORG7),y)
-MESA3D_PROVIDES += libgl
-endif
MESA3D_CONF_OPTS += \
--enable-shared-glapi \
--enable-driglx-direct \
@@ -135,6 +131,11 @@ MESA3D_CONF_OPTS += --enable-opengl --enable-dri
# we do not need libva support in mesa3d, therefore disable this option
MESA3D_CONF_OPTS += --disable-va
+# libGL is only provided for a full xorg stack
+ifeq ($(BR2_PACKAGE_XORG7),y)
+MESA3D_PROVIDES += libgl
+endif
+
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
MESA3D_PROVIDES += libegl
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
--
2.8.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH v3 3/3] package/mesa3d: add support for Intel Vulkan driver
2016-07-17 16:27 [Buildroot] [PATCH v3 1/3] package/mesa3d: add optional support for libsha1 Bernd Kuhls
2016-07-17 16:27 ` [Buildroot] [PATCH v3 2/3] package/mesa3d: provides libgl not only with DRI drivers Bernd Kuhls
@ 2016-07-17 16:27 ` Bernd Kuhls
2016-09-20 18:03 ` Thomas Petazzoni
2016-07-17 20:23 ` [Buildroot] [PATCH v3 1/3] package/mesa3d: add optional support for libsha1 Yann E. MORIN
2016-07-18 21:10 ` Thomas Petazzoni
3 siblings, 1 reply; 7+ messages in thread
From: Bernd Kuhls @ 2016-07-17 16:27 UTC (permalink / raw)
To: buildroot
The Vulkan intel driver depends on the i965 dri driver:
https://cgit.freedesktop.org/mesa/mesa/tree/configure.ac?h=12.0#n1653
and a sha1 implementation:
https://cgit.freedesktop.org/mesa/mesa/tree/configure.ac?h=12.0#n1656
The Vulkan driver needs linux/memfd.h
https://cgit.freedesktop.org/mesa/mesa/tree/src/intel/vulkan/anv_allocator.c?h=12.0#n30
which is not available in kernel headers older than 3.18:
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/log/include/uapi/linux/memfd.h?id=refs/tags/v3.18.36
The Vulkan driver makes use of ifunc
https://cgit.freedesktop.org/mesa/mesa/tree/src/intel/vulkan/anv_entrypoints_gen.py?h=12.0#n287
which is not available on uClibc:
https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/config.gcc;h=82cc9a9959b5ab57c0b8779e054b80cdb95f169b;hb=gcc-6-branch#l1485
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e6cdd6b1755033e8f416efaa4334d1294c0a43c6
The Vulkan driver makes use of static_assert
https://cgit.freedesktop.org/mesa/mesa/tree/src/intel/vulkan/anv_private.h?h=12.0#n153
Compiling the Vulkan driver with uClibc and musl fails, therefore this
driver is glibc-only.
Although the configure script does not check for dri3 support if the
Intel Vulkan driver is enabled it needs it nonetheless:
https://cgit.freedesktop.org/mesa/mesa/tree/src/intel/vulkan/anv_wsi_x11.c?h=12.0#n682
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v3: no changes
v2: added dependency on BR2_PACKAGE_XORG7 (Thomas)
optionally select libsha1
package/mesa3d/Config.in | 29 ++++++++++++++++++++++++++++-
package/mesa3d/mesa3d.mk | 10 ++++++++++
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index a7c8743..0b141b8 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_MESA3D
if BR2_PACKAGE_MESA3D
-# inform the .mk file of gallium or dri driver selection
+# inform the .mk file of gallium, dri or vulkan driver selection
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
select BR2_PACKAGE_MESA3D_DRIVER
bool
@@ -33,6 +33,10 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER
select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XPROTO_DRI3PROTO
bool
+config BR2_PACKAGE_MESA3D_VULKAN_DRIVER
+ bool
+ select BR2_PACKAGE_MESA3D_DRIVER
+
config BR2_PACKAGE_MESA3D_DRIVER
bool
@@ -132,6 +136,29 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
help
Legacy Radeon driver for R100 series GPUs.
+comment "Vulkan drivers"
+
+config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL
+ bool "Vulkan Intel driver"
+ depends on BR2_i386 || BR2_x86_64
+ depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # memfd.h
+ depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert
+ depends on BR2_PACKAGE_XORG7 # xproto_dri3proto
+ # We need a SHA1 implementation. If either openssl or
+ # libgcrypt are already part of the build, we'll use one of
+ # them, otherwise, use the small libsha1 library.
+ select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT)
+ select BR2_PACKAGE_MESA3D_DRI_DRIVER_I965
+ select BR2_PACKAGE_MESA3D_VULKAN_DRIVER
+ select BR2_PACKAGE_XPROTO_DRI3PROTO
+ help
+ Vulkan driver for Intel hardware from Ivy Bridge onward.
+
+comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= 3.18"
+ depends on BR2_i386 || BR2_x86_64
+ depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 || \
+ !BR2_TOOLCHAIN_USES_GLIBC || !BR2_PACKAGE_XORG7
+
comment "Off-screen Rendering"
config BR2_PACKAGE_MESA3D_OSMESA
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 3be8831..c636a8a 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -86,6 +86,8 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915
MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965
MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau
MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon
+# Vulkan Drivers
+MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel
ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),)
MESA3D_CONF_OPTS += \
@@ -115,6 +117,14 @@ MESA3D_CONF_OPTS += \
--with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y))
endif
+ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),)
+MESA3D_CONF_OPTS += \
+ --without-vulkan-drivers
+else
+MESA3D_CONF_OPTS += \
+ --with-vulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y))
+endif
+
# APIs
ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y)
--
2.8.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH v3 1/3] package/mesa3d: add optional support for libsha1
2016-07-17 16:27 [Buildroot] [PATCH v3 1/3] package/mesa3d: add optional support for libsha1 Bernd Kuhls
2016-07-17 16:27 ` [Buildroot] [PATCH v3 2/3] package/mesa3d: provides libgl not only with DRI drivers Bernd Kuhls
2016-07-17 16:27 ` [Buildroot] [PATCH v3 3/3] package/mesa3d: add support for Intel Vulkan driver Bernd Kuhls
@ 2016-07-17 20:23 ` Yann E. MORIN
2016-07-18 21:10 ` Thomas Petazzoni
3 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2016-07-17 20:23 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2016-07-17 18:27 +0200, Bernd Kuhls spake thusly:
> mesa3d supports several sha1 implementations:
> https://cgit.freedesktop.org/mesa/mesa/tree/configure.ac?h=12.0#n1167
>
> This patch adds support for libsha1, inspired by the
> xserver_xorg-server package:
> https://github.com/buildroot/buildroot/blob/master/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#L247
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Since I gave my Acked-by on the previous ieteration of this patch, and
given that you did not change, you were totally entitled to add my
Acked-by when respinning this patch. Here it goes for posterity:
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> v3: no changes
> v2: never released, jumped from v1 to v3
>
> package/mesa3d/mesa3d.mk | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> index dcd43d5..19dec49 100644
> --- a/package/mesa3d/mesa3d.mk
> +++ b/package/mesa3d/mesa3d.mk
> @@ -36,6 +36,9 @@ MESA3D_CONF_OPTS += --with-sha1=libcrypto
> else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
> MESA3D_DEPENDENCIES += libgcrypt
> MESA3D_CONF_OPTS += --with-sha1=libgcrypt
> +else ifeq ($(BR2_PACKAGE_LIBSHA1),y)
> +MESA3D_DEPENDENCIES += libsha1
> +MESA3D_CONF_OPTS += --with-sha1=libsha1
> endif
>
> ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
> --
> 2.8.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v3 1/3] package/mesa3d: add optional support for libsha1
2016-07-17 16:27 [Buildroot] [PATCH v3 1/3] package/mesa3d: add optional support for libsha1 Bernd Kuhls
` (2 preceding siblings ...)
2016-07-17 20:23 ` [Buildroot] [PATCH v3 1/3] package/mesa3d: add optional support for libsha1 Yann E. MORIN
@ 2016-07-18 21:10 ` Thomas Petazzoni
3 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2016-07-18 21:10 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 17 Jul 2016 18:27:53 +0200, Bernd Kuhls wrote:
> mesa3d supports several sha1 implementations:
> https://cgit.freedesktop.org/mesa/mesa/tree/configure.ac?h=12.0#n1167
>
> This patch adds support for libsha1, inspired by the
> xserver_xorg-server package:
> https://github.com/buildroot/buildroot/blob/master/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#L247
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v3: no changes
> v2: never released, jumped from v1 to v3
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread