From 223ee432b908180932bf70e77d4058964d7f0786 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Fri, 22 Feb 2019 11:09:30 -0300 Subject: mesa: Replace dri-native with dri for native and nativesdk classes Instead of using a native specific packageconfig option, we now set the swrast as the supported driver. Currently the native version does not build any dri drivers at all. This is intentional: mesa-native is used only by virgl, so was made the most minimal possible configuration for mesa-native so that a) virgl works; and b) build time is as short as possible. There are two swrast drivers, one dri-based, another gallium-based. Autotools lets you build both, meson forces you to choose. Thus DRIDRIVERS = "swrast" is only set for _native, as for _target we get the gallium driver instead. See discussion here [1] Based on https://patchwork.openembedded.org/patch/158748/ [1] https://patchwork.openembedded.org/patch/158806/ Signed-off-by: Fabio Berton Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa.inc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'meta/recipes-graphics/mesa') diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 0ce7e4d626..b2c6395a31 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -49,8 +49,8 @@ PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland v ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ " -PACKAGECONFIG_class-native ?= "gbm dri-native egl" -PACKAGECONFIG_class-nativesdk ?= "gbm dri-native egl" +PACKAGECONFIG_class-native ?= "gbm dri egl" +PACKAGECONFIG_class-nativesdk ?= "gbm dri egl" # "gbm" requires "dri", "opengl" PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" @@ -61,13 +61,12 @@ PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" -DRIDRIVERS = "swrast" +DRIDRIVERS_class-native = "swrast" +DRIDRIVERS_class-nativesdk = "swrast" DRIDRIVERS_append_x86_class-target = ",radeon,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64_class-target = ",radeon,r200,nouveau,i965,i915" # "dri" requires "opengl" PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, xorgproto libdrm" -# On the native builds we use host's dri drivers -PACKAGECONFIG[dri-native] = "--enable-dri, , xorgproto libdrm" PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, xorgproto libxshmfence" # Vulkan drivers need dri3 enabled -- cgit 1.2.3-korg