diff options
Diffstat (limited to 'examples/vulkan/hellovulkancubes')
-rw-r--r-- | examples/vulkan/hellovulkancubes/CMakeLists.txt | 63 | ||||
-rw-r--r-- | examples/vulkan/hellovulkancubes/renderer.cpp | 4 |
2 files changed, 65 insertions, 2 deletions
diff --git a/examples/vulkan/hellovulkancubes/CMakeLists.txt b/examples/vulkan/hellovulkancubes/CMakeLists.txt new file mode 100644 index 0000000000..94feac6401 --- /dev/null +++ b/examples/vulkan/hellovulkancubes/CMakeLists.txt @@ -0,0 +1,63 @@ +# Generated from hellovulkancubes.pro. + +cmake_minimum_required(VERSION 3.14) +project(hellovulkancubes LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkancubes") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Concurrent) + +add_qt_gui_executable(hellovulkancubes + camera.cpp camera.h + main.cpp + mainwindow.cpp mainwindow.h + mesh.cpp mesh.h + renderer.cpp renderer.h + shader.cpp shader.h + vulkanwindow.cpp vulkanwindow.h +) +target_link_libraries(hellovulkancubes PUBLIC + Qt::Concurrent + Qt::Core + Qt::Gui + Qt::Widgets +) + + +# Resources: +set_source_files_properties("../shared/block.buf" + PROPERTIES QT_RESOURCE_ALIAS "block.buf" +) +set_source_files_properties("../shared/qt_logo.buf" + PROPERTIES QT_RESOURCE_ALIAS "qt_logo.buf" +) +set(hellovulkancubes_resource_files + "../shared/block.buf" + "../shared/qt_logo.buf" + "color_frag.spv" + "color_phong_frag.spv" + "color_phong_vert.spv" + "color_vert.spv" +) + +qt6_add_resources(hellovulkancubes "hellovulkancubes" + PREFIX + "/" + FILES + ${hellovulkancubes_resource_files} +) + +install(TARGETS hellovulkancubes + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/vulkan/hellovulkancubes/renderer.cpp b/examples/vulkan/hellovulkancubes/renderer.cpp index f104d79002..da493de739 100644 --- a/examples/vulkan/hellovulkancubes/renderer.cpp +++ b/examples/vulkan/hellovulkancubes/renderer.cpp @@ -136,7 +136,7 @@ void Renderer::initResources() if (!m_floorMaterial.fs.isValid()) m_floorMaterial.fs.load(inst, dev, QStringLiteral(":/color_frag.spv")); - m_pipelinesFuture = QtConcurrent::run(this, &Renderer::createPipelines); + m_pipelinesFuture = QtConcurrent::run(&Renderer::createPipelines, this); } void Renderer::createPipelines() @@ -879,7 +879,7 @@ void Renderer::startNextFrame() // finished. Q_ASSERT(!m_framePending); m_framePending = true; - QFuture<void> future = QtConcurrent::run(this, &Renderer::buildFrame); + QFuture<void> future = QtConcurrent::run(&Renderer::buildFrame, this); m_frameWatcher.setFuture(future); } |