From f363b1dd2ff34ae3bce1487e24b2029e9f7aeb62 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sun, 31 Oct 2021 09:17:09 -0500 Subject: imx-gpu-viv: Drop SOC-specific header installation The recipe installs GLES3 headers based on SOC. This is not necessary as lack of support is expected to be handled at runtime. Signed-off-by: Tom Hochstein --- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 9 --------- 1 file changed, 9 deletions(-) (limited to 'recipes-graphics/imx-gpu-viv') diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index 872fef55..ab1a2582 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -147,11 +147,6 @@ PACKAGE_FP_TYPE = "hardfp" HAS_GBM = "false" HAS_GBM:mx8 = "true" -GLES3_HEADER_REMOVALS = "gl31.h gl32.h" -GLES3_HEADER_REMOVALS:mx8m = "gl32.h" -GLES3_HEADER_REMOVALS:mx8mm = "gl31.h gl32.h" -GLES3_HEADER_REMOVALS:mx8qxp = "" -GLES3_HEADER_REMOVALS:mx8qm = "" do_install () { install -d ${D}${libdir} @@ -233,10 +228,6 @@ do_install () { ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so fi - for header in ${GLES3_HEADER_REMOVALS}; do - rm -f ${D}${includedir}/GLES3/${header} - done - # FIXME: MX6SL does not have 3D support; hack it for now if [ "${IS_MX6SL}" = "1" ]; then rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \ -- cgit v1.2.3-54-g00ecf From 3e1403807107397d8c07508835e9efdde4ff537f Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Sun, 31 Oct 2021 09:22:53 -0500 Subject: imx-gpu-viv: Install SOC-specific binaries The archive now contains SOC-specific binaries. Signed-off-by: Tom Hochstein --- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'recipes-graphics/imx-gpu-viv') diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index ab1a2582..2f3ff32c 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -147,6 +147,13 @@ PACKAGE_FP_TYPE = "hardfp" HAS_GBM = "false" HAS_GBM:mx8 = "true" +IMX_SOC = "IMX_SOC_NOT_SET" +IMX_SOC:mx8qm = "mx8qm" +IMX_SOC:mx8mp = "mx8mp" +IMX_SOC:mx8mq = "mx8mq" +IMX_SOC:mx8qxp = "mx8qxp" +IMX_SOC:mx8mn = "mx8mn" +IMX_SOC:mx8ulp = "mx8ulp" do_install () { install -d ${D}${libdir} @@ -161,6 +168,10 @@ do_install () { # Use vulkan header from vulkan-headers recipe to support vkmark rm -rf ${D}${includedir}/vulkan/ + if [ -d ${S}/gpu-core/usr/lib/${IMX_SOC} ]; then + cp -r ${S}/gpu-core/usr/lib/${IMX_SOC}/* ${D}${libdir} + fi + install -d ${D}${libdir}/pkgconfig if ${HAS_GBM}; then install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc -- cgit v1.2.3-54-g00ecf