eglfs: Pluginize RPi, iMX6 and Mali backends

eglfs does not depend on the device makespecs anymore when it comes to these device
integration backends (hooks). Instead, backends are autodetected by configure.

The name of the preferred plugin is still set in the device makespecs. This
is optional. When not set and there is more than one plugin present in the system,
the environment variable QT_QPA_EGLFS_INTEGRATION will have to be set at runtime.
In the absence of that, the order is undefined.

Change-Id: Ie1ced2c9aa1beff2adb13b4fdea7c499cb5a6aab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

2 files changed, 3 insertions, 103 deletions

diff --git a/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp b/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
deleted file mode 100644
index b5ddafefdc..0000000000
--- a/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the qmake spec of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qeglfshooks.h"
-#include <EGL/eglvivante.h>
-#include <QDebug>
-
-QT_BEGIN_NAMESPACE
-
-class QEglFSImx6Hooks : public QEglFSHooks
-{
-public:
-    QEglFSImx6Hooks();
-    virtual QSize screenSize() const;
-    virtual EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format);
-    virtual void destroyNativeWindow(EGLNativeWindowType window);
-    virtual EGLNativeDisplayType platformDisplay() const;
-
-private:
-    QSize mScreenSize;
-    EGLNativeDisplayType mNativeDisplay;
-};
-
-
-QEglFSImx6Hooks::QEglFSImx6Hooks()
-{
-    int width, height;
-
-    bool multiBufferNotEnabledYet = qEnvironmentVariableIsEmpty("FB_MULTI_BUFFER");
-    bool multiBuffer = qEnvironmentVariableIsEmpty("QT_EGLFS_IMX6_NO_FB_MULTI_BUFFER");
-    if (multiBufferNotEnabledYet && multiBuffer) {
-        qWarning() << "QEglFSImx6Hooks will set environment variable FB_MULTI_BUFFER=2 to enable double buffering and vsync.\n"
-                   << "If this is not desired, you can override this via: export QT_EGLFS_IMX6_NO_FB_MULTI_BUFFER=1";
-        qputenv("FB_MULTI_BUFFER", "2");
-    }
-
-    mNativeDisplay = fbGetDisplayByIndex(framebufferIndex());
-    fbGetDisplayGeometry(mNativeDisplay, &width, &height);
-    mScreenSize.setHeight(height);
-    mScreenSize.setWidth(width);
-}
-
-QSize QEglFSImx6Hooks::screenSize() const
-{
-    return mScreenSize;
-}
-
-EGLNativeDisplayType QEglFSImx6Hooks::platformDisplay() const
-{
-    return mNativeDisplay;
-}
-
-EGLNativeWindowType QEglFSImx6Hooks::createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format)
-{
-    Q_UNUSED(window)
-    Q_UNUSED(format)
-
-    EGLNativeWindowType eglWindow = fbCreateWindow(mNativeDisplay, 0, 0, size.width(), size.height());
-    return eglWindow;
-}
-
-
-void QEglFSImx6Hooks::destroyNativeWindow(EGLNativeWindowType window)
-{
-    fbDestroyWindow(window);
-}
-
-QEglFSImx6Hooks eglFSImx6Hooks;
-QEglFSHooks *platformHooks = &eglFSImx6Hooks;
-
-QT_END_NAMESPACE
diff --git a/mkspecs/devices/linux-imx6-g++/qmake.conf b/mkspecs/devices/linux-imx6-g++/qmake.conf
index c8b6741e9a..1646c5fe77 100644
--- a/mkspecs/devices/linux-imx6-g++/qmake.conf
+++ b/mkspecs/devices/linux-imx6-g++/qmake.conf
@@ -4,8 +4,6 @@
 
 include(../common/linux_device_pre.conf)
 
-EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_imx6.cpp
-
 QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include
 QMAKE_LIBDIR           += $$[QT_SYSROOT]/usr/lib
 
@@ -21,6 +19,9 @@ QMAKE_CXXFLAGS         += $$IMX6_CFLAGS
 
 DISTRO_OPTS += hard-float
 
+# Preferred eglfs backend
+EGLFS_DEVICE_INTEGRATION = eglfs_viv
+
 include(../common/linux_arm_device_post.conf)
 
 load(qt_config)