From ea4517b66ba42bf4923f715fe9da466565f3603e Mon Sep 17 00:00:00 2001 From: Eric BENARD Date: Mon, 7 Oct 2013 15:37:29 +0000 Subject: [PATCH] qtbase: update mx5 & mx6 support MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - remove 5.0.2 as meta-qt5 has 5.1.0 by default - tested on i.MX53 with eglfs and xcb platforms. FPS is not very good despite the GPU (~24 fps on 800x480) - tested on i.MX6 with eglfs platform : performance is very good (> 150 fps on 640x480) Signed-off-by: Eric Bénard --- .../qt5/qtbase/mx5/qeglfshooks_imx5.cpp | 105 ------------------ .../recipes-qt/qt5/qtbase_5.0.2.bbappend | 71 ------------ .../recipes-qt/qt5/qtbase_5.1.0.bbappend | 78 ++++++------- 3 files changed, 32 insertions(+), 222 deletions(-) delete mode 100644 meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp delete mode 100644 meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend diff --git a/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp b/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp deleted file mode 100644 index 43e6d8d3..00000000 --- a/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp +++ /dev/null @@ -1,105 +0,0 @@ -/**************************************************************************** -** -** hacked by Eric Bénard - Eukréa Electromatique -** inspired from https://community.freescale.com/docs/DOC-94123 -** and from fbset.c http://users.telenet.be/geertu/Linux/fbdev/ -** -** based on qeglfshooks_imx6.cpp which is : -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include /* For O_RDWR */ -#include /* For open(), creat() */ -#include "qeglfshooks.h" -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class QEglFSImx5Hooks : public QEglFSHooks -{ -public: - QEglFSImx5Hooks(); - virtual QSize screenSize() const; - virtual EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format); - virtual void destroyNativeWindow(EGLNativeWindowType window); - -private: - QSize mScreenSize; - EGLNativeDisplayType mNativeDisplay; -}; - - -QEglFSImx5Hooks::QEglFSImx5Hooks() -{ - int width, height; - /* code taken from fbset.c */ - int fh; - struct fb_var_screeninfo var; - fh = open("/dev/fb0", O_RDONLY); - ioctl(fh, FBIOGET_VSCREENINFO, &var); - mScreenSize.setHeight(var.yres); - mScreenSize.setWidth(var.xres); - close(fh); - mNativeDisplay = EGL_DEFAULT_DISPLAY; -} - -QSize QEglFSImx5Hooks::screenSize() const -{ - return mScreenSize; -} - -EGLNativeWindowType QEglFSImx5Hooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format) -{ - Q_UNUSED(format); - - EGLNativeWindowType eglWindow = open("/dev/fb0", O_RDWR); - return eglWindow; -} - - -void QEglFSImx5Hooks::destroyNativeWindow(EGLNativeWindowType window) -{ - close(window); -} - -QEglFSImx5Hooks eglFSImx5Hooks; -QEglFSHooks *platformHooks = &eglFSImx5Hooks; - -QT_END_NAMESPACE diff --git a/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend b/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend deleted file mode 100644 index 1670f19b..00000000 --- a/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_5.0.2.bbappend +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique - -HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}" - -GL_DEPENDS_mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', '', 'virtual/libgles2 virtual/egl', d)}" -QT_GLFLAGS_mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', '', '-opengl es2 -eglfs', d)}" -QT_EXAMPLES_mx6 = "-make examples" -QT_DEMOS_mx6 = "-make demos" - -GL_DEPENDS_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', '', 'virtual/libgles2 virtual/egl', d)}" -QT_GLFLAGS_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', '', '-opengl es2 -eglfs', d)}" -QT_EXAMPLES_mx5 = "-make examples" -QT_DEMOS_mx5 = "-make demos" - -TSLIB_DEPENDS_mx6 = "tslib" -QT_TSLIB_mx6 = "-tslib" - -TSLIB_DEPENDS_mx5 = "tslib" -QT_TSLIB_mx5 = "-tslib" - -FILESEXTRAPATHS_prepend_mx5 := "${THISDIR}/${PN}:" -SRC_URI_append_mx5 += " \ - file://qeglfshooks_imx5.cpp \ - " - -do_configure_prepend_mx6() { - if test ${HAS_X11} -eq 0; then -# adapt qmake.conf to our needs -sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf -cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <