diff options
Diffstat (limited to 'src/gui/kernel/qoffscreensurface.cpp')
| -rw-r--r-- | src/gui/kernel/qoffscreensurface.cpp | 149 |
1 files changed, 34 insertions, 115 deletions
diff --git a/src/gui/kernel/qoffscreensurface.cpp b/src/gui/kernel/qoffscreensurface.cpp index c74fe0b3a1..02e606658a 100644 --- a/src/gui/kernel/qoffscreensurface.cpp +++ b/src/gui/kernel/qoffscreensurface.cpp @@ -1,48 +1,12 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui 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) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qoffscreensurface.h" #include "qguiapplication_p.h" #include "qscreen.h" #include "qplatformintegration.h" -#include "qplatformoffscreensurface.h" +#include "qoffscreensurface_p.h" #include "qwindow.h" #include "qplatformwindow.h" @@ -50,6 +14,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /*! \class QOffscreenSurface \inmodule QtGui @@ -91,36 +57,6 @@ QT_BEGIN_NAMESPACE native surface. For the use cases of QOffscreenSurface (rendering to FBOs, texture upload) this is not a problem. */ -class Q_GUI_EXPORT QOffscreenSurfacePrivate : public QObjectPrivate -{ - Q_DECLARE_PUBLIC(QOffscreenSurface) - -public: - QOffscreenSurfacePrivate() - : QObjectPrivate() - , surfaceType(QSurface::OpenGLSurface) - , platformOffscreenSurface(nullptr) - , offscreenWindow(nullptr) - , requestedFormat(QSurfaceFormat::defaultFormat()) - , screen(nullptr) - , size(1, 1) - , nativeHandle(nullptr) - { - } - - ~QOffscreenSurfacePrivate() - { - } - - QSurface::SurfaceType surfaceType; - QPlatformOffscreenSurface *platformOffscreenSurface; - QWindow *offscreenWindow; - QSurfaceFormat requestedFormat; - QScreen *screen; - QSize size; - void *nativeHandle; -}; - /*! \since 5.10 @@ -148,19 +84,6 @@ QOffscreenSurface::QOffscreenSurface(QScreen *targetScreen, QObject *parent) } /*! - Creates an offscreen surface for the \a targetScreen. - - The underlying platform surface is not created until create() is called. - - \sa setScreen(), create() -*/ -QOffscreenSurface::QOffscreenSurface(QScreen *targetScreen) - : QOffscreenSurface(targetScreen, nullptr) -{ -} - - -/*! Destroys the offscreen surface. */ QOffscreenSurface::~QOffscreenSurface() @@ -205,7 +128,7 @@ void QOffscreenSurface::create() // violate the minimum title bar width on the platform. d->offscreenWindow->setFlags(d->offscreenWindow->flags() | Qt::CustomizeWindowHint | Qt::FramelessWindowHint); - d->offscreenWindow->setObjectName(QLatin1String("QOffscreenSurface")); + d->offscreenWindow->setObjectName("QOffscreenSurface"_L1); // Remove this window from the global list since we do not want it to be destroyed when closing the app. // The QOffscreenSurface has to be usable even after exiting the event loop. QGuiApplicationPrivate::window_list.removeOne(d->offscreenWindow); @@ -241,14 +164,12 @@ void QOffscreenSurface::destroy() delete d->offscreenWindow; d->offscreenWindow = nullptr; } - - d->nativeHandle = nullptr; } /*! Returns \c true if this offscreen surface is valid; otherwise returns \c false. - The offscreen surface is valid if the platform resources have been successfuly allocated. + The offscreen surface is valid if the platform resources have been successfully allocated. \sa create() */ @@ -357,26 +278,6 @@ void QOffscreenSurface::setScreen(QScreen *newScreen) } /*! - Sets the native handle to which the offscreen surface is connected to \a handle. - - The native handle will be resolved in the create() function. Calling - this function after create() will not re-create a native surface. - - \note The interpretation of the native handle is platform specific. Only - some platforms will support adopting native handles of offscreen surfaces - and platforms that do not implement this support will ignore the handle. - - \since 5.9 - \sa nativeHandle() -*/ - -void QOffscreenSurface::setNativeHandle(void *handle) -{ - Q_D(QOffscreenSurface); - d->nativeHandle = handle; -} - -/*! Called when the offscreen surface's screen is destroyed. \internal @@ -408,17 +309,17 @@ QPlatformOffscreenSurface *QOffscreenSurface::handle() const } /*! - Returns an optional native handle to which the offscreen surface is connected. + \fn template <typename QNativeInterface> QNativeInterface *QOffscreenSurface::nativeInterface() const - \since 5.9 - \sa setNativeHandle() -*/ + Returns a native interface of the given type for the surface. -void *QOffscreenSurface::nativeHandle() const -{ - Q_D(const QOffscreenSurface); - return d->nativeHandle; -} + This function provides access to platform specific functionality + of QOffScreenSurface, as defined in the QNativeInterface namespace: + + \annotatedlist native-interfaces-qoffscreensurface + + If the requested interface is not available a \nullptr is returned. +*/ /*! Returns the platform surface corresponding to the offscreen surface. @@ -434,4 +335,22 @@ QPlatformSurface *QOffscreenSurface::surfaceHandle() const return d->platformOffscreenSurface; } +using namespace QNativeInterface; + +void *QOffscreenSurface::resolveInterface(const char *name, int revision) const +{ + Q_UNUSED(name); Q_UNUSED(revision); + + Q_D(const QOffscreenSurface); + Q_UNUSED(d); + +#if defined(Q_OS_ANDROID) + QT_NATIVE_INTERFACE_RETURN_IF(QAndroidOffscreenSurface, d->platformOffscreenSurface); +#endif + + return nullptr; +} + QT_END_NAMESPACE + +#include "moc_qoffscreensurface.cpp" |