Enable accelerated OpenGL in qemu
cover Enable accelerated OpenGL in qemu
V2 changes: addressed feedback from the first review round V3 changes:
- better fix for missing qemu X11 include, as discussed with upstream
- maintainers.inc entry for virglrenderer
- egl-headless support (see below for details)
- improvements to kmscube recipe
- fix to vte-native to allow building it with gcc 4.8
V4 changes
- address failures uncovered by yocto autobuilder
Why this? Why now?
1. I think we are heading towards a reality where some kind of working GL is a 'must' for any kind of UI work.
2. Typically people build images and then transfer them to the NUC or even target boards for testing - using qemu would be less awkward.
3. Current qemu configuration is basically useless here, as it only provides a very slow software GL driver from mesa.
0. TLDR:
a) Gtk UI frontend
$ . oe-init-build-env build-virgl $ bitbake core-image-sato-sdk $ runqemu kvm gl $$ run glxgears or any other GL-capable binary inside qemu
b) egl-headless
$ . oe-init-build-env build-virgl $ bitbake core-image-sato-sdk $ runqemu kvm egl-headless publicvnc $ <connect with a vnc viewer to 127.0.0.1:5900> $$ run glxgears or any other GL-capable binary inside qemu
1. For the local UI, qemu is switched over to use gtk frontend. I simply couldn't get SDL frontend to work properly, it only displays a blank black window or doesn't start at all. Same thing happens with qemu binaries provided by Fedora and opensuse (Ubuntu's qemu lacks virgl support). Seems like SDL support has regressed.
2. What is egl-headless?
In this variant, Qemu does not open a UI window at all. Instead, it renders all graphics, including GL, into a memory buffer, which can be seen with a vnc or spice client (over a TCP socket). This has the following advantages:
- no need to be physically present at the host machine, output (including GL bits!) can be seen remotely
- no need for the host machine to run an X session
3. While the components are built against the most minimum necessary mesa-native set (gbm, egl, dri with no drivers), libepoxy loads and uses the host GL implementation (through a chrpath hack). This is both to save build times, and because the host is likely to have a set of drivers more appropriate for the physical machine (e.g. proprietary nvidia stack, although I didn't test that).
4. I tested this with
- glamor X server
- weston compositor with drm backend (build core-image-weston, then edit weston.ini in the image to use drm backed instead of fbdev).
- kmscube
- glxgears
- https://www.geeks3d.com/gputest/
The latter two show FPS that is similar to running them directly on the host.
5. Some things I am not sure about:
- how much of a 'default' should this be for running qemu. It works for me,
but other people might find it less stable compared to the existing sdl-vmware-swrast setup.
- what other tests and demos could be run
- how could this be tested on the autobuilder. I wrote two oe-selftests for this (gtk, egl-headless), but one of them does require an X session, and both require ability to create opengl contexts on the host.
The following changes since commit ecfe26834922861ab69602b8c1aa404080f0fb0c:
libtool: Fix ignoring compiler-rt libs (2019-01-27 13:05:17 +0000)
are available in the Git repository at:
git://git.yoctoproject.org/poky-contrib akanavin/virgl-gtk
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/virgl-gtk
Alexander Kanavin (24):
gtk+3: enable native/nativesdk variant
gtk+3: remove the gtk-icon-utils-native recipe
shared-mime-info: update the database also in native builds pixbufcache.bbclass: remove a dependency loop introduced by enabling
gtk+3-native
meta: add native and nativesdk variants to various recipes to enable
gtk+3-native/nativesdk
libepoxy: enable native/nativesdk variants
mesa: enable native and nativesdk variants
virglrenderer: add a recipe
qemu: enable virglrenderer and glx options for native/nativesdk builds
qemu: drop --with-gtkabi option, as it is no longer supported
mesa-gl: do not enable nativesdk variant to avoid clashes with main
mesa recipe
local.conf.sample: adjust the qemu config to enable gtk+ instead of
sdl
qemu: build target variant with gtk+, and nativesdk variant without
sdl
qemu: remove support for building against host sdl
atk: disable gobject-introspection for nativesdk
qemu: add a gettext-native dependency to gtk option
libjpeg-turbo: fix nativesdk build in same way as native builds are
qemu: add a patch to avoid a missing definition error
qemu: add environment variable wrappers to make qemu look good with
gtk frontend
qemu: add a backported patch to fix egl-headless support
runqemu: add options for enabling virgl GL acceleration
runqemu: do not check for GL libraries
selftest: add tests for virgl GL acceleration
vte: allow building vte-native with gcc 4.8
meta-poky/conf/local.conf.sample | 9 +- meta-selftest/lib/oeqa/runtime/cases/virgl.py | 28 +++++ meta/classes/pixbufcache.bbclass | 2 +- meta/conf/distro/include/maintainers.inc | 1 + meta/lib/oeqa/selftest/cases/runtime_test.py | 50 +++++++++ meta/recipes-devtools/qemu/qemu.inc | 41 ++++--- .../qemu/0001-Add-a-missing-X11-include.patch | 65 +++++++++++ ...-egl-headless-add-egl_create_context.patch | 50 +++++++++ ...x-libcap-header-issue-on-some-distro.patch | 2 +- ...-messages-when-qemi_cpu_kick_thread-.patch | 2 +- meta/recipes-devtools/qemu/qemu_3.1.0.bb | 2 + .../gdk-pixbuf/gdk-pixbuf_2.36.11.bb | 2 +- .../gnome/adwaita-icon-theme_3.28.0.bb | 2 + meta/recipes-gnome/gtk+/gtk+3.inc | 28 ++++- .../gtk+/gtk-icon-utils-native_3.22.30.bb | 63 ----------- ...endency-from-gtk-encode-symbolic-svg.patch | 102 ------------------ .../hicolor-icon-theme_0.17.bb | 2 + meta/recipes-graphics/cairo/cairo_1.14.12.bb | 2 +- .../harfbuzz/harfbuzz_2.2.0.bb | 2 +- .../jpeg/libjpeg-turbo_2.0.1.bb | 3 +- .../libepoxy/libepoxy_1.5.3.bb | 16 +++ meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb | 2 + meta/recipes-graphics/mesa/mesa.inc | 20 ++-- meta/recipes-graphics/pango/pango_1.42.4.bb | 2 +- .../ttf-fonts/liberation-fonts_2.00.1.bb | 2 + .../0001-vtest-add-missing-includes.patch | 38 +++++++ .../virglrenderer/virglrenderer_git.bb | 19 ++++ .../xorg-lib/libxcomposite_0.4.4.bb | 2 +- .../xorg-lib/libxdamage_1.1.4.bb | 2 +- meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb | 2 + .../xorg-lib/libxtst_1.2.3.bb | 1 + .../recipes-support/atk/at-spi2-atk_2.30.0.bb | 2 + .../atk/at-spi2-core_2.30.0.bb | 1 + meta/recipes-support/atk/atk_2.30.0.bb | 4 +- .../shared-mime-info/shared-mime-info.inc | 2 + ...chool-asignment-to-avoid-gcc-4.8-err.patch | 27 +++++ meta/recipes-support/vte/vte_0.52.2.bb | 7 +- scripts/runqemu | 58 ++++------ 38 files changed, 422 insertions(+), 243 deletions(-) create mode 100644 meta-selftest/lib/oeqa/runtime/cases/virgl.py create mode 100644 meta/recipes-devtools/qemu/qemu/0001-Add-a-missing-X11-include.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0001-egl-headless-add-egl_create_context.patch delete mode 100644 meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.30.bb delete mode 100644 meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer_git.bb create mode 100644 meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch
Signature · 1 line
2.17.1
PATCH 1/24 gtk+3: enable native/nativesdk variant
Host-assisted GL in Qemu in theory works with both SDL and GTK; in practice SDL shows an empty screen. This prepares the switchover of graphical qemu to use native gtk, which also provides a neat set of menus to control the emulator.
--- meta/recipes-gnome/gtk+/gtk+3.inc | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
meta/recipes-gnome/gtk+/gtk+3.inc +23 -2
@@ -12,6 +12,10 @@ LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check gobject-introspection +BBCLASSEXTEND = "native nativesdk" + +GSETTINGS_PACKAGE_class-native = "" + # versions >= 3.90 are development versions, otherwise like upstream-version-is-even UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3\.([1-8]?[02468])+(\.\d+)+)\.tar"
@@ -51,14 +55,27 @@ PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl" PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/mesa wayland-native" PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" -do_install_append() { - mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 +prepare_gtk_scripts() { + mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 # duplicate gtk-query-immodules for post install script update_gtk_immodules_cache mkdir -p ${D}${libexecdir} ln ${D}${bindir}/gtk-query-immodules-3.0 ${D}${libexecdir}/${MLPREFIX}gtk-query-immodules-3.0 } +do_install_append_class-target() { + prepare_gtk_scripts +} + +do_install_append_class-nativesdk() { + prepare_gtk_scripts +} + +do_install_append_class-native() { + # provided by gtk-icon-utils-native + rm ${D}${bindir}/gtk-encode-symbolic-svg +} + PACKAGES =+ "${PN}-demo" LIBV = "3.0.0"
@@ -104,6 +121,10 @@ GTKBASE_RRECOMMENDS ?= "liberation-fonts \ shared-mime-info \ adwaita-icon-theme-symbolic \ " + +GTKBASE_RRECOMMENDS_class-native ?= "\ + " + GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}"
Signature · 1 line
2.17.1
PATCH 2/24 gtk+3: remove the gtk-icon-utils-native recipe
In reply to Alexander KanavinAs we are now build native gtk+3, it already provides the necessary utilities.
--- meta/recipes-gnome/gtk+/gtk+3.inc | 7 +- .../gtk+/gtk-icon-utils-native_3.22.30.bb | 63 ----------- ...endency-from-gtk-encode-symbolic-svg.patch | 102 ------------------ 3 files changed, 5 insertions(+), 167 deletions(-) delete mode 100644 meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.30.bb delete mode 100644 meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
meta/recipes-gnome/gtk+/gtk+3.inc +5 -2
@@ -72,10 +72,13 @@ do_install_append_class-nativesdk() { } do_install_append_class-native() { - # provided by gtk-icon-utils-native - rm ${D}${bindir}/gtk-encode-symbolic-svg + create_wrapper ${D}/${bindir}/gtk-update-icon-cache \ + GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/2.10.0/loaders.cache + create_wrapper ${D}/${bindir}/gtk-encode-symbolic-svg \ + GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/2.10.0/loaders.cache } +PROVIDES += "gtk-icon-utils" PACKAGES =+ "${PN}-demo" LIBV = "3.0.0"
meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.30.bb deleted +0 -63
63 lines not on this page · raw message
meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch deleted +0 -102
102 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 3/24 shared-mime-info: update the database also in native builds
In reply to Alexander KanavinOtherwise glib-compile-resources fails when building gtk+3-native.
--- meta/recipes-support/shared-mime-info/shared-mime-info.inc | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-support/shared-mime-info/shared-mime-info.inc +2 -0
@@ -30,6 +30,8 @@ do_install () { do_install_class-native () { autotools_do_install + + ${B}/update-mime-database ${D}${datadir}/mime } BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
PATCH 4/24 pixbufcache.bbclass: remove a dependency loop introduced by enabling gtk+3-native
In reply to Alexander Kanavin--- meta/classes/pixbufcache.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/pixbufcache.bbclass +1 -1
@@ -3,7 +3,7 @@ # packages. # -DEPENDS += "qemu-native" +DEPENDS_append_class-target = " qemu-native" inherit qemu PIXBUF_PACKAGES ??= "${PN}"
Signature · 1 line
2.17.1
PATCH 5/24 meta: add native and nativesdk variants to various recipes to enable gtk+3-native/nativesdk
In reply to Alexander Kanavin--- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb | 2 +- meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb | 2 ++ .../recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb | 2 ++ meta/recipes-graphics/cairo/cairo_1.14.12.bb | 2 +- meta/recipes-graphics/harfbuzz/harfbuzz_2.2.0.bb | 2 +- meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb | 2 +- meta/recipes-graphics/pango/pango_1.42.4.bb | 2 +- meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb | 2 ++ meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb | 2 +- meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb | 2 +- meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb | 2 ++ meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb | 1 + meta/recipes-support/atk/at-spi2-atk_2.30.0.bb | 2 ++ meta/recipes-support/atk/at-spi2-core_2.30.0.bb | 1 + meta/recipes-support/atk/atk_2.30.0.bb | 2 +- meta/recipes-support/vte/vte_0.52.2.bb | 2 ++ 16 files changed, 22 insertions(+), 8 deletions(-)
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb +1 -1
@@ -99,4 +99,4 @@ do_install_append_class-native() { GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk"
meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb +2 -0
@@ -42,3 +42,5 @@ FILES_${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/ \ ${prefix}/share/icons/Adwaita/512x512/" FILES_${PN} = "${prefix}/share/icons/Adwaita/ \ ${prefix}/share/pkgconfig/adwaita-icon-theme.pc" + +BBCLASSEXTEND = "native nativesdk"
meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb +2 -0
@@ -12,3 +12,5 @@ SRC_URI[sha256sum] = "317484352271d18cbbcfac3868eab798d67fff1b8402e740baa6ff41d5 inherit allarch autotools FILES_${PN} += "${datadir}/icons" + +BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/cairo/cairo_1.14.12.bb +1 -1
@@ -84,4 +84,4 @@ FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" FILES_${PN}-perf-utils = "${bindir}/cairo-trace* ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.*" FILES_${PN}-dev += "${libdir}/cairo/*.so" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/harfbuzz/harfbuzz_2.2.0.bb +1 -1
@@ -37,4 +37,4 @@ FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ ${libdir}/pkgconfig/harfbuzz-icu.pc \ " -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb +1 -1
@@ -53,4 +53,4 @@ FILES_jpeg-tools = "${bindir}/*" DESCRIPTION_libturbojpeg = "A SIMD-accelerated JPEG codec which provides only TurboJPEG APIs" FILES_libturbojpeg = "${libdir}/libturbojpeg.so.*" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/pango/pango_1.42.4.bb +1 -1
@@ -42,4 +42,4 @@ RDEPENDS_${PN}-ptest += "liberation-fonts cantarell-fonts" RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ pango-module-basic-fc pango-module-arabic-lang" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb +2 -0
@@ -37,3 +37,5 @@ do_install () { PACKAGES = "${PN}" FILES_${PN} += "${sysconfdir} ${datadir}" + +BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb +1 -1
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1" DEPENDS += " xorgproto virtual/libx11 libxfixes libxext" PROVIDES = "xcomposite" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" PE = "1"
meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb +1 -1
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fe101f30dd24134cf43146863241868" DEPENDS += "virtual/libx11 xorgproto libxfixes" PROVIDES = "xdamage" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" PE = "1"
meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb +2 -0
@@ -20,3 +20,5 @@ XORG_PN = "libXi" SRC_URI[md5sum] = "1f0f2719c020655a60aee334ddd26d67" SRC_URI[sha256sum] = "c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45" +BBCLASSEXTEND = "native nativesdk" +
meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb +1 -0
@@ -19,3 +19,4 @@ XORG_PN = "libXtst" SRC_URI[md5sum] = "ef8c2c1d16a00bd95b9fdcef63b8a2ca" SRC_URI[sha256sum] = "4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204" +BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/atk/at-spi2-atk_2.30.0.bb +2 -0
@@ -18,3 +18,5 @@ PACKAGES =+ "${PN}-gnome ${PN}-gtk2" FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" + +BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/atk/at-spi2-core_2.30.0.bb +1 -0
@@ -38,3 +38,4 @@ FILES_${PN} += "${datadir}/dbus-1/services/*.service \ ${datadir}/defaults/at-spi2 \ ${systemd_user_unitdir}/at-spi-dbus-bus.service \ " +BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/atk/atk_2.30.0.bb +1 -1
@@ -33,5 +33,5 @@ SRC_URI_append = " \ SRC_URI[archive.md5sum] = "769c85005d392ad17ffbc063f2d26454" SRC_URI[archive.sha256sum] = "dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/vte/vte_0.52.2.bb +2 -0
@@ -44,3 +44,5 @@ EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool PACKAGES =+ "libvte" FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" + +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
PATCH 6/24 libepoxy: enable native/nativesdk variants
In reply to Alexander Kanavinlibepoxy is a requirement of virglrenderer. Note that we strip RPATH from the library, as this allows fall-through to the host GL implementation, instead of attempting (and failing) to use mesa-native.
--- meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb +16 -0
@@ -14,9 +14,25 @@ UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" inherit meson pkgconfig distro_features_check REQUIRED_DISTRO_FEATURES = "opengl" +REQUIRED_DISTRO_FEATURES_class-native = "" +REQUIRED_DISTRO_FEATURES_class-nativesdk = "" PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl" PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl" EXTRA_OEMESON += "-Dtests=false" + +PACKAGECONFIG_class-native = "egl" +PACKAGECONFIG_class-nativesdk = "egl" + +BBCLASSEXTEND = "native nativesdk" + +# This will ensure that dlopen will attempt only GL libraries provided by host +do_install_append_class-native() { + chrpath --delete ${D}${libdir}/*.so +} + +do_install_append_class-nativesdk() { + chrpath --delete ${D}${libdir}/*.so +}
Signature · 1 line
2.17.1
PATCH 7/24 mesa: enable native and nativesdk variants
In reply to Alexander KanavinNote that only the most minimal necessary subset of mesa is built; particularly we don't build any drivers as that is offloaded to the GL implementation provided by the host.
--- meta/recipes-graphics/mesa/mesa.inc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
meta/recipes-graphics/mesa/mesa.inc +13 -7
@@ -26,7 +26,9 @@ PROVIDES = " \ inherit autotools pkgconfig python3native gettext distro_features_check -ANY_OF_DISTRO_FEATURES = "opengl vulkan" +BBCLASSEXTEND = "native nativesdk" + +ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)} \
@@ -42,11 +44,13 @@ EXTRA_OECONF = "--enable-shared-glapi \ --with-llvm-prefix=${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE} \ --with-platforms='${PLATFORMS}'" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri', '', d)} \ +PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium', '', d)} \ ${@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" # "gbm" requires "dri", "opengl" PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
@@ -58,17 +62,19 @@ PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" DRIDRIVERS = "swrast" -DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" -DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" +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 # radeon could be enabled as well but requires gallium-llvm with llvm >= 3.9 VULKAN_DRIVERS = "" -VULKAN_DRIVERS_append_x86 = ",intel" -VULKAN_DRIVERS_append_x86-64 = ",intel" +VULKAN_DRIVERS_append_x86_class-target = ",intel" +VULKAN_DRIVERS_append_x86-64_class-target = ",intel" PACKAGECONFIG[vulkan] = "--with-vulkan-drivers=${VULKAN_DRIVERS}, --without-vulkan-drivers, python3-mako-native" PACKAGECONFIG[opengl] = "--enable-opengl, --disable-opengl"
Signature · 1 line
2.17.1
PATCH 8/24 virglrenderer: add a recipe
In reply to Alexander KanavinThis component enables hardware-accelerated GL inside QEMU guests. For more information, see here:
https://lwn.net/Articles/767970/
https://www.collabora.com/news-and-blog/blog/2018/02/12/virtualizing-gpu-access/
https://www.collabora.com/news-and-blog/blog/2018/05/09/gpu-virtualization-update/
--- meta/conf/distro/include/maintainers.inc | 1 + .../0001-vtest-add-missing-includes.patch | 38 +++++++++++++++++++ .../virglrenderer/virglrenderer_git.bb | 19 ++++++++++ 3 files changed, 58 insertions(+) create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer_git.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -700,6 +700,7 @@ RECIPE_MAINTAINER_pn-util-macros = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-valgrind = "Alexander Kanavin <[email protected]>" +RECIPE_MAINTAINER_pn-virglrenderer = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi <[email protected]>" RECIPE_MAINTAINER_pn-vte = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER_pn-vulkan = "Ross Burton <[email protected]>"
meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 05c5c5f43fbffb3317bd9da27d414890d2ef493c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 18 Jan 2019 13:47:23 +0100 +Subject: [PATCH] vtest: add missing includes + +This fixes build failures with musl C library + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/125] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + vtest/util.c | 1 + + vtest/vtest_server.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/vtest/util.c b/vtest/util.c +index 0d3c78f..c605253 100644 +--- a/vtest/util.c ++++ b/vtest/util.c +@@ -26,6 +26,7 @@ + #include <stdio.h> + #include <string.h> + #include <unistd.h> ++#include <sys/select.h> + + int vtest_wait_for_fd_read(int fd) + { +diff --git a/vtest/vtest_server.c b/vtest/vtest_server.c +index bc6c95f..010721f 100644 +--- a/vtest/vtest_server.c ++++ b/vtest/vtest_server.c +@@ -31,6 +31,7 @@ + #include <netinet/in.h> + #include <sys/un.h> + #include <fcntl.h> ++#include <string.h> + + #include "util.h" + #include "vtest.h"
meta/recipes-graphics/virglrenderer/virglrenderer_git.bb new file +19 -0
@@ -0,0 +1,19 @@ +SUMMARY = "VirGL virtual OpenGL renderer" +HOMEPAGE = "https://virgil3d.github.io/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" + +DEPENDS = "libdrm mesa libepoxy" +PV = "0.7.0" +SRCREV = "402c228861c9893f64cffbbcb4cb23044b8c721c" +SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ + file://0001-vtest-add-missing-includes.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native nativesdk" +
Signature · 1 line
2.17.1
PATCH 9/24 qemu: enable virglrenderer and glx options for native/nativesdk builds
In reply to Alexander KanavinExcept for ming32/darwin, which do not support them.
--- meta/recipes-devtools/qemu/qemu.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +5 -5
@@ -74,15 +74,15 @@ PACKAGECONFIG ??= " \ fdt sdl kvm \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ " -PACKAGECONFIG_class-native ??= "fdt alsa kvm" -PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm" +PACKAGECONFIG_class-native ??= "fdt alsa kvm virglrenderer glx" +PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm virglrenderer glx" # Handle distros such as CentOS 5 32-bit that do not have kvm support PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" -# Disable kvm on targets that do not support it -PACKAGECONFIG_remove_darwin = "kvm" -PACKAGECONFIG_remove_mingw32 = "kvm" +# Disable kvm/virgl/mesa on targets that do not support it +PACKAGECONFIG_remove_darwin = "kvm virglrenderer glx gtk+" +PACKAGECONFIG_remove_mingw32 = "kvm virglrenderer glx gtk+" PACKAGECONFIG[sdl] = "--enable-sdl --with-sdlabi=2.0,--disable-sdl,libsdl2" PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr,"
Signature · 1 line
2.17.1
PATCH 10/24 qemu: drop --with-gtkabi option, as it is no longer supported
In reply to Alexander KanavinRecent qemu versions support gtk+3 only.
--- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/qemu/qemu.inc +1 -1
@@ -95,7 +95,7 @@ PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl," PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss," PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses," -PACKAGECONFIG[gtk+] = "--enable-gtk --with-gtkabi=3.0 --enable-vte,--disable-gtk --disable-vte,gtk+3 vte" +PACKAGECONFIG[gtk+] = "--enable-gtk --enable-vte,--disable-gtk --disable-vte,gtk+3 vte" PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng," PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt,"
Signature · 1 line
2.17.1
PATCH 11/24 mesa-gl: do not enable nativesdk variant to avoid clashes with main mesa recipe
In reply to Alexander KanavinAn alternative would be setting PREFERRED_PROVIDER, but for native/nativesdk builds mesa-gl is not a viable alternative to mesa, as it lacks all of the bits that make accelerated qemu possible. Using PREFERRED_PROVIDER would imply otherwise.
--- meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb +2 -0
@@ -7,3 +7,5 @@ PROVIDES = "virtual/libgl virtual/mesa" S = "${WORKDIR}/mesa-${PV}" PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" + +BBCLASSEXTEND_remove = "nativesdk"
Signature · 1 line
2.17.1
PATCH 12/24 local.conf.sample: adjust the qemu config to enable gtk+ instead of sdl
In reply to Alexander Kanavin--- meta-poky/conf/local.conf.sample | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
meta-poky/conf/local.conf.sample +3 -6
@@ -236,12 +236,9 @@ BB_DISKMON_DIRS ??= "\ # Qemu configuration # # By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. By default libsdl2-native will -# be built, if you want to use your host's libSDL instead of the minimal libsdl built -# by libsdl2-native then uncomment the ASSUME_PROVIDED line below. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl2-native" +# seen. The two lines below enable the Gtk UI frontend. +PACKAGECONFIG_append_pn-qemu-native = " gtk+" +PACKAGECONFIG_append_pn-nativesdk-qemu = " gtk+" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if
Signature · 1 line
2.17.1
PATCH 13/24 qemu: build target variant with gtk+, and nativesdk variant without sdl
In reply to Alexander KanavinAs sdl is deprecated in favor of gtk+, it should not be the default.
--- meta/recipes-devtools/qemu/qemu.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +2 -2
@@ -71,11 +71,11 @@ do_install_append() { # END of qemu-mips workaround PACKAGECONFIG ??= " \ - fdt sdl kvm \ + fdt gtk+ kvm \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ " PACKAGECONFIG_class-native ??= "fdt alsa kvm virglrenderer glx" -PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm virglrenderer glx" +PACKAGECONFIG_class-nativesdk ??= "fdt kvm virglrenderer glx" # Handle distros such as CentOS 5 32-bit that do not have kvm support PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
Signature · 1 line
2.17.1
PATCH 14/24 qemu: remove support for building against host sdl
In reply to Alexander KanavinThis hasn't been the default for a long time (as some distros don't support it), and with gtk+ being the new default shouldn't be needed at all.
--- meta/recipes-devtools/qemu/qemu.inc | 8 -------- 1 file changed, 8 deletions(-)
meta/recipes-devtools/qemu/qemu.inc +0 -8
@@ -39,14 +39,6 @@ export LIBTOOL="${HOST_SYS}-libtool" B = "${WORKDIR}/build" -do_configure_prepend_class-native() { - # Append build host pkg-config paths for native target since the host may provide sdl - BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") - if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH - fi -} - do_configure() { ${S}/configure ${EXTRA_OECONF} }
Signature · 1 line
2.17.1
PATCH 15/24 atk: disable gobject-introspection for nativesdk
In reply to Alexander KanavinWe do not support g-i for nativesdk, neverthless atk tries and fails.
--- meta/recipes-support/atk/atk_2.30.0.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-support/atk/atk_2.30.0.bb +2 -0
@@ -20,6 +20,8 @@ GTKDOC_DISABLE_FLAG = "-Ddocs=false" GI_ENABLE_FLAG = "-Dintrospection=true" GI_DISABLE_FLAG = "-Dintrospection=false" +EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}" + EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ '${GI_DISABLE_FLAG}', d)} "
Signature · 1 line
2.17.1
PATCH 16/24 qemu: add a gettext-native dependency to gtk option
In reply to Alexander Kanavinxgettext/msgmerge is used during do_install() when gtk is enabled:
https://github.com/qemu/qemu/blob/master/Makefile#L743
--- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/qemu/qemu.inc +1 -1
@@ -87,7 +87,7 @@ PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl," PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss," PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses," -PACKAGECONFIG[gtk+] = "--enable-gtk --enable-vte,--disable-gtk --disable-vte,gtk+3 vte" +PACKAGECONFIG[gtk+] = "--enable-gtk --enable-vte,--disable-gtk --disable-vte,gtk+3 vte gettext-native" PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng," PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt,"
Signature · 1 line
2.17.1
PATCH 17/24 libjpeg-turbo: fix nativesdk build in same way as native builds are
In reply to Alexander Kanavin--- meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb +1 -0
@@ -31,6 +31,7 @@ inherit cmake pkgconfig # Add nasm-native dependency consistently for all build arches is hard EXTRA_OECMAKE_append_class-native = " -DWITH_SIMD=False" +EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_SIMD=False" # Work around missing x32 ABI support EXTRA_OECMAKE_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "-DWITH_SIMD=False", "", d)}"
Signature · 1 line
2.17.1
PATCH 18/24 qemu: add a patch to avoid a missing definition error
In reply to Alexander Kanavin| In file included from /home/alexander/development/poky/build-virgl-gtk-64/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-qemu/3.1.0-r0/qemu-3.1.0/include/ui/egl-context.h:5, | from /home/alexander/development/poky/build-virgl-gtk-64/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-qemu/3.1.0-r0/qemu-3.1.0/ui/egl-context.c:3: | /home/alexander/development/poky/build-virgl-gtk-64/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-qemu/3.1.0-r0/qemu-3.1.0/include/ui/egl-helpers.h:46:55: error: unknown type name 'Window'; did you mean 'minor'? | EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win); | ^~~~~~ | minor
--- .../qemu/0001-Add-a-missing-X11-include.patch | 65 +++++++++++++++++++ ...x-libcap-header-issue-on-some-distro.patch | 2 +- ...-messages-when-qemi_cpu_kick_thread-.patch | 2 +- meta/recipes-devtools/qemu/qemu_3.1.0.bb | 1 + 4 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-Add-a-missing-X11-include.patch
meta/recipes-devtools/qemu/qemu/0001-Add-a-missing-X11-include.patch new file +65 -0
@@ -0,0 +1,65 @@ +From eb1a215a4f86dde4493c3e22ad9f6d698850915e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 20 Dec 2018 18:06:29 +0100 +Subject: [PATCH] egl-helpers.h: do not depend on X11 Window type, use + EGLNativeWindowType + +It was assumed that mesa provides the necessary X11 includes, +but it is not always the case, as it can be configured without x11 support. + +Upstream-Status: Submitted [http://lists.nongnu.org/archive/html/qemu-devel/2019-01/msg03706.html] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + include/ui/egl-helpers.h | 2 +- + ui/egl-helpers.c | 4 ++-- + ui/gtk-egl.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h +index 9db7293b..3fc656a7 100644 +--- a/include/ui/egl-helpers.h ++++ b/include/ui/egl-helpers.h +@@ -43,7 +43,7 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf); + + #endif + +-EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win); ++EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win); + + int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode); + int qemu_egl_init_dpy_mesa(EGLNativeDisplayType dpy, DisplayGLMode mode); +diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c +index 4f475142..5e115b3f 100644 +--- a/ui/egl-helpers.c ++++ b/ui/egl-helpers.c +@@ -273,14 +273,14 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf) + + /* ---------------------------------------------------------------------- */ + +-EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win) ++EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win) + { + EGLSurface esurface; + EGLBoolean b; + + esurface = eglCreateWindowSurface(qemu_egl_display, + qemu_egl_config, +- (EGLNativeWindowType)win, NULL); ++ win, NULL); + if (esurface == EGL_NO_SURFACE) { + error_report("egl: eglCreateWindowSurface failed"); + return NULL; +diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c +index 5420c236..1f941162 100644 +--- a/ui/gtk-egl.c ++++ b/ui/gtk-egl.c +@@ -54,7 +54,7 @@ void gd_egl_init(VirtualConsole *vc) + } + + vc->gfx.ectx = qemu_egl_init_ctx(); +- vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, x11_window); ++ vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, (EGLNativeWindowType)x11_window); + + assert(vc->gfx.esurface); + }
meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch +1 -1
@@ -1,4 +1,4 @@ -From 091a16100a7e1e9e6493663392c5ba2884b99723 Mon Sep 17 00:00:00 2001 +From d3e0b8dac7c2eb20d7fcff747bc98b981f4398ef Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Tue, 12 Mar 2013 09:54:06 +0800 Subject: [PATCH] fix libcap header issue on some distro
meta/recipes-devtools/qemu/qemu/0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch +1 -1
@@ -1,4 +1,4 @@ -From 3eeeaa45dd12c9f3942cfc8647a08c93fffe19ea Mon Sep 17 00:00:00 2001 +From 861c522df7791d7e93743d5641f3ef2a5a3c4632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <[email protected]> Date: Wed, 12 Aug 2015 15:11:30 -0500 Subject: [PATCH] cpus.c: Add error messages when qemi_cpu_kick_thread fails.
meta/recipes-devtools/qemu/qemu_3.1.0.bb +1 -0
@@ -21,6 +21,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0009-apic-fixup-fallthrough-to-PIC.patch \ file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \ + file://0001-Add-a-missing-X11-include.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.17.1
PATCH 19/24 qemu: add environment variable wrappers to make qemu look good with gtk frontend
In reply to Alexander KanavinGTK_THEME instructs gtk to use its built-in theme. Otherwise gtk attempts to use the theme from the host, which may be from a totally mismatching gtk version.
On the other hand FONTCONFIG_PATH tells it to use the host fonts, as providing fonts in the native sysroot and instructing the components to use them is a lot more tricky.
GDK_PIXBUF_MODULE_FILE is set, because otherwise qemu works but fills stdout with error messages, which eventually fill the pipe they go into. That pipe is read from only when qemu exits (to collect any error messages) by runqemu script. The pipe fill-up causes the qemu process to lock up.
--- meta/recipes-devtools/qemu/qemu.inc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
meta/recipes-devtools/qemu/qemu.inc +19 -0
@@ -48,6 +48,25 @@ do_install () { oe_runmake 'DESTDIR=${D}' install } +make_qemu_wrapper() { + gdk_pixbuf_module_file=`pkg-config --variable=gdk_pixbuf_cache_file gdk-pixbuf-2.0` + + for tool in `ls ${D}${bindir}/qemu-system-*`; do + create_wrapper $tool \ + GDK_PIXBUF_MODULE_FILE=$gdk_pixbuf_module_file \ + FONTCONFIG_PATH=/etc/fonts \ + GTK_THEME=Adwaita + done +} + +do_install_append_class-native() { + ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} +} + +do_install_append_class-nativesdk() { + ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} +} + # The following fragment will create a wrapper for qemu-mips user emulation # binary in order to work around a segmentation fault issue. Basically, by # default, the reserved virtual address space for 32-on-64 bit is set to 4GB.
Signature · 1 line
2.17.1
PATCH 20/24 qemu: add a backported patch to fix egl-headless support
In reply to Alexander Kanavin--- ...-egl-headless-add-egl_create_context.patch | 50 +++++++++++++++++++ meta/recipes-devtools/qemu/qemu_3.1.0.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-egl-headless-add-egl_create_context.patch
meta/recipes-devtools/qemu/qemu/0001-egl-headless-add-egl_create_context.patch new file +50 -0
@@ -0,0 +1,50 @@ +From 952e5d584f5aabe41298c278065fe628f3f7aa7a Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann <[email protected]> +Date: Thu, 29 Nov 2018 13:35:02 +0100 +Subject: [PATCH] egl-headless: add egl_create_context + +We must set the correct context (via eglMakeCurrent) before +calling qemu_egl_create_context, so we need a thin wrapper and can't +hook qemu_egl_create_context directly as ->dpy_gl_ctx_create callback. + +Reported-by: Frederik Carlier <[email protected]> +Signed-off-by: Gerd Hoffmann <[email protected]> +Message-id: [email protected] + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=952e5d584f5aabe41298c278065fe628f3f7aa7a] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + ui/egl-headless.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/ui/egl-headless.c b/ui/egl-headless.c +index 4cf3bbc0e4..519e7bad32 100644 +--- a/ui/egl-headless.c ++++ b/ui/egl-headless.c +@@ -38,6 +38,14 @@ static void egl_gfx_switch(DisplayChangeListener *dcl, + edpy->ds = new_surface; + } + ++static QEMUGLContext egl_create_context(DisplayChangeListener *dcl, ++ QEMUGLParams *params) ++{ ++ eglMakeCurrent(qemu_egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, ++ qemu_egl_rn_ctx); ++ return qemu_egl_create_context(dcl, params); ++} ++ + static void egl_scanout_disable(DisplayChangeListener *dcl) + { + egl_dpy *edpy = container_of(dcl, egl_dpy, dcl); +@@ -150,7 +158,7 @@ static const DisplayChangeListenerOps egl_ops = { + .dpy_gfx_update = egl_gfx_update, + .dpy_gfx_switch = egl_gfx_switch, + +- .dpy_gl_ctx_create = qemu_egl_create_context, ++ .dpy_gl_ctx_create = egl_create_context, + .dpy_gl_ctx_destroy = qemu_egl_destroy_context, + .dpy_gl_ctx_make_current = qemu_egl_make_context_current, + .dpy_gl_ctx_get_current = qemu_egl_get_current_context, +-- +2.17.1 +
meta/recipes-devtools/qemu/qemu_3.1.0.bb +1 -0
@@ -22,6 +22,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \ file://0001-Add-a-missing-X11-include.patch \ + file://0001-egl-headless-add-egl_create_context.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.17.1
PATCH 21/24 runqemu: add options for enabling virgl GL acceleration
In reply to Alexander Kanavin--- scripts/runqemu | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
scripts/runqemu +23 -0
@@ -74,6 +74,9 @@ of the following environment variables (in any order): MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified) Simplified QEMU command-line options can be passed with: nographic - disable video console + gl - enable virgl-based GL acceleration + gl-es - enable virgl-based GL acceleration, using OpenGL ES + egl-headless - enable headless EGL output; use vnc or spice to see it serial - enable a serial console on /dev/ttyS0 serialstdio - enable a serial console on the console (regardless of graphics mode) slirp - enable user networking, no root privileges is required
@@ -433,6 +436,26 @@ class BaseConfig(object): elif arg == 'nographic': self.qemu_opt_script += ' -nographic' self.kernel_cmdline_script += ' console=ttyS0' + elif arg == 'gl': + self.qemu_opt_script += ' -vga virtio -display gtk,gl=on' + elif arg == 'gl-es': + self.qemu_opt_script += ' -vga virtio -display gtk,gl=es' + elif arg == 'egl-headless': + self.qemu_opt_script += ' -vga virtio -display egl-headless' + # As runqemu can be run within bitbake (when using testimage, for example), + # we need to ensure that we run host pkg-config, and that it does not + # get mis-directed to native build paths set by bitbake. + try: + del os.environ['PKG_CONFIG_PATH'] + del os.environ['PKG_CONFIG_DIR'] + del os.environ['PKG_CONFIG_LIBDIR'] + except KeyError: + pass + try: + dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH pkg-config --variable=dridriverdir dri", shell=True) + except subprocess.CalledProcessError as e: + raise RunQemuError("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.") + os.environ['LIBGL_DRIVERS_PATH'] = dripath.decode('utf-8').strip() elif arg == 'serial': self.kernel_cmdline_script += ' console=ttyS0' self.serialconsole = True
Signature · 1 line
2.17.1
PATCH 22/24 runqemu: do not check for GL libraries
In reply to Alexander Kanavinqemu has been using libepoxy for a long time, and libepoxy loads GL via dlopen() only when instructed to.
--- scripts/runqemu | 35 ----------------------------------- 1 file changed, 35 deletions(-)
scripts/runqemu +0 -35
@@ -118,39 +118,6 @@ def check_tun(): if not os.access(dev_tun, os.W_OK): raise RunQemuError("TUN control device %s is not writable, please fix (e.g. sudo chmod 666 %s)" % (dev_tun, dev_tun)) -def check_libgl(qemu_bin): - cmd = ('ldd', qemu_bin) - logger.debug('Running %s...' % str(cmd)) - need_gl = subprocess.check_output(cmd).decode('utf-8') - if re.search('libGLU', need_gl): - # We can't run without a libGL.so - libgl = False - check_files = (('/usr/lib/libGL.so', '/usr/lib/libGLU.so'), \ - ('/usr/lib64/libGL.so', '/usr/lib64/libGLU.so'), \ - ('/usr/lib/*-linux-gnu/libGL.so', '/usr/lib/*-linux-gnu/libGLU.so')) - - for (f1, f2) in check_files: - if re.search('\*', f1): - for g1 in glob.glob(f1): - if libgl: - break - if os.path.exists(g1): - for g2 in glob.glob(f2): - if os.path.exists(g2): - libgl = True - break - if libgl: - break - else: - if os.path.exists(f1) and os.path.exists(f2): - libgl = True - break - if not libgl: - logger.error("You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.") - logger.error("Ubuntu package names are: libgl1-mesa-dev and libglu1-mesa-dev.") - logger.error("Fedora package names are: mesa-libGL-devel mesa-libGLU-devel.") - raise RunQemuError('%s requires libGLU, but not found' % qemu_bin) - def get_first_file(cmds): """Return first file found in wildcard cmds""" for cmd in cmds:
@@ -1178,8 +1145,6 @@ class BaseConfig(object): if not os.access(qemu_bin, os.X_OK): raise OEPathError("No QEMU binary '%s' could be found" % qemu_bin) - check_libgl(qemu_bin) - self.qemu_opt = "%s %s %s %s" % (qemu_bin, self.get('NETWORK_CMD'), self.get('ROOTFS_OPTIONS'), self.get('QB_OPT_APPEND')) for ovmf in self.ovmf_bios:
Signature · 1 line
2.17.1
PATCH 23/24 selftest: add tests for virgl GL acceleration
In reply to Alexander KanavinNote that the tests require that the host machine has a X display, has mesa development files installed and is able to create OpenGL contexts.
--- meta-selftest/lib/oeqa/runtime/cases/virgl.py | 28 +++++++++++ meta/lib/oeqa/selftest/cases/runtime_test.py | 50 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 meta-selftest/lib/oeqa/runtime/cases/virgl.py
meta-selftest/lib/oeqa/runtime/cases/virgl.py new file +28 -0
@@ -0,0 +1,28 @@ +from oeqa.runtime.case import OERuntimeTestCase +from oeqa.core.decorator.depends import OETestDepends +import subprocess +import oe + +class VirglTest(OERuntimeTestCase): + + @OETestDepends(['ssh.SSHTest.test_ssh']) + def test_kernel_driver(self): + status, output = self.target.run('dmesg|grep virgl') + self.assertEqual(status, 0, "Checking for virgl driver in dmesg returned non-zero: %d\n%s" % (status, output)) + self.assertIn("virgl 3d acceleration enabled", output, "virgl acceleration seems to be disabled:\n%s" %(output)) + + @OETestDepends(['virgl.VirglTest.test_kernel_driver']) + def test_kmscube(self): + from fnmatch import fnmatch + + try: + distro = oe.lsb.distro_identifier() + except Exception: + distro = None + + if distro and fnmatch(distro, 'centos-7'): + self.skipTest('kmscube is not working when centos 7 is the host OS') + + status, output = self.target.run('kmscube', timeout=30) + self.assertEqual(status, 0, "kmscube exited with non-zero status %d and output:\n%s" %(status, output)) + self.assertIn('renderer: "virgl"', output, "kmscube does not seem to use virgl:\n%s" %(output))
meta/lib/oeqa/selftest/cases/runtime_test.py +50 -0
56 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 24/24 vte: allow building vte-native with gcc 4.8
In reply to Alexander Kanavin--- ...chool-asignment-to-avoid-gcc-4.8-err.patch | 27 +++++++++++++++++++ meta/recipes-support/vte/vte_0.52.2.bb | 5 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch
meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 442da9076b52003743ffc6fd7b9d647de6d7aa8f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 17 Jan 2019 16:37:54 +0100 +Subject: [PATCH] app.cc: use old school asignment to avoid gcc 4.8 error + +This is needed to build vte-native on Centos 7, +and can be dropped once that OS is no longer supported. + +Upstream-Status: Inappropriate [ancient compiler fix] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/app/app.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/app/app.cc b/src/app/app.cc +index d424064..675d789 100644 +--- a/src/app/app.cc ++++ b/src/app/app.cc +@@ -306,7 +306,7 @@ public: + else + alpha = get_alpha(); + +- GdkRGBA color{bg_color}; ++ GdkRGBA color = bg_color; + color.alpha = alpha; + return color; + }
meta/recipes-support/vte/vte_0.52.2.bb +3 -2
@@ -9,8 +9,9 @@ inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \ - ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ - " + ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ + file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \ + " SRC_URI[archive.md5sum] = "de8181350dccb010e915e366bdd06d18" SRC_URI[archive.sha256sum] = "0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af"
Signature · 1 line
2.17.1
Re: [PATCH 24/24] vte: allow building vte-native with gcc 4.8
Quoted 14 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- ...chool-asignment-to-avoid-gcc-4.8-err.patch | 27 +++++++++++++++++++ meta/recipes-support/vte/vte_0.52.2.bb | 5 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patchmeta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch new file +0
-0
meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch line 8
Quoted 8 lines
meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch new file +8
-0@@ -0,0 +1,27 @@ +From 442da9076b52003743ffc6fd7b9d647de6d7aa8f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Thu, 17 Jan 2019 16:37:54 +0100 +Subject: [PATCH] app.cc: use old school asignment to avoid gcc 4.8 error + +This is needed to build vte-native on Centos 7, +and can be dropped once that OS is no longer supported. +
Its fine but it would be good to know what the error it.
Quoted 43 lines
meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch new file +19
-0+Upstream-Status: Inappropriate [ancient compiler fix] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + src/app/app.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/app/app.cc b/src/app/app.cc +index d424064..675d789 100644 +--- a/src/app/app.cc ++++ b/src/app/app.cc +@@ -306,7 +306,7 @@ public: + else + alpha = get_alpha(); + +- GdkRGBA color{bg_color}; ++ GdkRGBA color = bg_color; + color.alpha = alpha; + return color; + }meta/recipes-support/vte/vte_0.52.2.bb +3
-3@@ -9,8 +9,9 @@ inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \ - ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ - " + ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ + file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \ + " SRC_URI[archive.md5sum] = "de8181350dccb010e915e366bdd06d18" SRC_URI[archive.sha256sum] = "0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af" --2.17.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 24/24] vte: allow building vte-native with gcc 4.8
Quoted 3 lines · Khem Raj
Its fine but it would be good to know what the error it.
Quoted 2 lines
+- GdkRGBA color{bg_color}; ++ GdkRGBA color = bg_color;
Sadly I lost the specific error message, but it was basically not recognizing the above syntax.
Alex
Re: [PATCH 11/24] mesa-gl: do not enable nativesdk variant to avoid clashes with main mesa recipe
In reply to Alexander KanavinQuoted 23 lines · Alexander Kanavin
An alternative would be setting
PREFERRED_PROVIDER, but for native/nativesdk
builds mesa-gl is not a viable alternative to mesa, as it lacks all of the
bits that make accelerated qemu possible. UsingPREFERRED_PROVIDERwould
imply otherwise.Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb | 2 ++ 1 file changed, 2 insertions(+)meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb +0
-0@@ -7,3 +7,5 @@ PROVIDES = "virtual/libgl virtual/mesa" S = "${WORKDIR}/mesa-${PV}" PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES','x11', d)}"
meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb PROVIDES = "virtual/libgl virtual/mesa" · line 11
Quoted 2 lines
meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb +2
-0+ +BBCLASSEXTEND_remove = "nativesdk"
I really hate using remove in OE-Core. Lets find a different way to do this please as if we do this, its nearly impossible to undo in another layer...
Cheers,
Richard
Re: [PATCH 11/24] mesa-gl: do not enable nativesdk variant to avoid clashes with main mesa recipe
Quoted 3 lines · Richard Purdie
I really hate using remove in OE-Core. Lets find a different way to do this please as if we do this, its nearly impossible to undo in another layer...
Sure, I think moving 'BBCLASSEXTEND = "native nativesdk"' from mesa.inc to mesa_*.bb should sort this.
Alex
Re: [PATCH 11/24] mesa-gl: do not enable nativesdk variant to avoid clashes with main mesa recipe
Quoted 6 lines · Alexander Kanavin
Quoted 3 lines
I really hate using remove in OE-Core. Lets find a different way to do this please as if we do this, its nearly impossible to undo in another layer...
Sure, I think moving 'BBCLASSEXTEND = "native nativesdk"' from mesa.inc to mesa_*.bb should sort this.
Actually, no - mesa-gl.bb includes mesa.bb, so this moving wouldn't help. I simply set the PREFERRED_PROVIDER instead:
The full branch is otherwise the same:
https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/virgl-gtk
Alex