diff options
Diffstat (limited to 'src/quick/scenegraph/compressedtexture/qsgcompressedtexture.cpp')
| -rw-r--r-- | src/quick/scenegraph/compressedtexture/qsgcompressedtexture.cpp | 71 |
1 files changed, 22 insertions, 49 deletions
diff --git a/src/quick/scenegraph/compressedtexture/qsgcompressedtexture.cpp b/src/quick/scenegraph/compressedtexture/qsgcompressedtexture.cpp index 46dc6c5507..629c6427b8 100644 --- a/src/quick/scenegraph/compressedtexture/qsgcompressedtexture.cpp +++ b/src/quick/scenegraph/compressedtexture/qsgcompressedtexture.cpp @@ -1,48 +1,12 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 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 "qsgcompressedtexture_p.h" #include <QDebug> #include <QtQuick/private/qquickwindow_p.h> #include <QtQuick/private/qquickitem_p.h> -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> QT_BEGIN_NAMESPACE @@ -377,19 +341,26 @@ void QSGCompressedTexture::commitTextureOperations(QRhi *rhi, QRhiResourceUpdate return; } - QRhiTexture::Flags texFlags; - if (fmt.isSRGB) - texFlags |= QRhiTexture::sRGB; - - if (!rhi->isTextureFormatSupported(fmt.rhiFormat, texFlags)) { - qWarning("Unsupported compressed format 0x%x", m_textureData.glInternalFormat()); - return; - } - if (!m_texture) { + QRhiTexture::Flags texFlags; + if (fmt.isSRGB) + texFlags |= QRhiTexture::sRGB; + + if (!rhi->isTextureFormatSupported(fmt.rhiFormat, texFlags)) { + qCDebug(QSG_LOG_TEXTUREIO, "Compressed texture format possibly unsupported: 0x%x", + m_textureData.glInternalFormat()); + // For the Metal backend, don't even try to create an unsupported texture + // since trying to do so is invalid. + if (rhi->backend() == QRhi::Metal) { + qWarning("Unsupported compressed texture format 0x%x", m_textureData.glInternalFormat()); + return; + } + } + m_texture = rhi->newTexture(fmt.rhiFormat, m_size, 1, texFlags); if (!m_texture->create()) { - qWarning("Failed to create QRhiTexture for compressed data"); + qWarning("Failed to create QRhiTexture for compressed data with format 0x%x", + m_textureData.glInternalFormat()); delete m_texture; m_texture = nullptr; return; @@ -466,3 +437,5 @@ QSize QSGCompressedTextureFactory::textureSize() const } QT_END_NAMESPACE + +#include "moc_qsgcompressedtexture_p.cpp" |