diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-01-08 16:22:19 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-01-08 17:22:05 +0100 |
| commit | 71f9e7d4dbe5f7166d8f1743daa5dd4869d5b8f8 (patch) | |
| tree | 5313ce0f8b0be16881c4189b65c3dbbb34e80f2e | |
| parent | 536768a21e1cf1c7d3728ce91cda6ac6e9409844 (diff) | |
glmark2: fix segfault with vivante 6.4.0 driver
Taken from https://github.com/thochstein/glmark2/commit/c493f8c0364d4881bae7d5e773d9b8ba41828633
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2 files changed, 42 insertions, 0 deletions
diff --git a/openembedded-layer/recipes-benchmark/glmark2/glmark2/0001-glad-Fix-EGL-loading-for-EGL_NO_DISPLAY-on-EGL-1.5-a.patch b/openembedded-layer/recipes-benchmark/glmark2/glmark2/0001-glad-Fix-EGL-loading-for-EGL_NO_DISPLAY-on-EGL-1.5-a.patch new file mode 100644 index 0000000..3e3929b --- /dev/null +++ b/openembedded-layer/recipes-benchmark/glmark2/glmark2/0001-glad-Fix-EGL-loading-for-EGL_NO_DISPLAY-on-EGL-1.5-a.patch @@ -0,0 +1,33 @@ +From 14483e0e50dc22c45780b13e9a1858e4275b953f Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Fri, 22 Nov 2019 12:41:06 -0600 +Subject: [PATCH] glad: Fix EGL loading for EGL_NO_DISPLAY on EGL 1.5 and above + +EGL loading was failing for a display of EGL_NO_DISPLAY. +Allow loading EGL 1.5 and above since eglQueryString supports +EGL_NO_DISPLAY in this case. + +Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> +--- + src/glad/src/egl.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/glad/src/egl.c b/src/glad/src/egl.c +index 1c5b2c1..5a1c578 100644 +--- a/src/glad/src/egl.c ++++ b/src/glad/src/egl.c +@@ -202,9 +202,11 @@ static int glad_egl_find_core_egl(EGLDisplay display) { + display = eglGetDisplay(EGL_DEFAULT_DISPLAY); + } + #endif ++#ifndef EGL_VERSION_1_5 + if (display == EGL_NO_DISPLAY) { + return 0; + } ++#endif + + version = eglQueryString(display, EGL_VERSION); + (void) eglGetError(); +-- +2.20.1 + diff --git a/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend new file mode 100644 index 0000000..47e0819 --- /dev/null +++ b/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +# fixes with Vivante 6.4.0: +# root@apalis-imx8:~# glmark2-es2-wayland +# EGL: Warning: No default display support on wayland +# Error: Loading EGL entry points failed +# Segmentation fault + +SRC_URI_append_imxgpu = " file://0001-glad-Fix-EGL-loading-for-EGL_NO_DISPLAY-on-EGL-1.5-a.patch" |