Skip to contentSkip to conversation

Enable build with mesa-based EGL1.5

PATCH New Eric Ruei 1 participant 10 messages Sep 10, 2019

lore
Share & tools
lore

Eric Ruei

author
#0 lore raw

cover Enable build with mesa-based EGL1.5

These patches enable mesa-based EGL1.5 build with chromium-ozone-wayland v75 as an engineering release for early integration of chromium-based user interface development.

An experimental or engineering branch should be created for those patches.

Eric Ruei (9):
chromium-ozone-wayland: remove virtual/libgl from DEPENDS list
HACK: matrix-gui-machinevision-demos: remove point-cloud-viewer
HACK: packagegroup-arago-test-addons: remove omapdrmtest packagegroup-arago-tisdk-multimedia: rename chromium-wayland
HACK: weston: undefine HAVE_GBM_MODIFIERS unconditionally
HACK: qtwebkit: sync up the khrplatform.h under ANGLE/include/KHR with
the one provided by mesa-egl
HACK: libepoxy: replace local definitions with khrplatform.h at
gen_dispatch
packagegroup-arago-tisdk-graphics: replace chromium-wayland with
chromium-ozone-wayland
HACK: ti-sgx-ddk-um: take AM5 binaries from mesa-egl based
experimental branch

 .../chromium-ozone-wayland_%.bbappend         |  5 ++
 ...atrix-gui-machinevision-demos_2.0.bbappend |  5 ++
 .../packagegroup-arago-test-addons.bbappend   |  6 ++-
 ...packagegroup-arago-tisdk-graphics.bbappend | 18 ++++++-
 ...ckagegroup-arago-tisdk-multimedia.bbappend |  8 +--
 ...h-use-KHR-khrplatform.h-instead-of-l.patch | 50 +++++++++++++++++++
 .../libepoxy/libepoxy_1.5.2.bbappend          |  7 +++
 .../ti-sgx-ddk-um_1.17.4948957.bbappend       | 21 ++++++++
 ...mposito-drm-undef-HAVE_GBM_MODIFIERS.patch | 29 +++++++++++
 .../wayland/weston_5.0.0.bbappend             |  3 +-
 ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 28 +++++++++++
 recipes-qt/qt5/qtwebkit_%.bbappend            | 10 ++++
 12 files changed, 183 insertions(+), 7 deletions(-)
 create mode 100644 recipes-browser/chromium/chromium-ozone-wayland_%.bbappend
 create mode 100644 recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bbappend
 create mode 100644 recipes-graphics/libepoxy/libepoxy/0001-HACK-gen_dispatch-use-KHR-khrplatform.h-instead-of-l.patch
 create mode 100644 recipes-graphics/libepoxy/libepoxy_1.5.2.bbappend
 create mode 100644 recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bbappend
 create mode 100644 recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
 create mode 100644 recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
 create mode 100644 recipes-qt/qt5/qtwebkit_%.bbappend
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/9 chromium-ozone-wayland: remove virtual/libgl from DEPENDS list

virtual/libgl is not required by the chromium-ozone-wayland for TI Sitara build options

---
 recipes-browser/chromium/chromium-ozone-wayland_%.bbappend | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 recipes-browser/chromium/chromium-ozone-wayland_%.bbappend
recipes-browser/chromium/chromium-ozone-wayland_%.bbappend new file +5 -0
new file mode 100644
index 0000000..6ee504b
@@ -0,0 +1,5 @@
+PR_append = ".tisdk0"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+DEPENDS_remove = "virtual/libgl"
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 2/9 HACK: matrix-gui-machinevision-demos: remove point-cloud-viewer

In reply to Eric Ruei

point-cloud-view build failed with mesa-based egl. Remove it tentatively

---
 .../matrix/matrix-gui-machinevision-demos_2.0.bbappend       | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bbappend
recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bbappend new file +5 -0
new file mode 100644
index 0000000..8ce44fa
@@ -0,0 +1,5 @@
+PR_append = ".tisdk0"
+
+RDEPENDS_matrix-machinevision-demo-dlp3dscanner_remove_dra7xx = " \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','point-cloud-viewer','',d)} \
+"
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 3/9 HACK: packagegroup-arago-test-addons: remove omapdrmtest

In reply to Eric Ruei

omapdrmtest does not build with mesa-based egl, remove it tentatively

---
 .../packagegroups/packagegroup-arago-test-addons.bbappend   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
recipes-core/packagegroups/packagegroup-arago-test-addons.bbappend +5 -1
index 0a8d834..ad03d30 100644
@@ -1,4 +1,4 @@
-PR_append = ".tisdk10"
+PR_append = ".tisdk11"
 
 TEST_ADDONS_TI_append_keystone = " \
     mmap-lld-test \
@@ -26,3 +26,7 @@ TEST_ADDONS_TI_append_am57xx-evm = " \
 TEST_ADDONS_TI_append_am335x-evm  = " icss-emac-lld-test"
 TEST_ADDONS_TI_append_am437x-evm  = " icss-emac-lld-test"
 TEST_ADDONS_TI_append_k2g-evm  = " icss-emac-lld-test"
+
+TEST_ADDONS_TI_remove_omap-a15 = " \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'mmip', 'omapdrmtest', '', d)} \
+    "
Signature · 1 line
2.17.1
author
#4 lore raw

PATCH 4/9 packagegroup-arago-tisdk-multimedia: rename chromium-wayland

In reply to Eric Ruei

chromium-wayland has been renamed to chromium-ozone-wayland at new recipes

---
 .../packagegroup-arago-tisdk-multimedia.bbappend          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bbappend +4 -4
index c48ba85..fe422c5 100644
@@ -1,14 +1,14 @@
-PR_append = ".tisdk3"
+PR_append = ".tisdk4"
 
 MULTIMEDIA_append_omap-a15 = " \
-    ${@['','chromium-wayland'][bb.utils.contains('MACHINE_FEATURES', 'gpu', True, False, d) and bb.utils.contains('DISTRO_FEATURES', 'wayland', True, False, d)]} \
+    ${@['','chromium-ozone-wayland'][bb.utils.contains('MACHINE_FEATURES', 'gpu', True, False, d) and bb.utils.contains('DISTRO_FEATURES', 'wayland', True, False, d)]} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'video-graphics-test', '', d)} \
 "
 
 MULTIMEDIA_append_ti43x = " \
-    ${@['','chromium-wayland'][bb.utils.contains('MACHINE_FEATURES', 'gpu', True, False, d) and bb.utils.contains('DISTRO_FEATURES', 'wayland', True, False, d)]} \
+    ${@['','chromium-ozone-wayland'][bb.utils.contains('MACHINE_FEATURES', 'gpu', True, False, d) and bb.utils.contains('DISTRO_FEATURES', 'wayland', True, False, d)]} \
 "
 
 MULTIMEDIA_append_ti33x = " \
-    ${@['','chromium-wayland'][bb.utils.contains('MACHINE_FEATURES', 'gpu', True, False, d) and bb.utils.contains('DISTRO_FEATURES', 'wayland', True, False, d)]} \
+    ${@['','chromium-ozone-wayland'][bb.utils.contains('MACHINE_FEATURES', 'gpu', True, False, d) and bb.utils.contains('DISTRO_FEATURES', 'wayland', True, False, d)]} \
 "
Signature · 1 line
2.17.1
author
#5 lore raw

PATCH 5/9 HACK: weston: undefine HAVE_GBM_MODIFIERS unconditionally

In reply to Eric Ruei

HAVE_GBM_MODIFIERS has not been fully supported by MESA-based egl yet.

---
 ...mposito-drm-undef-HAVE_GBM_MODIFIERS.patch | 29 +++++++++++++++++++
 .../wayland/weston_5.0.0.bbappend             |  3 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch
recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch new file +29 -0
new file mode 100644
index 0000000..56a78e4
@@ -0,0 +1,29 @@
+From e406b4141c23fb762a14a09d565c363ebaccb5a4 Mon Sep 17 00:00:00 2001
+From: Eric Ruei <[email protected]>
+Date: Sun, 1 Sep 2019 08:28:27 -0400
+Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS
+
+HAVE_GBM_MODIFIERS is defined, but not fully supported by the gbm module
+yet.
+
+Signed-off-by: Eric Ruei <[email protected]>
+---
+ libweston/compositor-drm.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
+index d92ecfcd..88f845a8 100644
+--- a/libweston/compositor-drm.c
++++ b/libweston/compositor-drm.c
+@@ -68,6 +68,8 @@
+ #include "linux-dmabuf-unstable-v1-server-protocol.h"
+ #include "linux-explicit-synchronization.h"
+ 
++#undef HAVE_GBM_MODIFIERS
++
+ #ifndef DRM_CLIENT_CAP_ASPECT_RATIO
+ #define DRM_CLIENT_CAP_ASPECT_RATIO	4
+ #endif
+-- 
+2.17.1
+
recipes-graphics/wayland/weston_5.0.0.bbappend +2 -1
index 379f110..e95f38b 100644
@@ -1,7 +1,8 @@
-PR_append = ".tisdk0"
+PR_append = ".tisdk1"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
 	file://0001-Add-soc-performance-monitor-utilites.patch \
+	file://0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch \
 "
Signature · 1 line
2.17.1
author
#6 lore raw

