diff options
Diffstat (limited to 'src/compositor/wayland_wrapper/qwlbuffermanager.cpp')
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlbuffermanager.cpp | 70 |
1 files changed, 23 insertions, 47 deletions
diff --git a/src/compositor/wayland_wrapper/qwlbuffermanager.cpp b/src/compositor/wayland_wrapper/qwlbuffermanager.cpp index b4f3d6822..7eb000ba4 100644 --- a/src/compositor/wayland_wrapper/qwlbuffermanager.cpp +++ b/src/compositor/wayland_wrapper/qwlbuffermanager.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWaylandCompositor module 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) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qwlbuffermanager_p.h" #include <QWaylandCompositor> @@ -65,6 +29,16 @@ struct buffer_manager_destroy_listener : wl_listener BufferManager *d = nullptr; }; +void BufferManager::registerBuffer(wl_resource *buffer_resource, ClientBuffer *clientBuffer) +{ + m_buffers[buffer_resource] = clientBuffer; + + auto *destroy_listener = new buffer_manager_destroy_listener; + destroy_listener->d = this; + wl_resource_add_destroy_listener(buffer_resource, destroy_listener); + +} + ClientBuffer *BufferManager::getBuffer(wl_resource *buffer_resource) { if (!buffer_resource) @@ -74,17 +48,19 @@ ClientBuffer *BufferManager::getBuffer(wl_resource *buffer_resource) if (it != m_buffers.end()) return it.value(); - auto bufferIntegration = QWaylandCompositorPrivate::get(m_compositor)->clientBufferIntegration(); ClientBuffer *newBuffer = nullptr; - if (bufferIntegration) - newBuffer = bufferIntegration->createBufferFor(buffer_resource); - if (!newBuffer) - newBuffer = new SharedMemoryBuffer(buffer_resource); - m_buffers[buffer_resource] = newBuffer; - auto *destroy_listener = new buffer_manager_destroy_listener; - destroy_listener->d = this; - wl_resource_add_destroy_listener(buffer_resource, destroy_listener); + for (auto *integration : QWaylandCompositorPrivate::get(m_compositor)->clientBufferIntegrations()) { + newBuffer = integration->createBufferFor(buffer_resource); + if (newBuffer) + break; + } + + if (newBuffer) + registerBuffer(buffer_resource, newBuffer); + else + qCWarning(qLcWaylandCompositorHardwareIntegration) << "Could not create buffer for resource."; + return newBuffer; } |