diff options
Diffstat (limited to 'examples/vulkan/hellovulkantriangle')
| -rw-r--r-- | examples/vulkan/hellovulkantriangle/CMakeLists.txt | 44 | ||||
| -rw-r--r-- | examples/vulkan/hellovulkantriangle/main.cpp | 58 |
2 files changed, 30 insertions, 72 deletions
diff --git a/examples/vulkan/hellovulkantriangle/CMakeLists.txt b/examples/vulkan/hellovulkantriangle/CMakeLists.txt index a8290243cf..23789d4717 100644 --- a/examples/vulkan/hellovulkantriangle/CMakeLists.txt +++ b/examples/vulkan/hellovulkantriangle/CMakeLists.txt @@ -1,50 +1,43 @@ -# Generated from hellovulkantriangle.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(hellovulkantriangle LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) +find_package(Qt6 REQUIRED COMPONENTS Core Gui) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/vulkan/hellovulkantriangle") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) +qt_standard_project_setup() qt_add_executable(hellovulkantriangle ../shared/trianglerenderer.cpp ../shared/trianglerenderer.h main.cpp ) + set_target_properties(hellovulkantriangle PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(hellovulkantriangle PUBLIC - Qt::Core - Qt::Gui -) +target_link_libraries(hellovulkantriangle PRIVATE + Qt6::Core + Qt6::Gui +) # Resources: set_source_files_properties("../shared/color_frag.spv" PROPERTIES QT_RESOURCE_ALIAS "color_frag.spv" ) + set_source_files_properties("../shared/color_vert.spv" PROPERTIES QT_RESOURCE_ALIAS "color_vert.spv" ) + set(hellovulkantriangle_resource_files "../shared/color_frag.spv" "../shared/color_vert.spv" ) -qt6_add_resources(hellovulkantriangle "hellovulkantriangle" +qt_add_resources(hellovulkantriangle "hellovulkantriangle" PREFIX "/" FILES @@ -52,7 +45,14 @@ qt6_add_resources(hellovulkantriangle "hellovulkantriangle" ) install(TARGETS hellovulkantriangle - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET hellovulkantriangle + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/vulkan/hellovulkantriangle/main.cpp b/examples/vulkan/hellovulkantriangle/main.cpp index ae56207f81..3bf45e6b3a 100644 --- a/examples/vulkan/hellovulkantriangle/main.cpp +++ b/examples/vulkan/hellovulkantriangle/main.cpp @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include <QGuiApplication> #include <QVulkanInstance> @@ -55,11 +8,13 @@ Q_LOGGING_CATEGORY(lcVk, "qt.vulkan") +//! [2] class VulkanWindow : public QVulkanWindow { public: QVulkanWindowRenderer *createRenderer() override; }; +//! [2] QVulkanWindowRenderer *VulkanWindow::createRenderer() { @@ -72,17 +27,20 @@ int main(int argc, char *argv[]) QLoggingCategory::setFilterRules(QStringLiteral("qt.vulkan=true")); +//! [0] QVulkanInstance inst; inst.setLayers({ "VK_LAYER_KHRONOS_validation" }); - if (!inst.create()) qFatal("Failed to create Vulkan instance: %d", inst.errorCode()); +//! [0] +//! [1] VulkanWindow w; w.setVulkanInstance(&inst); w.resize(1024, 768); w.show(); +//! [1] return app.exec(); } |