summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2019-02-22 11:09:30 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 10:43:06 +0000
commit8f112c3ed0b093598376ece6af1182c9b5efbfe9 (patch)
treeb18ebaf3f1b104e31f02f2545ae720b9290ab6ca /meta
parentc21c581d615bc7f9f07497a3425cb1d4c56a1f9a (diff)
downloadpoky-8f112c3ed0b093598376ece6af1182c9b5efbfe9.tar.gz
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/ (From OE-Core rev: 223ee432b908180932bf70e77d4058964d7f0786) Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc9
1 files changed, 4 insertions, 5 deletions
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
49 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ 49 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \
50 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ 50 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
51 " 51 "
52PACKAGECONFIG_class-native ?= "gbm dri-native egl" 52PACKAGECONFIG_class-native ?= "gbm dri egl"
53PACKAGECONFIG_class-nativesdk ?= "gbm dri-native egl" 53PACKAGECONFIG_class-nativesdk ?= "gbm dri egl"
54 54
55# "gbm" requires "dri", "opengl" 55# "gbm" requires "dri", "opengl"
56PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" 56PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
@@ -61,13 +61,12 @@ PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
61PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" 61PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
62PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" 62PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
63 63
64DRIDRIVERS = "swrast" 64DRIDRIVERS_class-native = "swrast"
65DRIDRIVERS_class-nativesdk = "swrast"
65DRIDRIVERS_append_x86_class-target = ",radeon,r200,nouveau,i965,i915" 66DRIDRIVERS_append_x86_class-target = ",radeon,r200,nouveau,i965,i915"
66DRIDRIVERS_append_x86-64_class-target = ",radeon,r200,nouveau,i965,i915" 67DRIDRIVERS_append_x86-64_class-target = ",radeon,r200,nouveau,i965,i915"
67# "dri" requires "opengl" 68# "dri" requires "opengl"
68PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, xorgproto libdrm" 69PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, xorgproto libdrm"
69# On the native builds we use host's dri drivers
70PACKAGECONFIG[dri-native] = "--enable-dri, , xorgproto libdrm"
71PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, xorgproto libxshmfence" 70PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, xorgproto libxshmfence"
72 71
73# Vulkan drivers need dri3 enabled 72# Vulkan drivers need dri3 enabled