Skip to contentSkip to conversation

virgl: enable in qemu when 'opengl' is in DISTRO_FEATURES

PATCH In review Alexander Kanavin 2 participants 10 messages Apr 25, 2020 – Apr 28, 2020 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

cover virgl: enable in qemu when 'opengl' is in DISTRO_FEATURES

virgl is a virtualized accelerated 3D graphics support for the qemu guests. This patchset enables virgl in qemu, when 'opengl' is in DISTRO_FEATURES. Virgl is entirely opt-in (via non-default options to 'runqemu'). By default qemu behaves exactly as before, and does not use virgl.

This adds a few native dependencies to qemu-system-native (particularly, libdrm, virglrenderer and a special minimal configuration of mesa-native). I tested the impact on build times: it is about 20 seconds on a 32 core machine. 'bitbake core-image-minimal' goes from 22m23s to 22m44s.

The following changes since commit f9e11276432f1903047f483a68ca4b5a0d6c6111:

Updated patch for publishing (2020-04-24 15:21:14 +0100)

are available in the Git repository at:

git://git.yoctoproject.org/poky-contrib akanavin/qemu-split-virgl-gtk
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/qemu-split-virgl-gtk

Alexander Kanavin (3):
bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk
from target
libsdl2: enable opengl option for native/nativesdk, subject to
'opengl' in DISTRO_FEATURES
qemu: enable virglrenderer and glx options subject to 'opengl'
DISTRO_FEATURE

 meta/conf/bitbake.conf                         |  4 ++--
 meta/lib/oeqa/selftest/cases/runtime_test.py   | 18 ++++++------------
 .../qemu/qemu-system-native_4.2.0.bb           |  4 +++-
 meta/recipes-devtools/qemu/qemu_4.2.0.bb       |  5 ++++-
 meta/recipes-gnome/gtk+/gtk+3.inc              |  2 ++
 meta/recipes-graphics/cairo/cairo_1.16.0.bb    |  2 ++
 .../libepoxy/libepoxy_1.5.4.bb                 |  2 --
 .../recipes-graphics/libsdl2/libsdl2_2.0.12.bb |  4 ++--
 .../virglrenderer/virglrenderer_0.8.2.bb       |  2 --
 9 files changed, 21 insertions(+), 22 deletions(-)
Signature · 1 line
2.26.1
#1 lore raw

PATCH 1/3 bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target

This will allow better control over native virgl/qemu configurations.

Adjust gtk+3/cairo native configurations to actually ignore opengl when building for -native: we do not need it, and it would cause build failures as only a limited subset of mesa-native is currently built.

Drop native/nativesdk overrides from virglrenderer/libepoxy recipes as opengl feature is now correctly set for those variants.

---
 meta/conf/bitbake.conf                                     | 4 ++--
 meta/recipes-gnome/gtk+/gtk+3.inc                          | 2 ++
 meta/recipes-graphics/cairo/cairo_1.16.0.bb                | 2 ++
 meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb           | 2 --
 meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb | 2 --
 5 files changed, 6 insertions(+), 6 deletions(-)
meta/conf/bitbake.conf +2 -2
index 4b544a22cd..6f3536eff4 100644
@@ -829,8 +829,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
 
 # Normally target distro features will not be applied to native builds:
 # Native distro features on this list will use the target feature value
-DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
+DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation opengl"
+DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation opengl"
 
 DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"
 MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
meta/recipes-gnome/gtk+/gtk+3.inc +2 -0
index 5d1f59ea1a..6154154004 100644
@@ -46,6 +46,8 @@ do_compile_prepend() {
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}"
+PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 
 PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes"
 # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build
meta/recipes-graphics/cairo/cairo_1.16.0.bb +2 -0
index b772c2ece2..092c77b826 100644
@@ -42,6 +42,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
                    trace"
+PACKAGECONFIG_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)}"
 
 PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
 PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb +0 -2
index af9867407e..1aa850d004 100644
@@ -19,8 +19,6 @@ UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases"
 inherit meson pkgconfig 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 -Dx11=false, virtual/libx11 virtual/libgl"
meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb +0 -2
index 1046b8504f..29b12628d0 100644
@@ -22,5 +22,3 @@ inherit meson pkgconfig features_check
 BBCLASSEXTEND = "native nativesdk"
 
 REQUIRED_DISTRO_FEATURES = "opengl"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
Signature · 1 line
2.26.1
#9 lore raw

PATCH 2/3 libsdl2: enable opengl option for native/nativesdk, subject to 'opengl' in DISTRO_FEATURES

In reply to Alexander Kanavin

This allows virgl support in qemu with the SDL frontend

---
 meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb +2 -2
index c1c941e452..83dce86801 100644
@@ -45,8 +45,8 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
 # and BSP layers to pick either (desktop) opengl, gles2, or no GL
 PACKAGECONFIG_GL ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
 
-PACKAGECONFIG_class-native = "x11"
-PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG_class-native = "x11 ${PACKAGECONFIG_GL}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} ${PACKAGECONFIG_GL}"
 PACKAGECONFIG ??= " \
     ${PACKAGECONFIG_GL} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \
Signature · 1 line
2.26.1
#10 lore raw

PATCH 3/3 qemu: enable virglrenderer and glx options subject to 'opengl' DISTRO_FEATURE

In reply to Alexander Kanavin

Note that to actually use accelerated GL passthrough, there are two options

1) a suitable frontend need to be also enabled - gtk+ and SDL both seem to work well. Previously I struggled to make SDL work, but now it seems fine.

2) it is also possible to render off-screen with -display egl-headless option, and see the output with a VNC viewer (for which, qemu needs to be started with a VNC server):

$ runqemu kvm egl-headless publicvnc
---
 meta/lib/oeqa/selftest/cases/runtime_test.py   | 18 ++++++------------
 .../qemu/qemu-system-native_4.2.0.bb           |  4 +++-
 meta/recipes-devtools/qemu/qemu_4.2.0.bb       |  5 ++++-
 3 files changed, 13 insertions(+), 14 deletions(-)
meta/lib/oeqa/selftest/cases/runtime_test.py +6 -12
index 60cb2e01a6..9b87c04e24 100644
@@ -186,18 +186,14 @@ class TestImage(OESelftestTestCase):
             self.skipTest('virgl isn\'t working with Opensuse 15.0')
 
         qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
-        sdl_packageconfig = get_bb_var('PACKAGECONFIG', 'libsdl2-native')
+        qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native')
         features = 'INHERIT += "testimage"\n'
         if 'gtk+' not in qemu_packageconfig:
             features += 'PACKAGECONFIG_append_pn-qemu-system-native = " gtk+"\n'
         if 'sdl' not in qemu_packageconfig:
             features += 'PACKAGECONFIG_append_pn-qemu-system-native = " sdl"\n'
-        if 'virglrenderer' not in qemu_packageconfig:
-            features += 'PACKAGECONFIG_append_pn-qemu-system-native = " virglrenderer"\n'
-        if 'glx' not in qemu_packageconfig:
-            features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
-        if 'opengl' not in sdl_packageconfig:
-            features += 'PACKAGECONFIG_append_pn-libsdl2-native = " opengl"\n'
+        if 'opengl' not in qemu_distrofeatures:
+            features += 'DISTRO_FEATURES_append = " opengl"\n'
         features += 'TEST_SUITES = "ping ssh virgl"\n'
         features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
         features += 'IMAGE_INSTALL_append = " kmscube"\n'
@@ -229,12 +225,10 @@ class TestImage(OESelftestTestCase):
             dripath = subprocess.check_output("pkg-config --variable=dridriverdir dri", shell=True)
         except subprocess.CalledProcessError as e:
             self.skipTest("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.")
-        qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+        qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native')
         features = 'INHERIT += "testimage"\n'
-        if 'virglrenderer' not in qemu_packageconfig:
-            features += 'PACKAGECONFIG_append_pn-qemu-system-native = " virglrenderer"\n'
-        if 'glx' not in qemu_packageconfig:
-            features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+        if 'opengl' not in qemu_distrofeatures:
+            features += 'DISTRO_FEATURES_append = " opengl"\n'
         features += 'TEST_SUITES = "ping ssh virgl"\n'
         features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
         features += 'IMAGE_INSTALL_append = " kmscube"\n'
meta/recipes-devtools/qemu/qemu-system-native_4.2.0.bb +3 -1
index d83ee59375..7394385d30 100644
@@ -9,7 +9,9 @@ DEPENDS = "glib-2.0-native zlib-native pixman-native qemu-native bison-native"
 
 EXTRA_OECONF_append = " --target-list=${@get_qemu_system_target_list(d)}"
 
-PACKAGECONFIG ??= "fdt alsa kvm"
+PACKAGECONFIG ??= "fdt alsa kvm \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '' ,d)} \
+"
 
 # Handle distros such as CentOS 5 32-bit that do not have kvm support
 PACKAGECONFIG_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
