replace "descriptor layout" with "descriptor set layout" (#358)

chuigda · web-flow · commit 71b71e484127 · 2023-09-25T21:31:00.000+02:00
diff --git a/code/22_descriptor_set_layout.cpp b/code/22_descriptor_set_layout.cpp
@@ -232,7 +232,7 @@ class HelloTriangleApplication {
         vkDestroyPipeline(device, graphicsPipeline, nullptr);
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
-        
+
         for (size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) {
             vkDestroyBuffer(device, uniformBuffers[i], nullptr);
             vkFreeMemory(device, uniformBuffersMemory[i], nullptr);
@@ -593,7 +593,7 @@ class HelloTriangleApplication {
         viewportState.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
         viewportState.viewportCount = 1;
         viewportState.scissorCount = 1;
- 
+
         VkPipelineRasterizationStateCreateInfo rasterizer{};
         rasterizer.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
         rasterizer.depthClampEnable = VK_FALSE;
@@ -751,7 +751,7 @@ class HelloTriangleApplication {
 
         for (size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) {
             createBuffer(bufferSize, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, uniformBuffers[i], uniformBuffersMemory[i]);
-            
+
             vkMapMemory(device, uniformBuffersMemory[i], 0, bufferSize, 0, &uniformBuffersMapped[i]);
         }
     }
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
@@ -128,7 +128,7 @@ add_chapter (21_index_buffer
   SHADER 18_shader_vertexbuffer
   LIBS glm::glm)
 
-add_chapter (22_descriptor_layout
+add_chapter (22_descriptor_set_layout
   SHADER 22_shader_ubo
   LIBS glm::glm)
 
diff --git a/en/05_Uniform_buffers/00_Descriptor_set_layout_and_buffer.md b/en/05_Uniform_buffers/00_Descriptor_set_layout_and_buffer.md
@@ -13,11 +13,11 @@ images. We're going to set up a buffer that contains the transformation matrices
 and have the vertex shader access them through a descriptor. Usage of
 descriptors consists of three parts:
 
-* Specify a descriptor layout during pipeline creation
+* Specify a descriptor set layout during pipeline creation
 * Allocate a descriptor set from a descriptor pool
 * Bind the descriptor set during rendering
 
-The *descriptor layout* specifies the types of resources that are going to be
+The *descriptor set layout* specifies the types of resources that are going to be
 accessed by the pipeline, just like a render pass specifies the types of
 attachments that will be accessed. A *descriptor set* specifies the actual
 buffer or image resources that will be bound to the descriptors, just like a
@@ -86,7 +86,7 @@ void main() {
 
 Note that the order of the `uniform`, `in` and `out` declarations doesn't
 matter. The `binding` directive is similar to the `location` directive for
-attributes. We're going to reference this binding in the descriptor layout. The
+attributes. We're going to reference this binding in the descriptor set layout. The
 line with `gl_Position` is changed to use the transformations to compute the
 final position in clip coordinates. Unlike the 2D triangles, the last component
 of the clip coordinates may not be `1`, which will result in a division when
@@ -208,7 +208,7 @@ layouts here, because a single one already includes all of the bindings. We'll
 get back to that in the next chapter, where we'll look into descriptor pools and
 descriptor sets.
 
-The descriptor layout should stick around while we may create new graphics
+The descriptor set layout should stick around while we may create new graphics
 pipelines i.e. until the program ends:
 
 ```c++
@@ -411,6 +411,6 @@ In the next chapter we'll look at descriptor sets, which will actually bind the
 `VkBuffer`s to the uniform buffer descriptors so that the shader can access this
 transformation data.
 
-[C++ code](/code/22_descriptor_layout.cpp) /
+[C++ code](/code/22_descriptor_set_layout.cpp) /
 [Vertex shader](/code/22_shader_ubo.vert) /
 [Fragment shader](/code/22_shader_ubo.frag)
diff --git a/en/05_Uniform_buffers/01_Descriptor_pool_and_sets.md b/en/05_Uniform_buffers/01_Descriptor_pool_and_sets.md
@@ -1,6 +1,6 @@
 ## Introduction
 
-The descriptor layout from the previous chapter describes the type of
+The descriptor set layout from the previous chapter describes the type of
 descriptors that can be bound. In this chapter we're going to create
 a descriptor set for each `VkBuffer` resource to bind it to the
 uniform buffer descriptor.
@@ -95,7 +95,7 @@ void createDescriptorSets() {
 
 A descriptor set allocation is described with a `VkDescriptorSetAllocateInfo`
 struct. You need to specify the descriptor pool to allocate from, the number of
-descriptor sets to allocate, and the descriptor layout to base them on:
+descriptor sets to allocate, and the descriptor set layout to base them on:
 
 ```c++
 std::vector<VkDescriptorSetLayout> layouts(MAX_FRAMES_IN_FLIGHT, descriptorSetLayout);
@@ -374,7 +374,7 @@ Don't forget to recompile your shader after removing the `foo` field.
 ## Multiple descriptor sets
 
 As some of the structures and function calls hinted at, it is actually possible
-to bind multiple descriptor sets simultaneously. You need to specify a descriptor layout for
+to bind multiple descriptor sets simultaneously. You need to specify a descriptor set layout for
 each descriptor set when creating the pipeline layout. Shaders can then
 reference specific descriptor sets like this:
 
diff --git a/en/06_Texture_mapping/02_Combined_image_sampler.md b/en/06_Texture_mapping/02_Combined_image_sampler.md
@@ -6,7 +6,7 @@ image sampler*. This descriptor makes it possible for shaders to access an image
 resource through a sampler object like the one we created in the previous
 chapter.
 
-We'll start by modifying the descriptor layout, descriptor pool and descriptor
+We'll start by modifying the descriptor set layout, descriptor pool and descriptor
 set to include such a combined image sampler descriptor. After that, we're going
 to add texture coordinates to `Vertex` and modify the fragment shader to read
 colors from the texture instead of just interpolating the vertex colors.
