Commit f8852824 authored by Eric BENARD's avatar Eric BENARD Committed by Otavio Salvador

qtbase: update mx5 & mx6 support

- 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: 's avatarEric Bénard <eric@eukrea.com>
parent 00f0cf37
/****************************************************************************
**
** 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 <fcntl.h> /* For O_RDWR */
#include <unistd.h> /* For open(), creat() */
#include "qeglfshooks.h"
#include <EGL/egl.h>
#include <linux/fb.h>
#include <sys/ioctl.h>
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
# 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 <<EOF
EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
IMX6_CFLAGS = -DLINUX=1 -DEGL_API_FB=1
QMAKE_LIBS_EGL += -lEGL
QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL
QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL
QMAKE_CFLAGS_RELEASE += \$\$IMX6_CFLAGS
QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS
QMAKE_CFLAGS_DEBUG += \$\$IMX6_CFLAGS
QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS
QMAKE_CFLAGS_EGL += \$\$IMX6_CFLAGS
load(qt_config)
EOF
# copy the hook in the mkspecs directory OE is using
cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
fi
}
do_configure_prepend_mx5() {
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 <<EOF
EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx5.cpp
IMX5_CFLAGS = -D_LINUX
QMAKE_LIBS_EGL += -lEGL
QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL
QMAKE_LIBS_OPENVG += -lOpenVG -lEGL
QMAKE_CFLAGS_RELEASE += \$\$IMX5_CFLAGS
QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS
QMAKE_CFLAGS_DEBUG += \$\$IMX5_CFLAGS
QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS
QMAKE_CFLAGS_EGL += \$\$IMX5_CFLAGS
load(qt_config)
EOF
cp ${WORKDIR}/qeglfshooks_imx5.cpp ${S}/mkspecs/linux-oe-g++/
fi
}
......@@ -2,34 +2,47 @@
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"
PACKAGECONFIG_GL_mx5 = "gles2"
PACKAGECONFIG_append_mx5 = " tslib icu examples"
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"
PACKAGECONFIG_GL_mx6 = "gles2"
PACKAGECONFIG_append_mx6 = " tslib icu examples"
TSLIB_DEPENDS_mx6 = "tslib"
QT_TSLIB_mx6 = "-tslib"
do_configure_prepend_mx5() {
sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
TSLIB_DEPENDS_mx5 = "tslib"
QT_TSLIB_mx5 = "-tslib"
cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
IMX5_CFLAGS = -D_LINUX=1
QMAKE_LIBS_EGL += -lEGL
QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL
QMAKE_LIBS_OPENVG += -lOpenVG -lEGL
FILESEXTRAPATHS_prepend_mx5 := "${THISDIR}/${PN}:"
SRC_URI_append_mx5 += " \
file://qeglfshooks_imx5.cpp \
"
QMAKE_CFLAGS_RELEASE += \$\$IMX5_CFLAGS
QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS
QMAKE_CFLAGS_DEBUG += \$\$IMX5_CFLAGS
QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS
load(qt_config)
EOF
}
do_configure_prepend_mx6() {
# adapt qmake.conf to our needs
sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
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 <<EOF
cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
IMX6_CFLAGS = -DLINUX=1 -DEGL_API_FB=1
EOF
# copy the hook in the mkspecs directory OE is using
cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
else
cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
IMX6_CFLAGS = -DLINUX=1
EOF
fi
cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
QMAKE_LIBS_EGL += -lEGL
QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL
QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL
......@@ -37,35 +50,8 @@ QMAKE_CFLAGS_RELEASE += \$\$IMX6_CFLAGS
QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS
QMAKE_CFLAGS_DEBUG += \$\$IMX6_CFLAGS
QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS
QMAKE_CFLAGS_EGL += \$\$IMX6_CFLAGS
load(qt_config)
EOF
# copy the hook in the mkspecs directory OE is using
cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
fi
}
do_configure_prepend_mx5() {
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 <<EOF
EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx5.cpp
IMX5_CFLAGS = -D_LINUX
QMAKE_LIBS_EGL += -lEGL
QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL
QMAKE_LIBS_OPENVG += -lOpenVG -lEGL
QMAKE_CFLAGS_RELEASE += \$\$IMX5_CFLAGS
QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS
QMAKE_CFLAGS_DEBUG += \$\$IMX5_CFLAGS
QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS
QMAKE_CFLAGS_EGL += \$\$IMX5_CFLAGS
load(qt_config)
EOF
cp ${WORKDIR}/qeglfshooks_imx5.cpp ${S}/mkspecs/linux-oe-g++/
fi
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment