diff options
Diffstat (limited to 'src/gui/vulkan/qvulkanwindow.h')
-rw-r--r-- | src/gui/vulkan/qvulkanwindow.h | 57 |
1 files changed, 17 insertions, 40 deletions
diff --git a/src/gui/vulkan/qvulkanwindow.h b/src/gui/vulkan/qvulkanwindow.h index 4325b6317d..537dbc4ae1 100644 --- a/src/gui/vulkan/qvulkanwindow.h +++ b/src/gui/vulkan/qvulkanwindow.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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) 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 #ifndef QVULKANWINDOW_H #define QVULKANWINDOW_H @@ -47,7 +11,7 @@ #pragma qt_sync_skip_header_check #endif -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) #include <QtGui/qvulkaninstance.h> #include <QtGui/qwindow.h> @@ -55,7 +19,7 @@ #include <QtGui/qmatrix4x4.h> #include <QtCore/qset.h> -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC typedef void* VkQueue; typedef void* VkCommandPool; typedef void* VkRenderPass; @@ -90,6 +54,14 @@ public: virtual void logicalDeviceLost(); }; +#ifndef VK_VERSION_1_1 +typedef struct VkPhysicalDeviceFeatures2 { + VkStructureType sType; + void* pNext; + VkPhysicalDeviceFeatures features; +} VkPhysicalDeviceFeatures2; +#endif + class Q_GUI_EXPORT QVulkanWindow : public QWindow { Q_OBJECT @@ -113,6 +85,11 @@ public: QVulkanInfoVector<QVulkanExtension> supportedDeviceExtensions(); void setDeviceExtensions(const QByteArrayList &extensions); + typedef std::function<void(VkPhysicalDeviceFeatures &)> EnabledFeaturesModifier; + void setEnabledFeaturesModifier(const EnabledFeaturesModifier &modifier); + typedef std::function<void(VkPhysicalDeviceFeatures2 &)> EnabledFeatures2Modifier; + void setEnabledFeaturesModifier(EnabledFeatures2Modifier modifier); + void setPreferredColorFormats(const QList<VkFormat> &formats); QList<int> supportedSampleCounts(); |