Skip to contentSkip to conversation

package/mesa3d: vulkan with x11 needs dri3

PATCH New Yann E. MORIN 2 participants 2 messages Aug 23, 2018 – Aug 24, 2018

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH v2 1/1 package/mesa3d: vulkan with x11 needs dri3

Vulcan with X11 needs DRI3, which in turn requires xlib-libxshmfence.

Fixes:

    http://autobuild.buildroot.org/results/356/35653fc6f57dc169a8aae6baedb1acd1049b50ec/
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Bernd Kuhls <[email protected]>
Cc Romain Naour <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
Changes v1 -> v2:
- ensure we can still disable all DRI drivers (Thomas)

---
 package/mesa3d/Config.in | 3 +++
 package/mesa3d/mesa3d.mk | 2 ++
 2 files changed, 5 insertions(+)
package/mesa3d/Config.in +3 -0
index eec72654cd..06574ae513 100644
@@ -210,16 +210,19 @@ 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_HAS_SYNC_4 # libxshmfence
 	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 # xorgproto
 	select BR2_PACKAGE_MESA3D_VULKAN_DRIVER
 	select BR2_PACKAGE_XORGPROTO
+	select BR2_PACKAGE_XLIB_LIBXSHMFENCE
 	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_HAS_SYNC_4
 	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 || \
 		!BR2_TOOLCHAIN_USES_GLIBC || !BR2_PACKAGE_XORG7
package/mesa3d/mesa3d.mk +2 -0
index 5c01f92e22..e1e21321b0 100644
@@ -130,7 +130,9 @@ ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),)
 MESA3D_CONF_OPTS += \
 	--without-vulkan-drivers
 else
+MESA3D_DEPENDENCIES += xlib_libxshmfence
 MESA3D_CONF_OPTS += \
+	--enable-dri3 \
 	--with-vulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y))
 endif
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH v2 1/1 package/mesa3d: vulkan with x11 needs dri3

Hello,

Quoted 10 lines · Yann E. MORIN

Vulcan with X11 needs DRI3, which in turn requires xlib-libxshmfence.

Fixes:

    http://autobuild.buildroot.org/results/356/35653fc6f57dc169a8aae6baedb1acd1049b50ec/
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Bernd Kuhls <[email protected]>
Cc Romain Naour <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Quoted 7 lines

---
Changes v1 -> v2:
- ensure we can still disable all DRI drivers (Thomas)

---
 package/mesa3d/Config.in | 3 +++
 package/mesa3d/mesa3d.mk | 2 ++
 2 files changed, 5 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com