diff options
Diffstat (limited to 'src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h')
| -rw-r--r-- | src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h | 50 |
1 files changed, 9 insertions, 41 deletions
diff --git a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h index c9b69b7bc..3ec77957f 100644 --- a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h +++ b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef VSP2HARDWARELAYERINTEGRATION_H #define VSP2HARDWARELAYERINTEGRATION_H @@ -50,6 +14,10 @@ struct wl_kms_buffer; QT_BEGIN_NAMESPACE +namespace QNativeInterface::Private { +struct QVsp2Screen; +} + class QScreen; class QWaylandSurface; class QWaylandQuickHardwareLayer; @@ -66,7 +34,7 @@ public: void remove(QWaylandQuickHardwareLayer *layer) override; void sendFrameCallbacks(); - QVector<QSharedPointer<Vsp2Layer>> m_layers; + QList<QSharedPointer<Vsp2Layer>> m_layers; private: void enableVspLayers(); void disableVspLayers(); @@ -96,7 +64,7 @@ public: bool isEnabled() { return m_layerIndex != -1; } QWaylandQuickHardwareLayer *hwLayer() const { return m_hwLayer; } -public slots: +public Q_SLOTS: void handleBufferCommitted(); void handleSurfaceChanged(); void updatePosition(); @@ -105,7 +73,7 @@ public slots: private: wl_kms_buffer *nextKmsBuffer(); int m_layerIndex = -1; - QScreen *m_screen = nullptr; + QVsp2Screen *m_screen = nullptr; QPoint m_position; QWaylandQuickHardwareLayer *m_hwLayer = nullptr; QWaylandSurface *m_surface = nullptr; |