1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backport texture sharing for NVIDIA

Browse Source 
This commit backports the Vulkan server buffer and texture sharing code
from Qt 5.14 to Qt 5.12 as an opt-in feature. To enable, configure with
"-feature-wayland-client-texture-sharing-experimental
-feature-wayland-compositor-texture-sharing-experimental"

Contains code from the following commits:

Add server buffer integration based on Vulkan
(commit a998944b2035c80999db4c1d9f7666c87ba73a86)

Compressed texture support for vulkan server buffers
(commit 4f87adc442a318b9c05fc73ae1020d0df0dfded3)

Implement server-side toOpenGlTexture for Vulkan
(commit 19361e7259f04b08925b1e8e99faf9460770ee7b)

New texture sharing protocol and infrastructure
(commit b09e808bf222984196cebd4447880781e3265714)

Change-Id: I6c36ef7fddcd4db39e80d03a822d89f15eae3434
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
This commit is contained in:
Paul Olav Tvete 2019-01-21 10:06:49 +01:00
parent 94b8d9deda
commit 37377fc044
8 changed files with 226 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/3rdparty/wayland/extensions/qt-texture-sharing-unstable-v1.xml vendored Normal file
View File

@ -0,0 +1,57 @@
<protocol name="qt_texture_sharing_unstable_v1">
<copyright>
Copyright (C) 2019 The Qt Company Ltd.
Contact: http://www.qt.io/licensing/
This file is part of the plugins of the Qt Toolkit.
$QT_BEGIN_LICENSE:BSD$
You may use this file under the terms of the BSD license as follows:
"Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
* Neither the name of The Qt Company Ltd nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
$QT_END_LICENSE$
</copyright>
<interface name="zqt_texture_sharing_v1" version="1">
<request name="request_image">
<arg name="key" type="string"/>
</request>
<request name="abandon_image">
<arg name="key" type="string"/>
</request>
<event name="image_failed">
<arg name="key" type="string"/>
<arg name="error_message" type="string"/>
</event>
<event name="provide_buffer">
<arg name="buffer" type="object" interface="qt_server_buffer"/>
<arg name="key" type="string"/>
</event>
</interface>
</protocol>

64
src/3rdparty/wayland/extensions/qt-vulkan-server-buffer-unstable-v1.xml vendored Normal file
View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<protocol name="qt_vulkan_server_buffer_unstable_v1">
<copyright>
Copyright (C) 2019 The Qt Company Ltd.
Contact: http://www.qt.io/licensing/
This file is part of the plugins of the Qt Toolkit.
$QT_BEGIN_LICENSE:BSD$
You may use this file under the terms of the BSD license as follows:
"Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
* Neither the name of The Qt Company Ltd nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
$QT_END_LICENSE$
</copyright>
<interface name="zqt_vulkan_server_buffer_v1" version="1">
<description summary="Internal protocol for buffer sharing using Vulkan external memory">
This protocol is used internally by Qt for implementing the
qt_server_buffer extension on hardware that supports Vulkan external memory .
This protocol is not part of the Qt API. It exists purely as an
implementation detail and may change from version to
version without notice, or even be removed.
</description>
<event name="server_buffer_created">
<description summary="vulkan buffer information">
Informs the client about a newly created server buffer.
The "fd" argument is a POSIX file descriptor representing the
underlying resources of a Vulkan device memory object as defined
in the GL_EXT_memory_object_fd extension.
</description>
<arg name="id" type="new_id" interface="qt_server_buffer"/>
<arg name="fd" type="fd" summary="GL_EXT_memory_object_fd"/>
<arg name="width" type="uint"/>
<arg name="height" type="uint"/>
<arg name="memory_size" type="uint" summary="size in bytes"/>
<arg name="format" type="uint" summary="GL internal format"/>
</event>
</interface>
</protocol>

17
src/plugins/platforms/wayland/configure.json
View File

@ -75,6 +75,11 @@
"type": "compile",
"test": "dmabuf_server_buffer",
"use": "egl"
},
"vulkan-server-buffer": {
"label": "Vulkan Buffer Sharing",
"type": "compile",
"test": "vulkan_server_buffer"
}
},
@ -123,6 +128,16 @@
"condition": "features.wayland-client && features.opengl && features.egl && tests.dmabuf-server-buffer",
"output": [ "privateFeature" ]
},
"wayland-client-texture-sharing-experimental" : {
"label": "Texture sharing (experimental)",
"autoDetect": "false",
"output": [ "privateFeature" ]
},
"wayland-vulkan-server-buffer": {
"label": "Vulkan-based server buffer integration",
"condition": "features.wayland-client && features.opengl && features.egl && tests.vulkan-server-buffer && features.wayland-client-texture-sharing-experimental",
"output": [ "privateFeature" ]
},
"wayland-shm-emulation-server-buffer": {
"label": "Shm emulation server buffer integration",
"condition": "features.wayland-client && features.opengl",
@ -149,6 +164,8 @@
"xcomposite-glx",
"wayland-drm-egl-server-buffer",
"wayland-libhybris-egl-server-buffer",
"wayland-dmabuf-server-buffer",
"wayland-vulkan-server-buffer",
"wayland-shm-emulation-server-buffer"
]
},

3
src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h
View File

@ -70,7 +70,8 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandServerBuffer
public:
enum Format {
RGBA32,
A8
A8,
Custom
};
QWaylandServerBuffer();

2
src/plugins/platforms/wayland/plugins/hardwareintegration/client.pro
View File

@ -18,3 +18,5 @@ qtConfig(wayland-shm-emulation-server-buffer): \
SUBDIRS += shm-emulation-server
qtConfig(wayland-dmabuf-server-buffer): \
SUBDIRS += dmabuf-server
qtConfig(wayland-vulkan-server-buffer): \
SUBDIRS += vulkan-server

66
src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/main.cpp Normal file
View File

@ -0,0 +1,66 @@
/****************************************************************************
**
** Copyright (C) 2019 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$
**
****************************************************************************/
#include <QtWaylandClient/private/qwaylandserverbufferintegrationplugin_p.h>
#include "vulkanserverbufferintegration.h"
QT_BEGIN_NAMESPACE
namespace QtWaylandClient {
class VulkanServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID QWaylandServerBufferIntegrationFactoryInterface_iid FILE "vulkan-server.json")
public:
QWaylandServerBufferIntegration *create(const QString&, const QStringList&) override;
};
QWaylandServerBufferIntegration *VulkanServerBufferPlugin::create(const QString& key, const QStringList& paramList)
{
Q_UNUSED(paramList);
Q_UNUSED(key);
return new VulkanServerBufferIntegration();
}
}
QT_END_NAMESPACE
#include "main.moc"

3
src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/vulkan-server.json Normal file
View File

@ -0,0 +1,3 @@
{
"Keys": [ "vulkan-server" ]
}

15
src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/vulkan-server.pro Normal file
View File

@ -0,0 +1,15 @@
# We have a bunch of C code with casts, so we can't have this option
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
QT += waylandclient-private
include(../../../../hardwareintegration/client/vulkan-server/vulkan-server.pri)
OTHER_FILES += \
vulkan-server.json
SOURCES += main.cpp
PLUGIN_TYPE = wayland-graphics-integration-client
PLUGIN_CLASS_NAME = VulkanServerBufferPlugin
load(qt_plugin)