From eb1c91b2185df1d57a87ed2b5335f3b0ba500c67 Mon Sep 17 00:00:00 2001 From: Jorgen Lind Date: Thu, 21 Nov 2013 08:14:03 +0100 Subject: make compositor build with new directory layout Change-Id: I3ede73420af9cb95820a9bec4fe7305f1107e22d Reviewed-by: Andy Nichols --- src/plugins/hardwareintegration/client/client.pro | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/plugins/hardwareintegration/client/client.pro (limited to 'src/plugins/hardwareintegration/client') diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro new file mode 100644 index 000000000..1b8f07640 --- /dev/null +++ b/src/plugins/hardwareintegration/client/client.pro @@ -0,0 +1,16 @@ +TEMPLATE=subdirs + +#config_wayland_egl { +# SUBDIRS += qwayland-egl +#} +#config_brcm_egl { +# SUBDIRS += qwayland-brcm-egl +#} +#config_xcomposite { +# config_egl { +# SUBDIRS += qwayland-xcomposite-egl +# } +# config_glx { +# SUBDIRS += qwayland-xcomposite-glx +# } +#} -- cgit v1.2.3 From 3a1ac7eb8adabbb27fea28f939c7d0197a7e450d Mon Sep 17 00:00:00 2001 From: Jorgen Lind Date: Thu, 21 Nov 2013 15:35:06 +0100 Subject: introduce HW integrations client plugins Change-Id: I07bdcf8db16741291b88084f045ae7b93a89b63f Reviewed-by: Andy Nichols --- .../client/brcm-egl/brcm-egl.json | 3 + .../client/brcm-egl/brcm-egl.pro | 14 ++++ .../hardwareintegration/client/brcm-egl/main.cpp | 74 ++++++++++++++++++++++ src/plugins/hardwareintegration/client/client.pro | 27 ++++---- .../client/wayland-egl/main.cpp | 74 ++++++++++++++++++++++ .../client/wayland-egl/wayland-egl.json | 3 + .../client/wayland-egl/wayland-egl.pro | 12 ++++ .../client/xcomposite-egl/main.cpp | 74 ++++++++++++++++++++++ .../client/xcomposite-egl/xcomposite-egl.json | 3 + .../client/xcomposite-egl/xcomposite-egl.pro | 12 ++++ .../client/xcomposite-glx/main.cpp | 74 ++++++++++++++++++++++ .../client/xcomposite-glx/xcomposite-glx.json | 3 + .../client/xcomposite-glx/xcomposite-glx.pro | 12 ++++ 13 files changed, 371 insertions(+), 14 deletions(-) create mode 100644 src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.json create mode 100644 src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro create mode 100644 src/plugins/hardwareintegration/client/brcm-egl/main.cpp create mode 100644 src/plugins/hardwareintegration/client/wayland-egl/main.cpp create mode 100644 src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.json create mode 100644 src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro create mode 100644 src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp create mode 100644 src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.json create mode 100644 src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro create mode 100644 src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp create mode 100644 src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.json create mode 100644 src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro (limited to 'src/plugins/hardwareintegration/client') diff --git a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.json b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.json new file mode 100644 index 000000000..48611c6ab --- /dev/null +++ b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "wayland-brcm" ] +} diff --git a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro new file mode 100644 index 000000000..d98b7941b --- /dev/null +++ b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro @@ -0,0 +1,14 @@ +PLUGIN_TYPE = wayland-graphics-integration/client +load(qt_plugin) + +QT += waylandclient-private + +include(../../../../hardwareintegration/client/brcm-egl/brcm-egl.pri) + +LIBS += -lEGL + +OTHER_FILES += \ + brcm-egl.json + +SOURCES += main.cpp + diff --git a/src/plugins/hardwareintegration/client/brcm-egl/main.cpp b/src/plugins/hardwareintegration/client/brcm-egl/main.cpp new file mode 100644 index 000000000..b7f376555 --- /dev/null +++ b/src/plugins/hardwareintegration/client/brcm-egl/main.cpp @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 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 +#include "qwaylandbrcmeglclientbufferintegration.h" + +QT_BEGIN_NAMESPACE + +class QWaylandBrcmEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.1" FILE "brcm-egl.json") +public: + QStringList keys() const; + QWaylandClientBufferIntegration *create(const QString&, const QStringList&); +}; + +QStringList QWaylandBrcmEglClientBufferPlugin::keys() const +{ + QStringList list; + list << "brcm"; + return list; +} + +QWaylandEglClientBufferIntegration *QWaylandBrcmEglClientBufferPlugin::create(const QString& system, const QStringList& paramList) +{ + Q_UNUSED(paramList); + if (system.toLower() == "brcm") + return new QWaylandBrcmEglClientBufferIntegration(); + + return 0; +} + +QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro index 1b8f07640..8c8f74bf6 100644 --- a/src/plugins/hardwareintegration/client/client.pro +++ b/src/plugins/hardwareintegration/client/client.pro @@ -1,16 +1,15 @@ TEMPLATE=subdirs -#config_wayland_egl { -# SUBDIRS += qwayland-egl -#} -#config_brcm_egl { -# SUBDIRS += qwayland-brcm-egl -#} -#config_xcomposite { -# config_egl { -# SUBDIRS += qwayland-xcomposite-egl -# } -# config_glx { -# SUBDIRS += qwayland-xcomposite-glx -# } -#} +config_wayland_egl: \ + SUBDIRS += wayland-egl + +config_brcm_egl: \ + SUBDIRS += brcm-egl + +config_xcomposite { + config_egl: \ + SUBDIRS += xcomposite-egl + + !contains(QT_CONFIG, opengles2):config_glx: \ + SUBDIRS += xcomposite-glx +} diff --git a/src/plugins/hardwareintegration/client/wayland-egl/main.cpp b/src/plugins/hardwareintegration/client/wayland-egl/main.cpp new file mode 100644 index 000000000..a6b7bbb69 --- /dev/null +++ b/src/plugins/hardwareintegration/client/wayland-egl/main.cpp @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 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 +#include "qwaylandeglclientbufferintegration.h" + +QT_BEGIN_NAMESPACE + +class QWaylandEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.1" FILE "wayland-egl.json") +public: + QStringList keys() const; + QWaylandClientBufferIntegration *create(const QString&, const QStringList&); +}; + +QStringList QWaylandEglClientBufferPlugin::keys() const +{ + QStringList list; + list << "wayland-egl"; + return list; +} + +QWaylandClientBufferIntegration *QWaylandEglClientBufferPlugin::create(const QString& system, const QStringList& paramList) +{ + Q_UNUSED(paramList); + if (system.toLower() == "wayland-egl") + return new QWaylandEglClientBufferIntegration(); + + return 0; +} + +QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.json b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.json new file mode 100644 index 000000000..4ea5bab90 --- /dev/null +++ b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "wayland-egl" ] +} diff --git a/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro new file mode 100644 index 000000000..0eca1d411 --- /dev/null +++ b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro @@ -0,0 +1,12 @@ +PLUGIN_TYPE = wayland-graphics-integration/client +load(qt_plugin) + +QT += waylandclient-private + +include(../../../../hardwareintegration/client/wayland-egl/wayland-egl.pri) + +OTHER_FILES += \ + wayland-egl.json + +SOURCES += main.cpp + diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp new file mode 100644 index 000000000..161657c8f --- /dev/null +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 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 +#include "qwaylandxcompositeeglclientbufferintegration.h" + +QT_BEGIN_NAMESPACE + +class QWaylandXCompositeEglClientBufferIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.1" FILE "xcomposite-egl.json") +public: + QStringList keys() const; + QWaylandClientBufferIntegration *create(const QString&, const QStringList&); +}; + +QStringList QWaylandXCompositeEglClientBufferIntegrationPlugin::keys() const +{ + QStringList list; + list << "xcomposite" << "xcomposite-egl"; + return list; +} + +QWaylandClientBufferIntegration *QWaylandXCompositeEglClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) +{ + Q_UNUSED(paramList); + if (system.toLower() == "xcomposite" || system.toLower() == "xcomposite-egl") + return new QWaylandXCompositeEGLClientBufferIntegration(); + + return 0; +} + +QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.json b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.json new file mode 100644 index 000000000..8ccd5b46b --- /dev/null +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "wayland-xcomposite" ] +} diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro new file mode 100644 index 000000000..3129f844b --- /dev/null +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro @@ -0,0 +1,12 @@ +PLUGIN_TYPE = wayland-graphics-integration/client +load(qt_plugin) + +QT += waylandclient-private + +include(../../../../hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri) + +OTHER_FILES += xcomposite-egl.json + +SOURCES += \ + main.cpp + diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp new file mode 100644 index 000000000..4beb7e6e3 --- /dev/null +++ b/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 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 +#include "qwaylandxcompositeglxclientbufferintegration.h" + +QT_BEGIN_NAMESPACE + +class QWaylandXCompositeGlxClientBufferIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.1" FILE "xcomposite-glx.json") +public: + QStringList keys() const; + QWaylandClientBufferIntegration *create(const QString&, const QStringList&); +}; + +QStringList QWaylandXCompositeGlxClientBufferIntegrationPlugin::keys() const +{ + QStringList list; + list << "xcomposite-glx"; + return list; +} + +QWaylandClientBufferIntegration *QWaylandXCompositeGlxClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) +{ + Q_UNUSED(paramList); + if (system.toLower() == "xcomposite-glx") + return new QWaylandXCompositeGLXClientBufferIntegration(); + + return 0; +} + +QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.json b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.json new file mode 100644 index 000000000..0f4a3bf69 --- /dev/null +++ b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "wayland-xcomposite-glx" ] +} diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro new file mode 100644 index 000000000..3146b3696 --- /dev/null +++ b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro @@ -0,0 +1,12 @@ +PLUGIN_TYPE = wayland-graphics-integration/client +load(qt_plugin) + +QT += waylandclient-private + +include(../../../../hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri) + +OTHER_FILES += xcomposite-glx.json + +SOURCES += \ + main.cpp + -- cgit v1.2.3 From 79c2b1cb237798f162b039723bc552b30aeee604 Mon Sep 17 00:00:00 2001 From: Jorgen Lind Date: Tue, 17 Dec 2013 16:26:39 +0100 Subject: Add drm-egl server buffer integration Change-Id: Ib72cb43e78c068ebafa8c4e8ef1576746c7015e8 Reviewed-by: Andy Nichols --- src/plugins/hardwareintegration/client/client.pro | 4 ++ .../client/drm-egl-server/drm-egl-server.json | 3 + .../client/drm-egl-server/drm-egl-server.pro | 14 ++++ .../client/drm-egl-server/main.cpp | 74 ++++++++++++++++++++++ 4 files changed, 95 insertions(+) create mode 100644 src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.json create mode 100644 src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro create mode 100644 src/plugins/hardwareintegration/client/drm-egl-server/main.cpp (limited to 'src/plugins/hardwareintegration/client') diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro index 8c8f74bf6..0b1191919 100644 --- a/src/plugins/hardwareintegration/client/client.pro +++ b/src/plugins/hardwareintegration/client/client.pro @@ -13,3 +13,7 @@ config_xcomposite { !contains(QT_CONFIG, opengles2):config_glx: \ SUBDIRS += xcomposite-glx } + +# we should try and resolve all symbols +# and they should be type deffed if not present +SUBDIRS += drm-egl-server diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.json b/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.json new file mode 100644 index 000000000..e2266ec60 --- /dev/null +++ b/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "drm-egl-server" ] +} diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro b/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro new file mode 100644 index 000000000..d282afc81 --- /dev/null +++ b/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro @@ -0,0 +1,14 @@ +PLUGIN_TYPE = wayland-graphics-integration/client +load(qt_plugin) + +QT += waylandclient-private + +include(../../../../hardwareintegration/client/drm-egl-server/drm-egl-server.pri) + +LIBS += -lEGL + +OTHER_FILES += \ + drm-egl-server.json + +SOURCES += main.cpp + diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp new file mode 100644 index 000000000..33f484287 --- /dev/null +++ b/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 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 +#include "drmeglserverbufferintegration.h" + +QT_BEGIN_NAMESPACE + +class DrmEglServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.WaylandClient.QWaylandServerBufferIntegrationFactoryInterface.5.1" FILE "drm-egl-server.json") +public: + QStringList keys() const; + QWaylandServerBufferIntegration *create(const QString&, const QStringList&); +}; + +QStringList DrmEglServerBufferPlugin::keys() const +{ + QStringList list; + list << "drm-egl-server"; + return list; +} + +QWaylandServerBufferIntegration *DrmEglServerBufferPlugin::create(const QString& system, const QStringList& paramList) +{ + Q_UNUSED(paramList); + if (system.toLower() == "drm-egl-server") + return new DrmEglServerBufferIntegration(); + + return 0; +} + +QT_END_NAMESPACE + +#include "main.moc" -- cgit v1.2.3 From b6713ec4262c05f7d103bc3b75ab81aedc690853 Mon Sep 17 00:00:00 2001 From: Jorgen Lind Date: Wed, 18 Dec 2013 07:59:53 +0100 Subject: Make classes in client private Change-Id: Ibf400b32f78a6a0fcf0991914d2d9ad684483979 Reviewed-by: Andy Nichols --- src/plugins/hardwareintegration/client/drm-egl-server/main.cpp | 2 +- src/plugins/hardwareintegration/client/wayland-egl/main.cpp | 2 +- src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/hardwareintegration/client') diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp index 33f484287..460ccb7a1 100644 --- a/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp +++ b/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "drmeglserverbufferintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/hardwareintegration/client/wayland-egl/main.cpp b/src/plugins/hardwareintegration/client/wayland-egl/main.cpp index a6b7bbb69..44ce6019d 100644 --- a/src/plugins/hardwareintegration/client/wayland-egl/main.cpp +++ b/src/plugins/hardwareintegration/client/wayland-egl/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qwaylandeglclientbufferintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp index 161657c8f..7c6135ccc 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qwaylandxcompositeeglclientbufferintegration.h" QT_BEGIN_NAMESPACE -- cgit v1.2.3 From 3970a4818786a3fc1cc2f60130dfdd602f109c69 Mon Sep 17 00:00:00 2001 From: Jorgen Lind Date: Mon, 6 Jan 2014 10:10:00 +0100 Subject: Config test for drm_egl_server Change-Id: Ib0ae4683374c2fd0c7386863ffb3c207605dc1e2 Reviewed-by: Jan Arne Petersen Reviewed-by: Laszlo Agocs --- src/plugins/hardwareintegration/client/client.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/hardwareintegration/client') diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro index 0b1191919..1d79b2634 100644 --- a/src/plugins/hardwareintegration/client/client.pro +++ b/src/plugins/hardwareintegration/client/client.pro @@ -14,6 +14,6 @@ config_xcomposite { SUBDIRS += xcomposite-glx } -# we should try and resolve all symbols -# and they should be type deffed if not present -SUBDIRS += drm-egl-server +config_drm_egl_server: \ + SUBDIRS += drm-egl-server + -- cgit v1.2.3