diff options
author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-01-29 14:30:21 +0200 |
---|---|---|
committer | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-03-26 15:14:10 +0100 |
commit | 3a49e96f29a7cde711f376f2417875d54dd9f17f (patch) | |
tree | e6d633c8b80deaf1e9c1241cb3619c89037dc472 /src/plugins | |
parent | 8b1109a0d5214f63d9cff2653e3bbf8648ad4ad4 (diff) |
Add a libhybris hardwareintegrations to share EGL server buffers
Add a hardwareintegration plugin to make Qt server side EGL buffers
shareable from the compositor to the client, such as what the
server-buffer example does.
Change-Id: I24558324d51202ca449b47b0ee395c8e81c10698
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/plugins')
8 files changed, 166 insertions, 0 deletions
diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro index 1d79b2634..b7a9b46ee 100644 --- a/src/plugins/hardwareintegration/client/client.pro +++ b/src/plugins/hardwareintegration/client/client.pro @@ -17,3 +17,5 @@ config_xcomposite { config_drm_egl_server: \ SUBDIRS += drm-egl-server +config_libhybris_egl_server: \ + SUBDIRS += libhybris-egl-server diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.json b/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.json new file mode 100644 index 000000000..3a1f4c08a --- /dev/null +++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "libhybris-egl-server" ] +} diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro new file mode 100644 index 000000000..4d7909701 --- /dev/null +++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro @@ -0,0 +1,14 @@ +PLUGIN_TYPE = wayland-graphics-integration/client +load(qt_plugin) + +QT += waylandclient-private + +include(../../../../hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pri) + +LIBS += -lEGL + +OTHER_FILES += \ + libhybris-egl-server.json + +SOURCES += main.cpp + diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp b/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp new file mode 100644 index 000000000..9aee15790 --- /dev/null +++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Jolla Ltd, author: <giulio.camuffo@jollamobile.com> +** 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 <QtWaylandClient/private/qwaylandserverbufferintegrationplugin_p.h> +#include "libhybriseglserverbufferintegration.h" + +QT_BEGIN_NAMESPACE + +class LibHybrisEglServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID QWaylandServerBufferIntegrationFactoryInterface_iid FILE "libhybris-egl-server.json") +public: + QWaylandServerBufferIntegration *create(const QString&, const QStringList&); +}; + +QWaylandServerBufferIntegration *LibHybrisEglServerBufferPlugin::create(const QString& system, const QStringList& paramList) +{ + Q_UNUSED(paramList); + Q_UNUSED(system); + return new LibHybrisEglServerBufferIntegration(); +} + +QT_END_NAMESPACE + +#include "main.moc" diff --git a/src/plugins/hardwareintegration/compositor/compositor.pro b/src/plugins/hardwareintegration/compositor/compositor.pro index 3c1ff5d73..215cd2571 100644 --- a/src/plugins/hardwareintegration/compositor/compositor.pro +++ b/src/plugins/hardwareintegration/compositor/compositor.pro @@ -15,3 +15,6 @@ config_xcomposite { config_drm_egl_server: \ SUBDIRS += drm-egl-server + +config_libhybris_egl_server: \ + SUBDIRS += libhybris-egl-server diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.json b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.json new file mode 100644 index 000000000..3a1f4c08a --- /dev/null +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "libhybris-egl-server" ] +} diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro new file mode 100644 index 000000000..7a209724f --- /dev/null +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro @@ -0,0 +1,12 @@ +PLUGIN_TYPE = wayland-graphics-integration/server +load(qt_plugin) + +QT = compositor compositor-private core-private gui-private + +OTHER_FILES += libhybris-egl-server.json + +SOURCES += \ + main.cpp + +include($PWD/../../../../../hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri) + diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/main.cpp b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/main.cpp new file mode 100644 index 000000000..10751266c --- /dev/null +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/main.cpp @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Jolla Ltd, author: <giulio.camuffo@jollamobile.com> +** 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 <QtCompositor/private/qwlserverbufferintegrationplugin_p.h> +#include <QtCompositor/private/qwlserverbufferintegration_p.h> +#include "libhybriseglserverbufferintegration.h" + +QT_BEGIN_NAMESPACE + +class LibHybrisEglServerBufferIntegrationPlugin : public QtWayland::ServerBufferIntegrationPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID QtWaylandServerBufferIntegrationFactoryInterface_iid FILE "libhybris-egl-server.json") +public: + QtWayland::ServerBufferIntegration *create(const QString&, const QStringList&); +}; + +QtWayland::ServerBufferIntegration *LibHybrisEglServerBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) +{ + Q_UNUSED(paramList); + Q_UNUSED(system); + return new LibHybrisEglServerBufferIntegration(); +} + +QT_END_NAMESPACE + +#include "main.moc" |