meta/recipes-devtools/qemu/qemu_4.2.0.bb +4 -1
index f0c1daabe1..a4018cc448 100644
@@ -21,5 +21,8 @@ do_install_append_class-nativesdk() {
 PACKAGECONFIG ??= " \
     fdt sdl kvm \
     ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '' ,d)} \
+"
+PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', '' ,d)} \
 "
-PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm"
Signature · 1 line
2.26.1
#2 lore raw

Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target

In reply to Alexander Kanavin

This causes

https://errors.yoctoproject.org/Errors/Details/409117/
https://errors.yoctoproject.org/Errors/Details/409060/

for most of qemu machines.

Quoted 87 lines · Alexander Kanavin

This will allow better control over native virgl/qemu configurations.

Adjust gtk+3/cairo native configurations to actually ignore opengl when building for -native: we do not need it, and it would cause build failures as only a limited subset of mesa-native is currently built.

Drop native/nativesdk overrides from virglrenderer/libepoxy recipes as opengl feature is now correctly set for those variants.

---
 meta/conf/bitbake.conf                                     | 4 ++--
 meta/recipes-gnome/gtk+/gtk+3.inc                          | 2 ++
 meta/recipes-graphics/cairo/cairo_1.16.0.bb                | 2 ++
 meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb           | 2 --
 meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb | 2 --
 5 files changed, 6 insertions(+), 6 deletions(-)
meta/conf/bitbake.conf +2 -2
index 4b544a22cd..6f3536eff4 100644
@@ -829,8 +829,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
 
 # Normally target distro features will not be applied to native builds:
 # Native distro features on this list will use the target feature value
-DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
+DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation opengl"
+DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation opengl"
 
 DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"
 MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
meta/recipes-gnome/gtk+/gtk+3.inc +2 -0
index 5d1f59ea1a..6154154004 100644
@@ -46,6 +46,8 @@ do_compile_prepend() {
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}"
+PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 
 PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes"
 # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build
meta/recipes-graphics/cairo/cairo_1.16.0.bb +2 -0
index b772c2ece2..092c77b826 100644
@@ -42,6 +42,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
                    trace"
+PACKAGECONFIG_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)}"
 
 PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
 PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb +0 -2
index af9867407e..1aa850d004 100644
@@ -19,8 +19,6 @@ UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases"
 inherit meson pkgconfig 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 -Dx11=false, virtual/libx11 virtual/libgl"
meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb +0 -3
index 1046b8504f..29b12628d0 100644
@@ -22,5 +22,3 @@ inherit meson pkgconfig features_check
 BBCLASSEXTEND = "native nativesdk"
 
 REQUIRED_DISTRO_FEATURES = "opengl"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
--

2.26.1

#4 lore raw

Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target

In reply to Alexander Kanavin
Quoted 24 lines · Alexander Kanavin

This will allow better control over native virgl/qemu configurations.

Adjust gtk+3/cairo native configurations to actually ignore opengl when building for -native: we do not need it, and it would cause build failures as only a limited subset of mesa-native is currently built.

Drop native/nativesdk overrides from virglrenderer/libepoxy recipes as opengl feature is now correctly set for those variants.

---
 meta/conf/bitbake.conf                                     | 4 ++--
 meta/recipes-gnome/gtk+/gtk+3.inc                          | 2 ++
 meta/recipes-graphics/cairo/cairo_1.16.0.bb                | 2 ++
 meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb           | 2 --
 meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb | 2 --
 5 files changed, 6 insertions(+), 6 deletions(-)
meta/conf/bitbake.conf +0 -0
index 4b544a22cd..6f3536eff4 100644

meta/conf/bitbake.conf DISTRO_FEATURES_NATIVESDK ?= "x11" · line 834

Quoted 8 lines
meta/conf/bitbake.conf +2 -2
@@ -829,8 +829,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
 
 # Normally target distro features will not be applied to native builds:
 # Native distro features on this list will use the target feature value
-DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
+DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation opengl"
+DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation opengl"
 

This change will indicate that a distro that enables openGL for target needs to have a build machine also with OpenGL support, this does not sound right to me, If you want to have openGL support on build host for some testing bits then lets deal with that separately by
adding a new feature to control it and perhaps it should be machine specific since I dont see any use of it besides qemu machines.

Quoted 55 lines
meta/conf/bitbake.conf +0 -0
 DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"
 MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
meta/recipes-gnome/gtk+/gtk+3.inc +2 -0
index 5d1f59ea1a..6154154004 100644
@@ -46,6 +46,8 @@ do_compile_prepend() {
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}"
+PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 
 PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes"
 # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build
meta/recipes-graphics/cairo/cairo_1.16.0.bb +2 -0
index b772c2ece2..092c77b826 100644
@@ -42,6 +42,8 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
                    trace"
