From f1a23a546720e4f1541404185ff8e765463e6bf6 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 31 Jan 2017 15:04:33 +0100 Subject: Basic Vulkan enablers For Android, Windows and xcb. Verified on Win10 with NVIDIA, Win10 with AMD, Android with Tegra K1, Android aarch64 with Tegra X1, and Linux aarch64 with Tegra X1 (Jetson TX1, L4T). Introduce QPA-based Vulkan library loader, core function resolver, and instance creation support. In addition to creating a new VkInstance, adopting an existing one from an external engine is supported as well. The WSI specifics are hidden in the platform plugins. Vulkan-capable windows use the new surface type VulkanSurface and are associated with a QVulkanInstance. On Windows VULKAN_SDK is picked up automatically so finding vulkan.h needs no additional manual steps once the LunarG SDK is installed. [ChangeLog][QtGui] Added support for rendering to QWindow via the Vulkan graphics API. Task-number: QTBUG-55981 Change-Id: I50fa92d313fa440e0cc73939c6d7510ca317fbc9 Reviewed-by: Qt CI Bot Reviewed-by: Oswald Buddenhagen Reviewed-by: Andy Nichols --- config.tests/qpa/vulkan/vulkan.cpp | 58 ++++++++++++++++++++++++++++++++++++++ config.tests/qpa/vulkan/vulkan.pro | 1 + 2 files changed, 59 insertions(+) create mode 100644 config.tests/qpa/vulkan/vulkan.cpp create mode 100644 config.tests/qpa/vulkan/vulkan.pro (limited to 'config.tests/qpa') diff --git a/config.tests/qpa/vulkan/vulkan.cpp b/config.tests/qpa/vulkan/vulkan.cpp new file mode 100644 index 0000000000..22f5edf9f2 --- /dev/null +++ b/config.tests/qpa/vulkan/vulkan.cpp @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the config.tests 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$ +** +****************************************************************************/ + +// This is a header-only test. Qt does not rely on linking to a Vulkan library directly. + +#include + +// The pData parameter has changed from uint32_t* to void* at some point. +// Ensure the headers have the updated one to prevent compile errors later on. +PFN_vkCmdUpdateBuffer cmdUpdBuf; +void testUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void* pData) +{ + cmdUpdBuf(commandBuffer, dstBuffer, dstOffset, dataSize, pData); +} + +int main(int, char **) +{ + VkInstanceCreateInfo info; + testUpdateBuffer(0, 0, 0, 0, 0); + + return 0; +} diff --git a/config.tests/qpa/vulkan/vulkan.pro b/config.tests/qpa/vulkan/vulkan.pro new file mode 100644 index 0000000000..5f05bc49aa --- /dev/null +++ b/config.tests/qpa/vulkan/vulkan.pro @@ -0,0 +1 @@ +SOURCES = vulkan.cpp -- cgit v1.2.3