diff options
Diffstat (limited to 'bsp/meta-freescale/recipes-graphics/mesa')
4 files changed, 31 insertions, 43 deletions
diff --git a/bsp/meta-freescale/recipes-graphics/mesa/mesa-demos/Additional-eglSwapBuffer-calling-makes-wrong-throttl.patch b/bsp/meta-freescale/recipes-graphics/mesa/mesa-demos/Additional-eglSwapBuffer-calling-makes-wrong-throttl.patch deleted file mode 100644 index 180a9d84..00000000 --- a/bsp/meta-freescale/recipes-graphics/mesa/mesa-demos/Additional-eglSwapBuffer-calling-makes-wrong-throttl.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 010af1952d935352764389636b7165283e6c9e3f Mon Sep 17 00:00:00 2001 -From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com> -Date: Tue, 7 Apr 2015 17:58:45 -0500 -Subject: [PATCH] Additional eglSwapBuffer calling makes wrong throttling - -Upstream Status: Pending - -Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com> ---- - src/egl/eglut/eglut_wayland.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/egl/eglut/eglut_wayland.c b/src/egl/eglut/eglut_wayland.c -index 968b33f..5664d35 100644 ---- a/src/egl/eglut/eglut_wayland.c -+++ b/src/egl/eglut/eglut_wayland.c -@@ -155,7 +155,7 @@ draw(void *data, struct wl_callback *callback, uint32_t time) - - if (win->display_cb) - win->display_cb(); -- eglSwapBuffers(_eglut->dpy, win->surface); -+ /*eglSwapBuffers(_eglut->dpy, win->surface);*/ - - if (callback) - wl_callback_destroy(callback); --- -2.3.5 - diff --git a/bsp/meta-freescale/recipes-graphics/mesa/mesa-demos_%.bbappend b/bsp/meta-freescale/recipes-graphics/mesa/mesa-demos_%.bbappend index 94db4157..301f1b59 100644 --- a/bsp/meta-freescale/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/bsp/meta-freescale/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -2,21 +2,25 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_imxgpu = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \ file://fix-clear-build-break.patch \ - file://Additional-eglSwapBuffer-calling-makes-wrong-throttl.patch \ file://Add-OpenVG-demos-to-support-wayland.patch" -PACKAGECONFIG_IMX_TO_REMOVE_GLES = "" -PACKAGECONFIG_IMX_TO_REMOVE_GLES_imxgpu2d = "gles1 gles2" -PACKAGECONFIG_IMX_TO_REMOVE_GLES_imxgpu3d = "" -PACKAGECONFIG_IMX_TO_REMOVE = "${PACKAGECONFIG_IMX_TO_REMOVE_GLES}" -PACKAGECONFIG_IMX_TO_REMOVE_append_imxgpu = " \ +PACKAGECONFIG_REMOVE_IF_2D_ONLY = "" +PACKAGECONFIG_REMOVE_IF_2D_ONLY_imxgpu2d = "gles1 gles2" +PACKAGECONFIG_REMOVE_IF_2D_ONLY_imxgpu3d = "" +PACKAGECONFIG_REMOVE_IF_GPU = "" +PACKAGECONFIG_REMOVE_IF_GPU_imxgpu = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu x11', '', d)} \ " -PACKAGECONFIG_remove = "${PACKAGECONFIG_IMX_TO_REMOVE}" +PACKAGECONFIG_remove = " \ + ${PACKAGECONFIG_REMOVE_IF_2D_ONLY} \ + ${PACKAGECONFIG_REMOVE_IF_GPU} \ +" -PACKAGECONFIG_IMX_TO_APPEND = "" -PACKAGECONFIG_IMX_TO_APPEND_append_imxgpu = " \ +PACKAGECONFIG_APPEND_IF_GPU = "" +PACKAGECONFIG_APPEND_IF_GPU_imxgpu = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland vg', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glut', '', d)} \ " -PACKAGECONFIG_append = "${PACKAGECONFIG_IMX_TO_APPEND}" +PACKAGECONFIG_append = " \ + ${PACKAGECONFIG_APPEND_IF_GPU} \ +" diff --git a/bsp/meta-freescale/recipes-graphics/mesa/mesa-gl_%.bbappend b/bsp/meta-freescale/recipes-graphics/mesa/mesa-gl_%.bbappend index 465c8932..ca1c8f46 100644 --- a/bsp/meta-freescale/recipes-graphics/mesa/mesa-gl_%.bbappend +++ b/bsp/meta-freescale/recipes-graphics/mesa/mesa-gl_%.bbappend @@ -1 +1 @@ -COMPATIBLE_MACHINE_imxgpu2d = "(-)" +COMPATIBLE_MACHINE_imxgpu = "(-)" diff --git a/bsp/meta-freescale/recipes-graphics/mesa/mesa_%.bbappend b/bsp/meta-freescale/recipes-graphics/mesa/mesa_%.bbappend index 5ead6251..8d429abf 100644 --- a/bsp/meta-freescale/recipes-graphics/mesa/mesa_%.bbappend +++ b/bsp/meta-freescale/recipes-graphics/mesa/mesa_%.bbappend @@ -6,7 +6,7 @@ PACKAGECONFIG_remove_imxgpu3d = "gles" # FIXME: mesa should support 'x11-no-tls' option python () { - overrides = d.getVar("OVERRIDES", True).split(":") + overrides = d.getVar("OVERRIDES").split(":") if "imxgpu2d" not in overrides: return @@ -14,9 +14,20 @@ python () { d.setVarFlag("PACKAGECONFIG", "x11", x11flag.replace("--enable-glx-tls", "--enable-glx")) } -# Enable Etnaviv support -PACKAGECONFIG_append_use-mainline-bsp = " gallium" -GALLIUMDRIVERS_append_use-mainline-bsp = ",etnaviv,imx" +# Enable Etnaviv and Freedreno support +PACKAGECONFIG_append_use-mainline-bsp = " gallium etnaviv kmsro freedreno" + +USE_OSMESA_ONLY ?= "no" + +# Etnaviv support state for i.MX8 is unknown, therefore only enable OSMesa and +# disable Gallium for now. If you still want to enable Etnaviv, just set +# USE_OSMESA_ONLY_mx8 = "no" in your bbappend. +USE_OSMESA_ONLY_mx8 ?= "yes" + +# Enable OSMesa which also requires dri (classic) swrast +PACKAGECONFIG_append = " ${@oe.utils.conditional('USE_OSMESA_ONLY', 'yes', ' osmesa', '', d)}" +PACKAGECONFIG_remove = " ${@oe.utils.conditional('USE_OSMESA_ONLY', 'yes', 'gallium', '', d)}" +DRIDRIVERS_append = "${@oe.utils.conditional('USE_OSMESA_ONLY', 'yes', 'swrast', '', d)}" BACKEND = \ "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ @@ -27,6 +38,7 @@ BACKEND = \ do_install_append_imxgpu3d () { rm -f ${D}${libdir}/libGL.* \ ${D}${includedir}/GL/gl.h \ + ${D}${includedir}/GL/glcorearb.h \ ${D}${includedir}/GL/glext.h \ ${D}${includedir}/GL/glx.h \ ${D}${includedir}/GL/glxext.h |