From 8dd6957cd7a1d86714b32b97dffe603a8636848a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 3 Jul 2020 15:40:47 +0200 Subject: Make QtPlatformHeaders a private module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The APIs will be reintroduced as part of the new platform interface API where appropriate. Clients that still depend on the platform headers can include it via QT += platformheaders-private. Change-Id: Ifbd836d833d19f3cf48cd4f933d7fe754c06d2d9 Reviewed-by: Tor Arne Vestbø --- .../eglfsfunctions/eglfsfunctions.pri | 2 +- .../eglfsfunctions/qeglfsfunctions.h | 133 ------------------- .../eglfsfunctions/qeglfsfunctions_p.h | 144 +++++++++++++++++++++ 3 files changed, 145 insertions(+), 134 deletions(-) delete mode 100644 src/platformheaders/eglfsfunctions/qeglfsfunctions.h create mode 100644 src/platformheaders/eglfsfunctions/qeglfsfunctions_p.h (limited to 'src/platformheaders/eglfsfunctions') diff --git a/src/platformheaders/eglfsfunctions/eglfsfunctions.pri b/src/platformheaders/eglfsfunctions/eglfsfunctions.pri index e4e645f5a5..76c6383ddb 100644 --- a/src/platformheaders/eglfsfunctions/eglfsfunctions.pri +++ b/src/platformheaders/eglfsfunctions/eglfsfunctions.pri @@ -1 +1 @@ -HEADERS += $$PWD/qeglfsfunctions.h +HEADERS += $$PWD/qeglfsfunctions_p.h diff --git a/src/platformheaders/eglfsfunctions/qeglfsfunctions.h b/src/platformheaders/eglfsfunctions/qeglfsfunctions.h deleted file mode 100644 index 869fe7ce3f..0000000000 --- a/src/platformheaders/eglfsfunctions/qeglfsfunctions.h +++ /dev/null @@ -1,133 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QEGLFSFUNCTIONS_H -#define QEGLFSFUNCTIONS_H - -#include -#include - -QT_BEGIN_NAMESPACE - -class QEglFSFunctions -{ -public: - typedef void (*LoadKeymapType)(const QString &filename); - typedef void (*SwitchLangType)(); - static QByteArray loadKeymapTypeIdentifier() { return QByteArrayLiteral("EglFSLoadKeymap"); } - static QByteArray switchLangTypeIdentifier() { return QByteArrayLiteral("EglFSSwitchLang"); } - - static void loadKeymap(const QString &filename) - { - LoadKeymapType func = reinterpret_cast(QGuiApplication::platformFunction(loadKeymapTypeIdentifier())); - if (func) - func(filename); - } - - static void switchLang() - { - SwitchLangType func = reinterpret_cast(QGuiApplication::platformFunction(switchLangTypeIdentifier())); - if (func) - func(); - } - - typedef int (*Vsp2AddLayerType)(const QScreen *screen, int dmabufFd, const QSize &size, const QPoint &position, uint drmPixelFormat, uint bytesPerLine); - static QByteArray vsp2AddLayerTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2AddLayer"); } - - //vsp2 functions are currently internal and preliminary (see qdoc file) - static int vsp2AddLayer(const QScreen *screen, int dmabufFd, const QSize &size, const QPoint &position, uint drmPixelFormat, uint bytesPerLine) - { - auto func = reinterpret_cast(QGuiApplication::platformFunction(vsp2AddLayerTypeIdentifier())); - if (func) - return func(screen, dmabufFd, size, position, drmPixelFormat, bytesPerLine); - return 0; - } - - typedef bool (*Vsp2RemoveLayerType)(const QScreen *screen, int id); - static QByteArray vsp2RemoveLayerTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2RemoveLayer"); } - - static bool vsp2RemoveLayer(const QScreen *screen, int id) - { - auto func = reinterpret_cast(QGuiApplication::platformFunction(vsp2RemoveLayerTypeIdentifier())); - return func && func(screen, id); - } - - typedef void (*Vsp2SetLayerBufferType)(const QScreen *screen, int id, int dmabufFd); - static QByteArray vsp2SetLayerBufferTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2SetLayerBuffer"); } - - static void vsp2SetLayerBuffer(const QScreen *screen, int id, int dmabufFd) - { - auto func = reinterpret_cast(QGuiApplication::platformFunction(vsp2SetLayerBufferTypeIdentifier())); - if (func) - func(screen, id, dmabufFd); - } - - typedef bool (*Vsp2SetLayerPositionType)(const QScreen *screen, int id, const QPoint &position); - static QByteArray vsp2SetLayerPositionTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2SetLayerPosition"); } - - static bool vsp2SetLayerPosition(const QScreen *screen, int id, const QPoint &position) - { - auto func = reinterpret_cast(QGuiApplication::platformFunction(vsp2SetLayerPositionTypeIdentifier())); - return func && func(screen, id, position); - } - - typedef bool (*Vsp2SetLayerAlphaType)(const QScreen *screen, int id, qreal alpha); - static QByteArray vsp2SetLayerAlphaTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2SetLayerAlpha"); } - - static bool vsp2SetLayerAlpha(const QScreen *screen, int id, qreal alpha) - { - auto func = reinterpret_cast(QGuiApplication::platformFunction(vsp2SetLayerAlphaTypeIdentifier())); - return func && func(screen, id, alpha); - } - - typedef void (*Vsp2AddBlendListenerType)(const QScreen *screen, void(*callback)()); - static QByteArray vsp2AddBlendListenerTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2AddBlendListener"); } - - static void vsp2AddBlendListener(const QScreen *screen, void(*callback)()) - { - auto func = reinterpret_cast(QGuiApplication::platformFunction(vsp2AddBlendListenerTypeIdentifier())); - if (func) - func(screen, callback); - } -}; - - -QT_END_NAMESPACE - -#endif // QEGLFSFUNCTIONS_H diff --git a/src/platformheaders/eglfsfunctions/qeglfsfunctions_p.h b/src/platformheaders/eglfsfunctions/qeglfsfunctions_p.h new file mode 100644 index 0000000000..1eb177f694 --- /dev/null +++ b/src/platformheaders/eglfsfunctions/qeglfsfunctions_p.h @@ -0,0 +1,144 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the plugins 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://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 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QEGLFSFUNCTIONS_H +#define QEGLFSFUNCTIONS_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include + +QT_BEGIN_NAMESPACE + +class QEglFSFunctions +{ +public: + typedef void (*LoadKeymapType)(const QString &filename); + typedef void (*SwitchLangType)(); + static QByteArray loadKeymapTypeIdentifier() { return QByteArrayLiteral("EglFSLoadKeymap"); } + static QByteArray switchLangTypeIdentifier() { return QByteArrayLiteral("EglFSSwitchLang"); } + + static void loadKeymap(const QString &filename) + { + LoadKeymapType func = reinterpret_cast(QGuiApplication::platformFunction(loadKeymapTypeIdentifier())); + if (func) + func(filename); + } + + static void switchLang() + { + SwitchLangType func = reinterpret_cast(QGuiApplication::platformFunction(switchLangTypeIdentifier())); + if (func) + func(); + } + + typedef int (*Vsp2AddLayerType)(const QScreen *screen, int dmabufFd, const QSize &size, const QPoint &position, uint drmPixelFormat, uint bytesPerLine); + static QByteArray vsp2AddLayerTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2AddLayer"); } + + //vsp2 functions are currently internal and preliminary (see qdoc file) + static int vsp2AddLayer(const QScreen *screen, int dmabufFd, const QSize &size, const QPoint &position, uint drmPixelFormat, uint bytesPerLine) + { + auto func = reinterpret_cast(QGuiApplication::platformFunction(vsp2AddLayerTypeIdentifier())); + if (func) + return func(screen, dmabufFd, size, position, drmPixelFormat, bytesPerLine); + return 0; + } + + typedef bool (*Vsp2RemoveLayerType)(const QScreen *screen, int id); + static QByteArray vsp2RemoveLayerTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2RemoveLayer"); } + + static bool vsp2RemoveLayer(const QScreen *screen, int id) + { + auto func = reinterpret_cast(QGuiApplication::platformFunction(vsp2RemoveLayerTypeIdentifier())); + return func && func(screen, id); + } + + typedef void (*Vsp2SetLayerBufferType)(const QScreen *screen, int id, int dmabufFd); + static QByteArray vsp2SetLayerBufferTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2SetLayerBuffer"); } + + static void vsp2SetLayerBuffer(const QScreen *screen, int id, int dmabufFd) + { + auto func = reinterpret_cast(QGuiApplication::platformFunction(vsp2SetLayerBufferTypeIdentifier())); + if (func) + func(screen, id, dmabufFd); + } + + typedef bool (*Vsp2SetLayerPositionType)(const QScreen *screen, int id, const QPoint &position); + static QByteArray vsp2SetLayerPositionTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2SetLayerPosition"); } + + static bool vsp2SetLayerPosition(const QScreen *screen, int id, const QPoint &position) + { + auto func = reinterpret_cast(QGuiApplication::platformFunction(vsp2SetLayerPositionTypeIdentifier())); + return func && func(screen, id, position); + } + + typedef bool (*Vsp2SetLayerAlphaType)(const QScreen *screen, int id, qreal alpha); + static QByteArray vsp2SetLayerAlphaTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2SetLayerAlpha"); } + + static bool vsp2SetLayerAlpha(const QScreen *screen, int id, qreal alpha) + { + auto func = reinterpret_cast(QGuiApplication::platformFunction(vsp2SetLayerAlphaTypeIdentifier())); + return func && func(screen, id, alpha); + } + + typedef void (*Vsp2AddBlendListenerType)(const QScreen *screen, void(*callback)()); + static QByteArray vsp2AddBlendListenerTypeIdentifier() { return QByteArrayLiteral("EglFSVsp2AddBlendListener"); } + + static void vsp2AddBlendListener(const QScreen *screen, void(*callback)()) + { + auto func = reinterpret_cast(QGuiApplication::platformFunction(vsp2AddBlendListenerTypeIdentifier())); + if (func) + func(screen, callback); + } +}; + + +QT_END_NAMESPACE + +#endif // QEGLFSFUNCTIONS_H -- cgit v1.2.3