From 58bed4cda98e8e25db8adc61c7db73b6853077dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Nystr=C3=B6m?= Date: Wed, 16 Sep 2015 11:32:57 +0200 Subject: eglfs: Support for alternative Mali driver packages In addition to the proprietary Mali Linux driver bundle from ARM, there are a couple of semi open source alternative bundles out in the wild, which are mostly derivatives from the sunxi-mali bundle. The non-ARM bundles lacks the proprietary header file fbdev_window.h which defines the fbdev_window struct. Instead, it has an equivalent mali_native_window struct in the EGL/eglplatform.h (which in turn is included by EGL/egl.h). This change adds an alternative configure test which detects the non-ARM bundles are used. It also removes the dependency on fbdev_window.h by defining the structure ourselves, which actually makes the plugin potentially compilable with *any* EGL SDK. Change-Id: I78ab4b618e8e9c774c889fe9896105cf2cf4228e Reviewed-by: Oswald Buddenhagen Reviewed-by: Laszlo Agocs --- config.tests/qpa/eglfs-mali-2/eglfs-mali-2.cpp | 44 ++++++++++++++++++++++++++ config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro | 5 +++ 2 files changed, 49 insertions(+) create mode 100644 config.tests/qpa/eglfs-mali-2/eglfs-mali-2.cpp create mode 100644 config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro (limited to 'config.tests/qpa') diff --git a/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.cpp b/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.cpp new file mode 100644 index 0000000000..1914d6452b --- /dev/null +++ b/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.cpp @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the config.tests 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 +#include + +int main(int, char **) +{ + EGLDisplay dpy = 0; + EGLContext ctx = 0; + mali_native_window *w = 0; + eglDestroyContext(dpy, ctx); + return 0; +} diff --git a/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro b/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro new file mode 100644 index 0000000000..85bcf6484a --- /dev/null +++ b/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro @@ -0,0 +1,5 @@ +SOURCES = eglfs-mali-2.cpp + +CONFIG -= qt + +LIBS += -lEGL -lGLESv2 -- cgit v1.2.3