Refact Specialization

Author: Mysvac

docs/codes/04/11_specialization/GraphicsPipeline.cppm renamed to docs/codes/04/10_specialization/GraphicsPipeline.cppm

@@ -1,14 +1,10 @@
-module;
-
-#include <memory>
-#include <vector>
-
 export module GraphicsPipeline;
 
+import std;
 import vulkan_hpp;
 
 import DataLoader;
-import Utility;
+import Tools;
 import Device;
 import RenderPass;
 
@@ -31,7 +27,7 @@ export namespace vht {
     class GraphicsPipeline {
         std::shared_ptr<vht::Device> m_device;
         std::shared_ptr<vht::RenderPass> m_render_pass;
-        vk::raii::DescriptorSetLayout m_descriptor_set_layout{ nullptr };
+        std::vector<vk::raii::DescriptorSetLayout> m_descriptor_set_layouts;
         vk::raii::PipelineLayout m_pipeline_layout{ nullptr };
         vk::raii::Pipeline m_pipeline{ nullptr };
     public:
@@ -42,7 +38,7 @@ export namespace vht {
         }
 
         [[nodiscard]]
-        const vk::raii::DescriptorSetLayout& descriptor_set_layout() const { return m_descriptor_set_layout; }
+        const std::vector<vk::raii::DescriptorSetLayout>& descriptor_set_layouts() const { return m_descriptor_set_layouts; }
         [[nodiscard]]
         const vk::raii::PipelineLayout& pipeline_layout() const { return m_pipeline_layout; }
         [[nodiscard]]
@@ -55,28 +51,30 @@ export namespace vht {
         }
         // 创建描述符集布局
         void create_descriptor_set_layout() {
-            vk::DescriptorSetLayoutBinding ubo_layout_binging;
-            ubo_layout_binging.binding = 0;
-            ubo_layout_binging.descriptorType = vk::DescriptorType::eUniformBuffer;
-            ubo_layout_binging.descriptorCount = 1;
-            ubo_layout_binging.stageFlags = vk::ShaderStageFlagBits::eVertex;
-
-            vk::DescriptorSetLayoutBinding sampler_layout_binding;
-            sampler_layout_binding.binding = 1;
-            sampler_layout_binding.descriptorType = vk::DescriptorType::eCombinedImageSampler;
-            sampler_layout_binding.descriptorCount = 1;
-            sampler_layout_binding.stageFlags = vk::ShaderStageFlagBits::eFragment;
-
-            auto bindings = { ubo_layout_binging, sampler_layout_binding };
-            vk::DescriptorSetLayoutCreateInfo layoutInfo;
-            layoutInfo.setBindings( bindings );
-
-            m_descriptor_set_layout = m_device->device().createDescriptorSetLayout( layoutInfo );
+            vk::DescriptorSetLayoutBinding uboLayoutBinding;
+            uboLayoutBinding.binding = 0;
+            uboLayoutBinding.descriptorType = vk::DescriptorType::eUniformBuffer;
+            uboLayoutBinding.descriptorCount = 1;
+            uboLayoutBinding.stageFlags = vk::ShaderStageFlagBits::eVertex;
+
+            vk::DescriptorSetLayoutCreateInfo uboLayoutInfo;
+            uboLayoutInfo.setBindings( uboLayoutBinding );
+            m_descriptor_set_layouts.emplace_back( m_device->device().createDescriptorSetLayout( uboLayoutInfo ) );
+
+            vk::DescriptorSetLayoutBinding samplerLayoutBinding;
+            samplerLayoutBinding.binding = 0;
+            samplerLayoutBinding.descriptorType = vk::DescriptorType::eCombinedImageSampler;
+            samplerLayoutBinding.descriptorCount = 1;
+            samplerLayoutBinding.stageFlags = vk::ShaderStageFlagBits::eFragment;
+            vk::DescriptorSetLayoutCreateInfo samplerLayoutInfo;
+
+            samplerLayoutInfo.setBindings( samplerLayoutBinding );
+            m_descriptor_set_layouts.emplace_back( m_device->device().createDescriptorSetLayout( samplerLayoutInfo ) );
         }
         // 创建图形管线
         void create_graphics_pipeline() {
-            const auto vertex_shader_code = vht::read_shader("shaders/vert.spv");
-            const auto fragment_shader_code = vht::read_shader("shaders/frag.spv");
+            const auto vertex_shader_code = vht::read_shader("shaders/graphics.vert.spv");
+            const auto fragment_shader_code = vht::read_shader("shaders/graphics.frag.spv");
             const auto vertex_shader_module = vht::create_shader_module(m_device->device(), vertex_shader_code);
             const auto fragment_shader_module = vht::create_shader_module(m_device->device(), fragment_shader_code);
             vk::PipelineShaderStageCreateInfo vertex_shader_create_info;
@@ -93,24 +91,26 @@ export namespace vht {
             mapEntry.size       = sizeof(float);
             // 3. 特化信息
             vk::SpecializationInfo specializationInfo;
-            specializationInfo.setMapEntries(mapEntry);
+            specializationInfo.setMapEntries(mapEntry); // 如果需要，可以设置多个映射条目
             specializationInfo.setData<float>(my_color);
             // 此模板设置了 指针 和 数据大小 ，不能放右值
 
-            vk::PipelineShaderStageCreateInfo fragment_shader_create_info; // 片段着色器
+            vk::PipelineShaderStageCreateInfo fragment_shader_create_info;
             fragment_shader_create_info.stage = vk::ShaderStageFlagBits::eFragment;
             fragment_shader_create_info.module = fragment_shader_module;
             fragment_shader_create_info.pName = "main";
-            fragment_shader_create_info.pSpecializationInfo = &specializationInfo; // 特化信息
+
+            // 直接在着色器创建信息中绑定“特化信息”
+            fragment_shader_create_info.pSpecializationInfo = &specializationInfo;
 
             const auto shader_stages = { vertex_shader_create_info, fragment_shader_create_info };
 
             const auto dynamic_states = { vk::DynamicState::eViewport, vk::DynamicState::eScissor };
             vk::PipelineDynamicStateCreateInfo dynamic_state;
             dynamic_state.setDynamicStates(dynamic_states);
 
-            auto binding_description = vht::Vertex::get_binding_description();
-            auto attribute_description = vht::Vertex::get_attribute_description();
+            const auto binding_description = vht::Vertex::get_binding_description();
+            const auto attribute_description = vht::Vertex::get_attribute_description();
             vk::PipelineVertexInputStateCreateInfo vertex_input;
             vertex_input.setVertexBindingDescriptions(binding_description);
             vertex_input.setVertexAttributeDescriptions(attribute_description);
@@ -152,15 +152,19 @@ export namespace vht {
             color_blend.setAttachments( color_blend_attachment );
 
             vk::PipelineLayoutCreateInfo layout_create_info;
-            layout_create_info.setSetLayouts( *m_descriptor_set_layout );
+
+            // 将 raii 类型转换回 vk::DescriptorSetLayout
+            const auto set_layouts = m_descriptor_set_layouts
+                | std::views::transform([](const auto& layout) -> vk::DescriptorSetLayout { return layout; })
+                | std::ranges::to<std::vector>();
+
+            layout_create_info.setSetLayouts( set_layouts );
             m_pipeline_layout = m_device->device().createPipelineLayout( layout_create_info );
 
             vk::GraphicsPipelineCreateInfo create_info;
-            create_info.setStages( shader_stages );
-
             create_info.layout = m_pipeline_layout;
 
-
+            create_info.setStages( shader_stages );
             create_info.pVertexInputState =  &vertex_input;
             create_info.pInputAssemblyState = &input_assembly;
             create_info.pDynamicState = &dynamic_state;

docs/codes/04/11_specialization/GraphicsPipeline.diff renamed to docs/codes/04/10_specialization/GraphicsPipeline.diff

@@ -1,8 +1,9 @@
 #version 450
+
 // 提供默认值 0.0
 layout (constant_id = 0) const float myColor = 0.0;
 
-layout(binding = 1) uniform sampler2D texSampler;
+layout(set = 1, binding = 0) uniform sampler2D texSampler;
 
 layout(location = 0) in vec2 fragTexCoord;
 

docs/codes/04/11_specialization/shader.frag renamed to docs/codes/04/10_specialization/graphics.frag.glsl

@@ -10,12 +10,11 @@ comments: true
 与推送常量不同，特化常量最后将直接嵌入 SPIR-V 代码中，且管线创建后无法修改，类似于编译时常量。
 
 需要注意，SPIR-V 依然只是一种中间语言，而我们为其嵌入了常量值，因此它可以在生成目标 ISA 时进行优化，如常量折叠、死代码消除等。
-
-综上，它可用于代替高级着色器语言（GLSL/HLSL）中的预处理宏，实现更优雅的着色器代码。
+因此，它可用于（部分）代替高级着色器语言（GLSL/HLSL）中的预处理宏，实现更优雅的着色器代码。
 
 ## **基础代码**
 
-请下载并阅读下面的基础代码，这依然是“C++模块化”章节的第二部分代码：
+请下载并阅读下面的基础代码，这是“C++模块化”章节的第二部分代码：
 
 **[点击下载](../../codes/04/00_cxxmodule/module_code.zip)**
 
@@ -36,14 +35,16 @@ void main() {
 }
 ```
 
-显然特化常量在各个着色器都可用，此处方便演示，请修改 `shaders/shader.frag` 片段着色器：
+显然特化常量在各个着色器都可用，本文以片段着色器为例，请修改 `shaders/graphics.frag.glsl` 文件：
+
 
 ```glsl
 #version 450
-// 提供默认值 0.0 
+
+// 提供默认值 0.0
 layout (constant_id = 0) const float myColor = 0.0;
 
-layout(binding = 1) uniform sampler2D texSampler;
+layout(set = 1, binding = 0) uniform sampler2D texSampler;
 
 layout(location = 0) in vec2 fragTexCoord;
 
@@ -92,7 +93,7 @@ mapEntry.offset     = 0; // 源数据的起始偏移量
 mapEntry.size       = sizeof(float);
 // 3. 特化信息
 vk::SpecializationInfo specializationInfo;
-specializationInfo.setMapEntries(mapEntry);
+specializationInfo.setMapEntries(mapEntry); // 如果需要，可以设置多个映射条目
 specializationInfo.setData<float>(my_color);
 // 此模板设置了 指针 和 数据大小 ，不能放右值
 
@@ -111,7 +112,7 @@ fragment_shader_create_info.pSpecializationInfo = &specializationInfo;
 
 经过基础章节的学习，这些字段你应该能够轻松理解。现在运行程序，你将看到这样的图像：
 
-![../../i](../../images/0411/blue_room.png)
+![blue_room](../../images/0411/blue_room.png)
 
 
 ## **最后**
@@ -127,10 +128,10 @@ fragment_shader_create_info.pSpecializationInfo = &specializationInfo;
 
 **[初始代码集](../../codes/04/00_cxxmodule/module_code.zip)**
 
-**[shader.frag](../../codes/04/11_specialization/shader.frag)**
+**[shader - frag](../../codes/04/10_specialization/graphics.frag.glsl)**
 
-**[GraphicsPipeline.cppm](../../codes/04/11_specialization/GraphicsPipeline.cppm)**
+**[GraphicsPipeline.cppm](../../codes/04/10_specialization/GraphicsPipeline.cppm)**
 
-**[GraphicsPipeline.diff\(差异文件\)](../../codes/04/11_specialization/GraphicsPipeline.diff)**
+**[GraphicsPipeline.diff\(差异文件\)](../../codes/04/10_specialization/GraphicsPipeline.diff)**
 
 ---

docs/md/04/11_specialization.md renamed to docs/md/04/10_specialization.md

@@ -8,7 +8,6 @@ comments: true
 ```
   - 进阶功能:
     - 杂项:
-      - 特化常量: md/04/11_specialization.md  # 待重构
       - 查询池: md/04/10_querypool.md  # 待重构
       - TODO: todo.md # pNext 与 sType + 同步2.0语法 + 动态渲染 + 辅助命令缓冲 - 管线缓存
     - 多管线渲染:

docs/todo.md

@@ -81,9 +81,10 @@ nav:
     - 计算着色器与SSBO: md/03/80_compute.md
   - 进阶功能:
     - C++模块化: md/04/00_cxxmodule.md
+    - 杂项:
+      - 特化常量: md/04/10_specialization.md
     - 待重构:
-      - 杂项:
-        - 特化常量: md/04/11_specialization.md
+      - 杂项_:
         - 查询池: md/04/10_querypool.md
         - TODO: todo.md # pNext 与 sType + 同步2.0语法 + 动态渲染 + 辅助命令缓冲 - 管线缓存
       - 多管线渲染: