Add QueryPool

Author: Mysvac

docs/codes/04/10_querypool/cppm/App.cppm docs/codes/04/14_querypool/App.cppmdocs/codes/04/10_querypool/cppm/App.cppm renamed to docs/codes/04/14_querypool/App.cppm

@@ -1,13 +1,7 @@
-module;
-
-#include <iostream>
-#include <memory>
-
-// #include <vulkan/vulkan.h>
-#include <GLFW/glfw3.h>
-
 export module App;
 
+import std;
+import glfw;
 import vulkan_hpp;
 
 import DataLoader;
@@ -41,53 +35,52 @@ export namespace vht {
         std::shared_ptr<vht::UniformBuffer> m_uniform_buffer{ nullptr };
         std::shared_ptr<vht::TextureSampler> m_texture_sampler{ nullptr };
         std::shared_ptr<vht::Descriptor> m_descriptor{ nullptr };
-        std::shared_ptr<vht::QueryPool> m_query_pool; // 添加查询池成员
+        std::shared_ptr<vht::QueryPool> m_query_pool{ nullptr };
         std::shared_ptr<vht::Drawer> m_drawer{ nullptr };
     public:
         void run() {
             init();
-            std::cout << "begin draw" << std::endl;
-            while (!glfwWindowShouldClose(m_window->ptr())) {
-                glfwPollEvents();
+            while (!glfw::window_should_close(m_window->ptr())) {
+                glfw::poll_events();
                 m_drawer->draw();
             }
-            std::cout << "device waitIdle" << std::endl;
+            std::println("device waitIdle");
             m_device->device().waitIdle();
-            std::cout << "finished" << std::endl;
+            std::println("finished");
         }
     private:
         void init() {
             init_data_loader();
-            init_vulkan();
+            init_context();
             init_window();
-            std::cout << "window created" << std::endl;
+            std::println("window created");
             init_device();
-            std::cout << "device created" << std::endl;
+            std::println("device created");
             init_swapchain();
-            std::cout << "swapchain created" << std::endl;
+            std::println("swapchain created");
             init_depth_image();
-            std::cout << "depth image created" << std::endl;
+            std::println("depth image created");
             init_render_pass();
-            std::cout << "render pass created" << std::endl;
+            std::println("render pass created");
             init_graphics_pipeline();
-            std::cout << "graphics pipeline created" << std::endl;
+            std::println("graphics pipeline created");
             init_command_pool();
-            std::cout << "command pool created" << std::endl;
-            init_input_assembly();
-            std::cout << "input assembly created" << std::endl;
+            std::println("command pool created");
             init_uniform_buffer();
-            std::cout << "uniform buffer created" << std::endl;
+            std::println("uniform buffer created");
             init_texture_sampler();
-            std::cout << "texture sampler created" << std::endl;
+            std::println("texture sampler created");
+            init_input_assembly();
+            std::println("input assembly created");
             init_descriptor();
-            std::cout << "descriptor created" << std::endl;
+            std::println("descriptor created");
             init_query_pool(); // 初始化查询池
-            std::cout << "query pool created" << std::endl;
+            std::println("query pool created");
             init_drawer();
-            std::cout << "drawer created" << std::endl;
+            std::println("drawer created");
         }
         void init_data_loader() { m_data_loader = std::make_shared<vht::DataLoader>(); }
-        void init_vulkan() { m_context = std::make_shared<vht::Context>( true ); }
+        void init_context() { m_context = std::make_shared<vht::Context>( true ); }
         void init_window() { m_window = std::make_shared<vht::Window>( m_context ); }
         void init_device() { m_device = std::make_shared<vht::Device>( m_context, m_window ); }
         void init_swapchain() { m_swapchain = std::make_shared<vht::Swapchain>( m_window, m_device ); }
@@ -112,9 +105,8 @@ export namespace vht {
                 m_input_assembly,
                 m_uniform_buffer,
                 m_descriptor,
-                m_query_pool // 传递查询池
+                m_query_pool
             );
         }
     };
 }
-

docs/codes/04/10_querypool/cppm/App.diff docs/codes/04/14_querypool/App.diffdocs/codes/04/10_querypool/cppm/App.diff renamed to docs/codes/04/14_querypool/App.diff

@@ -1,14 +1,6 @@
-module;
-
-#include <array>
-#include <vector>
-#include <set>
-#include <memory>
-#include <stdexcept>
-#include <optional>
-
 export module Device;
 
+import std;
 import vulkan_hpp;
 
 import Context;
@@ -23,8 +15,8 @@ export namespace  vht {
      * - is_complete(): 检查是否已找到所需的队列族索引
      */
     struct QueueFamilyIndices {
-        std::optional<uint32_t> graphics_family;
-        std::optional<uint32_t> present_family;
+        std::optional<std::uint32_t> graphics_family;
+        std::optional<std::uint32_t> present_family;
         [[nodiscard]]
         bool is_complete() const {
             return graphics_family.has_value() && present_family.has_value();
@@ -72,7 +64,8 @@ export namespace  vht {
         explicit Device(std::shared_ptr<vht::Context> context, std::shared_ptr<vht::Window> window)
         :   m_context(std::move(context)),
             m_window(std::move(window)) {
-            init();
+            pick_physical_device();
+            create_device();
         }
 
         [[nodiscard]]
@@ -88,11 +81,6 @@ export namespace  vht {
         [[nodiscard]]
         QueueFamilyIndices queue_family_indices() const { return m_queue_family_indices; }
     private:
-        void init() {
-            pick_physical_device();
-            create_device();
-        }
-
         /**
          * @brief 挑选物理设备
          */
@@ -153,7 +141,7 @@ export namespace  vht {
         QueueFamilyIndices find_queue_families(const vk::raii::PhysicalDevice& physical_device) const {
             QueueFamilyIndices indices{};
             const auto queue_families = physical_device.getQueueFamilyProperties();
-            for (uint32_t i = 0; const auto& queue_family : queue_families) {
+            for (std::uint32_t i = 0; const auto& queue_family : queue_families) {
                 if (queue_family.queueFlags & vk::QueueFlagBits::eGraphics) {
                     indices.graphics_family = i;
                 }
@@ -174,21 +162,21 @@ export namespace  vht {
             m_queue_family_indices = find_queue_families(m_physical_device);
             const auto [graphics_family, present_family] = m_queue_family_indices;
 
-            std::set<uint32_t> unique_queue_families { graphics_family.value(), present_family.value() };
+            std::set<std::uint32_t> unique_queue_families { graphics_family.value(), present_family.value() };
 
             std::vector<vk::DeviceQueueCreateInfo> queue_create_infos;
             queue_create_infos.reserve(unique_queue_families.size());
             float queue_priority = 1.0f;
-            for (const uint32_t queue_family : unique_queue_families) {
+            for (const std::uint32_t queue_family : unique_queue_families) {
                 vk::DeviceQueueCreateInfo queue_create_info;
                 queue_create_info.queueFamilyIndex = queue_family;
                 queue_create_info.setQueuePriorities( queue_priority );
                 queue_create_infos.emplace_back( queue_create_info );
             }
 
             vk::PhysicalDeviceFeatures features;
-            features.pipelineStatisticsQuery = true;
             features.samplerAnisotropy = true;
+            features.pipelineStatisticsQuery = true;
             vk::DeviceCreateInfo create_info;
             create_info.setQueueCreateInfos( queue_create_infos );
             create_info.setPEnabledFeatures( &features );

…s/codes/04/10_querypool/cppm/Device.cppm docs/codes/04/14_querypool/Device.cppmdocs/codes/04/10_querypool/cppm/Device.cppm renamed to docs/codes/04/14_querypool/Device.cppm docs/codes/04/10_querypool/cppm/Device.cppm renamed to docs/codes/04/14_querypool/Device.cppm

@@ -1,12 +1,6 @@
-module;
-
-#include <memory>
-#include <array>
-#include <vector>
-#include <stdexcept>
-
 export module Drawer;
 
+import std;
 import vulkan_hpp;
 
 import Config;
@@ -54,7 +48,7 @@ export namespace vht {
         std::shared_ptr<vht::InputAssembly> m_input_assembly{ nullptr };
         std::shared_ptr<vht::UniformBuffer> m_uniform_buffer{ nullptr };
         std::shared_ptr<vht::Descriptor> m_descriptor{ nullptr };
-        std::shared_ptr<vht::QueryPool> m_query_pool; // 添加查询池成员
+        std::shared_ptr<vht::QueryPool> m_query_pool{ nullptr };
         std::vector<vk::raii::Semaphore> m_image_available_semaphores;
         std::vector<vk::raii::Semaphore> m_render_finished_semaphores;
         std::vector<vk::raii::Fence> m_in_flight_fences;
@@ -72,7 +66,7 @@ export namespace vht {
             std::shared_ptr<vht::InputAssembly> input_assembly,
             std::shared_ptr<vht::UniformBuffer> uniform_buffer,
             std::shared_ptr<vht::Descriptor> descriptor,
-            std::shared_ptr<vht::QueryPool> query_pool // 添加查询池参数
+            std::shared_ptr<vht::QueryPool> query_pool
         ):  m_data_loader(std::move(data_loader)),
             m_window(std::move(window)),
             m_device(std::move(device)),
@@ -90,14 +84,14 @@ export namespace vht {
 
         void draw() {
             // 等待当前帧的栅栏，即确保上一个帧的绘制完成
-            if( const auto res = m_device->device().waitForFences( *m_in_flight_fences[m_current_frame], true, UINT64_MAX );
+            if( const auto res = m_device->device().waitForFences( *m_in_flight_fences[m_current_frame], true, std::numeric_limits<std::uint64_t>::max() );
                 res != vk::Result::eSuccess
             ) throw std::runtime_error{ "waitForFences in drawFrame was failed" };
 
             // 获取交换链的下一个图像索引
-            uint32_t image_index;
+            std::uint32_t image_index;
             try{
-                auto [res, idx] = m_swapchain->swapchain().acquireNextImage(UINT64_MAX, m_image_available_semaphores[m_current_frame]);
+                auto [res, idx] = m_swapchain->swapchain().acquireNextImage(std::numeric_limits<std::uint64_t>::max(), m_image_available_semaphores[m_current_frame]);
                 image_index = idx;
             } catch (const vk::OutOfDateKHRError&){
                 m_render_pass->recreate();
@@ -141,8 +135,8 @@ export namespace vht {
 
             m_device->graphics_queue().waitIdle();
             static int counter = 0;
-            if( ++counter % 2500 == 0 ){
-                m_query_pool->print_delta_time();
+            if( ++counter % 2500 == 0 ){ // 2500 帧输出一次，可自行调整
+                m_query_pool->print_delta_time(); // 输出单次绘制耗时
                 m_query_pool->print_statistics();
                 m_query_pool->print_occlusion();
             }
@@ -169,30 +163,35 @@ export namespace vht {
             m_image_available_semaphores.reserve( MAX_FRAMES_IN_FLIGHT );
             m_render_finished_semaphores.reserve( MAX_FRAMES_IN_FLIGHT );
             m_in_flight_fences.reserve( MAX_FRAMES_IN_FLIGHT );
-            for(size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; ++i){
+            for(std::size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; ++i){
                 m_image_available_semaphores.emplace_back( m_device->device(), semaphore_create_info );
                 m_render_finished_semaphores.emplace_back( m_device->device(),  semaphore_create_info );
                 m_in_flight_fences.emplace_back( m_device->device() , fence_create_info );
             }
         }
         // 记录命令缓冲区
-        void record_command_buffer(const vk::raii::CommandBuffer& command_buffer, const uint32_t image_index) const {
+        void record_command_buffer(const vk::raii::CommandBuffer& command_buffer, const std::uint32_t image_index) const {
             command_buffer.begin( vk::CommandBufferBeginInfo{} );
-            // 可用性查询
+
             command_buffer.resetQueryPool( m_query_pool->occlusion(), 0, 1 );
             command_buffer.beginQuery(m_query_pool->occlusion(), 0);
-            // 管线统计查询
+
             command_buffer.resetQueryPool( m_query_pool->statistics(), 0, 1 );
-            command_buffer.beginQuery(m_query_pool->statistics(), 0);
-            // 时间戳查询
-            // 重置查询池，索引 0 和 1
+            command_buffer.beginQuery(m_query_pool->statistics(), 0); // 绑定管线统计信息查询
+
             command_buffer.resetQueryPool( m_query_pool->timestamp(), 0, 2 );
-            command_buffer.writeTimestamp(
-                vk::PipelineStageFlagBits::eTopOfPipe, // 在管线顶部写入时间戳
+            command_buffer.writeTimestamp( // 在管线顶部写入时间戳
+                vk::PipelineStageFlagBits::eTopOfPipe,
                 m_query_pool->timestamp(), // 查询池
                 0   // 查询池内部的查询索引
             );
-
+            // 你可以使用 `writeTimestamp2` ，这需要启用 `synchronization2` 特性
+            // command_buffer.writeTimestamp2(
+            //     vk::PipelineStageFlagBits2::eNone,
+            //     m_query_pool->timestamp(), // 查询池
+            //     0   // 查询池内部的查询索引
+            // );
+            // 重置查询池，起始索引 0， 数量 1
 
 
             vk::RenderPassBeginInfo render_pass_begin_info;
@@ -228,24 +227,30 @@ export namespace vht {
             command_buffer.bindVertexBuffers( 0, *m_input_assembly->vertex_buffer(), vk::DeviceSize{ 0 } );
             command_buffer.bindIndexBuffer( m_input_assembly->index_buffer(), 0, vk::IndexType::eUint32 );
 
+            const std::array<vk::DescriptorSet,2> descriptor_sets = {
+                m_descriptor->ubo_sets()[m_current_frame],
+                m_descriptor->texture_set()
+            };
+
             command_buffer.bindDescriptorSets(
                 vk::PipelineBindPoint::eGraphics,
                 m_graphics_pipeline->pipeline_layout(),
                 0,
-                *m_descriptor->sets()[m_current_frame],
+                descriptor_sets,
                 nullptr
             );
 
-            command_buffer.drawIndexed(static_cast<uint32_t>(m_data_loader->indices().size()), 1, 0, 0, 0);
+            command_buffer.drawIndexed(static_cast<std::uint32_t>(m_data_loader->indices().size()), 1, 0, 0, 0);
 
             command_buffer.endRenderPass();
 
-            command_buffer.writeTimestamp(
+            command_buffer.writeTimestamp( // 在命令最后写入时间戳
                 vk::PipelineStageFlagBits::eBottomOfPipe,
-                m_query_pool->timestamp(), 1 // 结束时间戳，索引1
+                m_query_pool->timestamp(), 1 // 索引 1
             );
             command_buffer.endQuery(m_query_pool->statistics(), 0);
             command_buffer.endQuery(m_query_pool->occlusion(), 0);
+
             command_buffer.end();
         }
     };