PATCH 6/9 HACK: qtwebkit: sync up the khrplatform.h under ANGLE/include/KHR with the one provided by mesa-egl

In reply to Eric Ruei

Note: This khrplatform.h should not be used, but it is for some include path search. Add "#define MESA_EGL_NO_X11_HEADERS" to be consistent with the one provided by mesa-egl

---
 ...atform.h-add-define-MESA_EGL_NO_X11_.patch | 28 +++++++++++++++++++
 recipes-qt/qt5/qtwebkit_%.bbappend            | 10 +++++++
 2 files changed, 38 insertions(+)
 create mode 100644 recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch
 create mode 100644 recipes-qt/qt5/qtwebkit_%.bbappend
recipes-qt/qt5/qtwebkit/0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch new file +28 -0
new file mode 100644
index 0000000..c6022ef
@@ -0,0 +1,28 @@
+From c969fa7eedb3bce04c8f48caf469a46361437aa7 Mon Sep 17 00:00:00 2001
+From: Eric Ruei <[email protected]>
+Date: Fri, 30 Aug 2019 17:41:13 -0400
+Subject: [PATCH] HACK: ANGLE/khrplatform.h: add #define
+ MESA_EGL_NO_X11_HEADERS
+
+Note: Only the KHR/khrplatform.h at sysroot/usr/include should be used.
+      This patch is a tentative workaround to make both files compatible
+
+Signed-off-by: Eric Ruei <[email protected]>
+---
+ Source/ThirdParty/ANGLE/include/KHR/khrplatform.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
+index c9e6f17d3..4e3ff69a8 100644
+--- a/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
++++ b/Source/ThirdParty/ANGLE/include/KHR/khrplatform.h
+@@ -279,4 +279,6 @@ typedef enum {
+     KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+ } khronos_boolean_enum_t;
+ 
++#define MESA_EGL_NO_X11_HEADERS
++
+ #endif /* __khrplatform_h_ */
+-- 
+2.17.1
+
recipes-qt/qt5/qtwebkit_%.bbappend new file +10 -0
new file mode 100644
index 0000000..d51ab64
@@ -0,0 +1,10 @@
+PR_append = ".tisdk0"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+
+SRC_URI += "\
+    file://0001-HACK-ANGLE-khrplatform.h-add-define-MESA_EGL_NO_X11_.patch \
+"
+
+
Signature · 1 line
2.17.1
author
#7 lore raw

PATCH 7/9 HACK: libepoxy: replace local definitions with khrplatform.h at gen_dispatch

In reply to Eric Ruei

The local definitions are not consistent with khrplatform.h. Replace them with #include <KHR/khrplatform.h"

---
 ...h-use-KHR-khrplatform.h-instead-of-l.patch | 50 +++++++++++++++++++
 .../libepoxy/libepoxy_1.5.2.bbappend          |  7 +++
 2 files changed, 57 insertions(+)
 create mode 100644 recipes-graphics/libepoxy/libepoxy/0001-HACK-gen_dispatch-use-KHR-khrplatform.h-instead-of-l.patch
 create mode 100644 recipes-graphics/libepoxy/libepoxy_1.5.2.bbappend
recipes-graphics/libepoxy/libepoxy/0001-HACK-gen_dispatch-use-KHR-khrplatform.h-instead-of-l.patch new file +50 -0
new file mode 100644
index 0000000..08709b7
@@ -0,0 +1,50 @@
+From 5f478733715e1a09b5040fe423e9238085875e8a Mon Sep 17 00:00:00 2001
+From: Eric Ruei <[email protected]>
+Date: Fri, 30 Aug 2019 18:06:15 -0400
+Subject: [PATCH] HACK: gen_dispatch: use <KHR/khrplatform.h> instead of local
+ definitions
+
+The common <KHR/khrplatform.h> should be used instead of local definitions
+
+Signed-off-by: Eric Ruei <[email protected]>
+---
+ src/gen_dispatch.py | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/src/gen_dispatch.py b/src/gen_dispatch.py
+index 28dad2b..5458414 100755
+--- a/src/gen_dispatch.py
++++ b/src/gen_dispatch.py
+@@ -506,28 +506,17 @@ class Generator(object):
+             # don't directly include khrplatform.h because it's not
+             # present on many systems, and coming up with #ifdefs to
+             # decide when it's not present would be hard.
+-            self.outln('#define __khrplatform_h_ 1')
+             self.outln('typedef int8_t khronos_int8_t;')
+             self.outln('typedef int16_t khronos_int16_t;')
+-            self.outln('typedef int32_t khronos_int32_t;')
+-            self.outln('typedef int64_t khronos_int64_t;')
+             self.outln('typedef uint8_t khronos_uint8_t;')
+             self.outln('typedef uint16_t khronos_uint16_t;')
+-            self.outln('typedef uint32_t khronos_uint32_t;')
+-            self.outln('typedef uint64_t khronos_uint64_t;')
+             self.outln('typedef float khronos_float_t;')
+             self.outln('typedef long khronos_intptr_t;')
+             self.outln('typedef long khronos_ssize_t;')
+             self.outln('typedef unsigned long khronos_usize_t;')
+             self.outln('typedef uint64_t khronos_utime_nanoseconds_t;')
+             self.outln('typedef int64_t khronos_stime_nanoseconds_t;')
+-            self.outln('#define KHRONOS_MAX_ENUM 0x7FFFFFFF')
+-            self.outln('typedef enum {')
+-            self.outln('    KHRONOS_FALSE = 0,')
+-            self.outln('    KHRONOS_TRUE  = 1,')
+-            self.outln('    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM')
+-            self.outln('} khronos_boolean_enum_t;')
+-            self.outln('typedef uintptr_t khronos_uintptr_t;')
++            self.outln('#include <KHR/khrplatform.h>')
+ 
+         if self.target == "glx":
+             self.outln('#include <X11/Xlib.h>')
+-- 
+2.17.1
+
recipes-graphics/libepoxy/libepoxy_1.5.2.bbappend new file +7 -0
new file mode 100644
index 0000000..c4b82dc
@@ -0,0 +1,7 @@
+PR_append = ".tisdk0"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+	file://0001-HACK-gen_dispatch-use-KHR-khrplatform.h-instead-of-l.patch \
+"
Signature · 1 line
2.17.1
author
#8 lore raw

PATCH 8/9 packagegroup-arago-tisdk-graphics: replace chromium-wayland with chromium-ozone-wayland

In reply to Eric Ruei

chromium-wayland has been renamed to chromium-ozone-wayland at the latest meta-browser

---
 .../packagegroup-arago-tisdk-graphics.bbappend | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bbappend +17 -1
index ac1f1f5..288233a 100644
@@ -1,10 +1,26 @@
-PR_append = ".tisdk10"
+PR_append = ".tisdk11"
 
 GRAPHICS_DEMO = ""
 GRAPHICS_DEMO_omap-a15 = "\
     kmscube \
 "
 
+GRAPHICS_WAYLAND_remove_omap-a15 = "\
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','chromium-wayland','',d)} \
+"
+
+GRAPHICS_WAYLAND_remove_k3 = "\
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','chromium-wayland','',d)} \
+"
+
+GRAPHICS_WAYLAND_append_omap-a15 = "\
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','chromium-ozone-wayland','',d)} \
+"
+
+GRAPHICS_WAYLAND_append_k3 = "\
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','chromium-ozone-wayland','',d)} \
+"
+
 GRAPHICS_RDEPENDS_remove = "\
     ${@bb.utils.contains('MACHINE_FEATURES', 'gpu', '', 'ti-sgx-ddk-km', d)} \
 "
Signature · 1 line
2.17.1
author
#9 lore raw

PATCH 9/9 HACK: ti-sgx-ddk-um: take AM5 binaries from mesa-egl based experimental branch

In reply to Eric Ruei

Take AM5 binaries from mesa-egl based experimental branch for early engineering integration.

---
 .../ti-sgx-ddk-um_1.17.4948957.bbappend       | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bbappend
recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bbappend new file +21 -0
new file mode 100644
index 0000000..313f9c4
@@ -0,0 +1,21 @@
+PR_append = ".tisdk1"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+BRANCH = "dev/thud/${PV}-egl-experimental"
+SRCREV = "0f76ac03750a4f6c09290abf6b9fced696ca192d"
+
+RPROVIDES_${PN} += "libGLES_CM.so.1"
+
+S = "${WORKDIR}/git"
+
+do_install_append () {
+    ln -sf libGLESv2.so.2 ${D}${libdir}/libGLESv2.so.1
+    ln -sf libGLESv1_CM.so ${D}${libdir}/libGLES_CM.so.1
+    ln -sf libGLESv1_CM.so ${D}${libdir}/libGLES_CM.so
+
+    rm -rf ${D}${includedir}/GL
+}
+
+FILES_${PN}-plugins = "${libdir}/libsrv_init.so ${libdir}/libsrv_um.so ${libdir}/libglslcompiler.so ${libdir}/libPVRScopeServices.so ${libdir}/libGLESv2.so ${libdir}/libEGL.so ${libdir}/libGLESv1_CM.so ${libdir}/libGLES_CM.so ${libdir}/libGLESv1_PVR_MESA.so ${libdir}/libGLESv2_PVR_MESA.so"
+
Signature · 1 line
2.17.1