+PACKAGECONFIG_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)}"
 
 PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
 PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb +0 -2
index af9867407e..1aa850d004 100644
@@ -19,8 +19,6 @@ UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases"
 inherit meson pkgconfig 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 -Dx11=false, virtual/libx11 virtual/libgl"
meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb +0 -3
index 1046b8504f..29b12628d0 100644
@@ -22,5 +22,3 @@ inherit meson pkgconfig features_check
 BBCLASSEXTEND = "native nativesdk"
 
 REQUIRED_DISTRO_FEATURES = "opengl"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
--

2.26.1

#5 lore raw

Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target

Quoted 8 lines · Khem Raj

This change will indicate that a distro that enables openGL for target needs to have a build machine also with OpenGL support, this does not sound right to me, If you want to have openGL support on build host for some testing bits then lets deal with that separately by
adding a new feature to control it and perhaps it should be machine specific since I dont see any use of it besides qemu machines.

Good point. I will rework the patches to use 'virgl' DISTRO_FEATURE instead. Making it machine specific isn't feasible, because the recipes affected are all native ones.

Alex

#3 lore raw

Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target

In reply to Khem Raj

ERROR: The file /usr/lib/libEGL.so is installed by both mesa-native and mali-450-native, aborting

This one is on the meta-odroid/recipes-graphics/mali/mali-450_r7p0.bb I'm afraid. mali-450 contains a prebuilt binary for ARM, and so shouldn't even be available in -native (or in qemu target, for that matter, as qemu will likely never emulate that GPU).

Alex

Quoted 118 lines · Khem Raj

This causes

https://errors.yoctoproject.org/Errors/Details/409117/
https://errors.yoctoproject.org/Errors/Details/409060/

for most of qemu machines.

Quoted 24 lines · Alexander Kanavin

This will allow better control over native virgl/qemu configurations.

Adjust gtk+3/cairo native configurations to actually ignore opengl when building for -native: we do not need it, and it would cause build failures as only a limited subset of mesa-native is currently built.

Drop native/nativesdk overrides from virglrenderer/libepoxy recipes as opengl feature is now correctly set for those variants.

---
 meta/conf/bitbake.conf                                     | 4 ++--
 meta/recipes-gnome/gtk+/gtk+3.inc                          | 2 ++
 meta/recipes-graphics/cairo/cairo_1.16.0.bb                | 2 ++
 meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb           | 2 --
 meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb | 2 --
 5 files changed, 6 insertions(+), 6 deletions(-)
meta/conf/bitbake.conf +0 -0
index 4b544a22cd..6f3536eff4 100644

meta/conf/bitbake.conf DISTRO_FEATURES_NATIVESDK ?= "x11" · line 835

Quoted 9 lines
meta/conf/bitbake.conf +2 -2
@@ -829,8 +829,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
 
 # Normally target distro features will not be applied to native builds:
 # Native distro features on this list will use the target feature value
-DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
+DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation opengl"
+DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation opengl"
 
 DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit

gobject-introspection-data ldconfig"

Review

Quoted 2 lines
meta/conf/bitbake.conf +0 -0
 MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
(quoted diff) +0 -0

b/meta/recipes-gnome/gtk+/gtk+3.inc

meta/recipes-gnome/gtk+/gtk+3.inc do_compile_prepend() { · line 47

Quoted 6 lines

index 5d1f59ea1a..6154154004 100644

meta/recipes-gnome/gtk+/gtk+3.inc +0 -0
@@ -46,6 +46,8 @@ do_compile_prepend() {
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl

wayland x11', d)} \

meta/recipes-gnome/gtk+/gtk+3.inc do_compile_prepend() { · line 48

Quoted 1 line
meta/recipes-gnome/gtk+/gtk+3.inc +0 -0
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl

x11', 'glx', '', d)}"

meta/recipes-gnome/gtk+/gtk+3.inc do_compile_prepend() { · line 49

Quoted 1 line
meta/recipes-gnome/gtk+/gtk+3.inc +1 -0
+PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES',

'x11', d)}"

meta/recipes-gnome/gtk+/gtk+3.inc do_compile_prepend() { · line 50

Quoted 1 line
meta/recipes-gnome/gtk+/gtk+3.inc +1 -0
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES',

'x11', d)}"

meta/recipes-gnome/gtk+/gtk+3.inc do_compile_prepend() { · line 51

Quoted 2 lines
meta/recipes-gnome/gtk+/gtk+3.inc +0 -0
 PACKAGECONFIG[x11] =

"--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes"

meta/recipes-gnome/gtk+/gtk+3.inc do_compile_prepend() { · line 52

Quoted 1 line
meta/recipes-gnome/gtk+/gtk+3.inc +0 -0
 # this is provided by oe-core patch that removes epoxy/gl dependency

from a X11 build

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta/recipes-graphics/cairo/cairo_1.16.0.bb

meta/recipes-graphics/cairo/cairo_1.16.0.bb PACKAGECONFIG ??=

Quoted 4 lines

index b772c2ece2..092c77b826 100644

meta/recipes-graphics/cairo/cairo_1.16.0.bb +0 -0
@@ -42,6 +42,8 @@ PACKAGECONFIG ??=

"${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \

meta/recipes-graphics/cairo/cairo_1.16.0.bb PACKAGECONFIG ??= · line 42

Quoted 1 line
meta/recipes-graphics/cairo/cairo_1.16.0.bb +0 -0
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11

xcb', '', d)} \

meta/recipes-graphics/cairo/cairo_1.16.0.bb PACKAGECONFIG ??= · line 43

Quoted 1 line
meta/recipes-graphics/cairo/cairo_1.16.0.bb +0 -0
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11

opengl', 'opengl', '', d)} \

meta/recipes-graphics/cairo/cairo_1.16.0.bb PACKAGECONFIG ??= · line 45

Quoted 2 lines
meta/recipes-graphics/cairo/cairo_1.16.0.bb +1 -0
                    trace"
+PACKAGECONFIG_class-native = "${@bb.utils.contains('DISTRO_FEATURES',

'x11', 'x11 xcb', '', d)}"

meta/recipes-graphics/cairo/cairo_1.16.0.bb PACKAGECONFIG ??= · line 46

Quoted 1 line
meta/recipes-graphics/cairo/cairo_1.16.0.bb +1 -0
+PACKAGECONFIG_class-nativesdk =

"${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)}"

meta/recipes-graphics/cairo/cairo_1.16.0.bb PACKAGECONFIG ??= · line 47

Quoted 2 lines
meta/recipes-graphics/cairo/cairo_1.16.0.bb +0 -0
 PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no

--disable-xlib,${X11DEPENDS}"

Review

Quoted 2 lines
meta/recipes-graphics/cairo/cairo_1.16.0.bb +0 -0
 PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
(quoted diff) +0 -0

b/meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb

meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb UPSTREAM_CHECK_URI = "

Quoted 4 lines

index af9867407e..1aa850d004 100644

meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb +0 -0
@@ -19,8 +19,6 @@ UPSTREAM_CHECK_URI = "

https://github.com/anholt/libepoxy/releases"

meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases"

Quoted 8 lines
meta/recipes-graphics/libepoxy/libepoxy_1.5.4.bb +0 -2
 inherit meson pkgconfig 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 -Dx11=false, virtual/libx11

virtual/libgl"

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb

Quoted 13 lines

index 1046b8504f..29b12628d0 100644

meta/recipes-graphics/virglrenderer/virglrenderer_0.8.2.bb +0 -3
@@ -22,5 +22,3 @@ inherit meson pkgconfig features_check
 BBCLASSEXTEND = "native nativesdk"
 
 REQUIRED_DISTRO_FEATURES = "opengl"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
--

2.26.1

#6 lore raw

Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target

In reply to Alexander Kanavin
Quoted 4 lines · Alexander Kanavin

Good point. I will rework the patches to use 'virgl' DISTRO_FEATURE instead. Making it machine specific isn't feasible, because the recipes affected are all native ones.

Actually, on second thought, a separate DISTRO_FEATURE is not needed. What I'm going to do is uncouple the native 'opengl' DISTRO_FEATURE from the target one, so that either can be set independently of the other.

Alex

#8 lore raw

Re: [OE-core] [PATCH 1/3] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target

In reply to a message not in the archive
Quoted 12 lines · Alexander Kanavin via lists.openembedded.org
Quoted 4 lines · Alexander Kanavin

Good point. I will rework the patches to use 'virgl' DISTRO_FEATURE instead. Making it machine specific isn't feasible, because the recipes affected are all native ones.

Actually, on second thought, a separate DISTRO_FEATURE is not needed. What I'm going to do is uncouple the native 'opengl' DISTRO_FEATURE from the target one, so that either can be set independently of the other.

And on third thought, even that is not needed. Just set DISTRO_FEATURES_FILTER_NATIVE to not include 'opengl' (the default assignment in bitbake.conf is weak) and this won't be enabled for native.

Note that even if this is enabled, no opengl support from the build host is needed, and only a few additional bits are built. To use them you need to pass non-default options to runqemu (but in that case, the host has to have some kind of GL stack).

So I'd say the patchset is fine.

Alex