diff options
Diffstat (limited to 'src/quick/scenegraph/util/qsgplaintexture.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgplaintexture.cpp | 68 |
1 files changed, 25 insertions, 43 deletions
diff --git a/src/quick/scenegraph/util/qsgplaintexture.cpp b/src/quick/scenegraph/util/qsgplaintexture.cpp index 6e59f9e607..e3ea9ffc17 100644 --- a/src/quick/scenegraph/util/qsgplaintexture.cpp +++ b/src/quick/scenegraph/util/qsgplaintexture.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick 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) 2019 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 "qsgplaintexture_p.h" #include <QtQuick/private/qsgcontext_p.h> @@ -44,7 +8,8 @@ #include <private/qqmlglobal_p.h> #include <QtGui/qguiapplication.h> #include <QtGui/qpa/qplatformnativeinterface.h> -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> +#include <QtQuick/private/qsgrhisupport_p.h> #include <qtquick_tracepoints_p.h> @@ -102,7 +67,8 @@ void QSGPlainTexture::setTexture(QRhiTexture *texture) // RHI only void QSGPlainTexture::setTextureFromNativeTexture(QRhi *rhi, quint64 nativeObjectHandle, - int nativeLayout, + int nativeLayoutOrState, + uint nativeFormat, const QSize &size, QQuickWindow::CreateTextureOptions options, QQuickWindowPrivate::TextureFromNativeTextureFlags flags) @@ -113,10 +79,19 @@ void QSGPlainTexture::setTextureFromNativeTexture(QRhi *rhi, if (flags.testFlag(QQuickWindowPrivate::NativeTextureIsExternalOES)) texFlags |= QRhiTexture::ExternalOES; - QRhiTexture *t = rhi->newTexture(QRhiTexture::RGBA8, size, 1, texFlags); + QRhiTexture::Format format = QRhiTexture::RGBA8; + + QRhiTexture::Flags formatFlags; + auto rhiFormat = QSGRhiSupport::instance()->toRhiTextureFormat(nativeFormat, &formatFlags); + if (rhiFormat != QRhiTexture::UnknownFormat) { + format = rhiFormat; + texFlags |= formatFlags; + } + + QRhiTexture *t = rhi->newTexture(format, size, 1, texFlags); // ownership of the native object is never taken - t->createFrom({nativeObjectHandle, nativeLayout}); + t->createFrom({nativeObjectHandle, nativeLayoutOrState}); setTexture(t); } @@ -231,7 +206,12 @@ void QSGPlainTexture::commitTextureOperations(QRhi *rhi, QRhiResourceUpdateBatch } } - bool needsRebuild = m_texture && m_texture->pixelSize() != m_texture_size; + bool needsRebuild = false; + + if (m_texture && m_texture->pixelSize() != m_texture_size) { + m_texture->setPixelSize(m_texture_size); + needsRebuild = true; + } if (mipmappingChanged) { QRhiTexture::Flags f = m_texture->flags(); @@ -276,3 +256,5 @@ void QSGPlainTexture::commitTextureOperations(QRhi *rhi, QRhiResourceUpdateBatch } QT_END_NAMESPACE + +#include "moc_qsgplaintexture_p.cpp" |