Apply recent changes from the tutorial

"Descriptor set layout" instead of "descriptor layout"

Author: SaschaWillems

antora/modules/ROOT/nav.adoc

@@ -34,8 +34,8 @@
 ** xref:04_Vertex_buffers/01_Vertex_buffer_creation.adoc[Vertex buffer creation]
 ** xref:04_Vertex_buffers/02_Staging_buffer.adoc[Staging buffer]
 ** xref:04_Vertex_buffers/03_Index_buffer.adoc[Index buffer]
-* xref:05_Uniform_buffers/00_Descriptor_layout_and_buffer.adoc[Uniform buffers]
-** xref:05_Uniform_buffers/00_Descriptor_layout_and_buffer.adoc[Descriptor layout and buffer]
+* xref:05_Uniform_buffers/00_Descriptor_set_layout_and_buffer.adoc[Uniform buffers]
+** xref:05_Uniform_buffers/00_Descriptor_set_layout_and_buffer.adoc[Descriptor layout and buffer]
 ** xref:05_Uniform_buffers/01_Descriptor_pool_and_sets.adoc[Descriptor pool and sets]
 * xref:06_Texture_mapping/00_Images.adoc[Texture mapping]
 ** xref:06_Texture_mapping/00_Images.adoc[Images]

attachments/22_descriptor_layout.cpp attachments/22_descriptor_set_layout.cppattachments/22_descriptor_layout.cpp renamed to attachments/22_descriptor_set_layout.cpp

@@ -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)
 

attachments/CMakeLists.txt

@@ -12,11 +12,11 @@ A descriptor is a way for shaders to freely access resources like buffers and im
 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 accessed by the pipeline, just like a render pass specifies the types of attachments that will be accessed.
+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 framebuffer specifies the actual image views to bind to render pass attachments.
 The descriptor set is then bound for the drawing commands just like the vertex buffers and framebuffer.
 
@@ -80,7 +80,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.
+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 converted to the final normalized device coordinates on the screen.
 This is used in perspective projection as the _perspective division_ and is essential for making closer objects look larger than objects that are further away.
@@ -194,7 +194,7 @@ pipelineLayoutInfo.pSetLayouts = &descriptorSetLayout;
 You may be wondering why it's possible to specify multiple descriptor set 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 pipelines i.e.
+The descriptor set layout should stick around while we may create new graphics pipelines i.e.
 until the program ends:
 
 [,c++]
@@ -392,4 +392,4 @@ We may look at these in a future chapter.
 
 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.
 
-link:/attachments/22_descriptor_layout.cpp[C{pp} code] / link:/attachments/22_shader_ubo.vert[Vertex shader] / link:/attachments/22_shader_ubo.frag[Fragment shader]
+link:/attachments/22_descriptor_set_layout.cpp[C{pp} code] / link:/attachments/22_shader_ubo.vert[Vertex shader] / link:/attachments/22_shader_ubo.frag[Fragment shader]

…ers/00_Descriptor_layout_and_buffer.adoc …00_Descriptor_set_layout_and_buffer.adocen/05_Uniform_buffers/00_Descriptor_layout_and_buffer.adoc renamed to en/05_Uniform_buffers/00_Descriptor_set_layout_and_buffer.adoc en/05_Uniform_buffers/00_Descriptor_layout_and_buffer.adoc renamed to en/05_Uniform_buffers/00_Descriptor_set_layout_and_buffer.adoc

@@ -2,7 +2,7 @@
 
 == Introduction
 
-The descriptor layout from the previous chapter describes the type of descriptors that can be bound.
+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.
 
 == Descriptor pool
@@ -93,7 +93,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:
+You need to specify the descriptor pool to allocate from, the number of descriptor sets to allocate, and the descriptor set layout to base them on:
 
 [,c++]
 ----
@@ -388,7 +388,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 each descriptor set when creating the pipeline layout.
+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:
 
 [,c++]

en/05_Uniform_buffers/01_Descriptor_pool_and_sets.adoc

@@ -6,7 +6,7 @@ We looked at descriptors for the first time in the uniform buffers part of the t
 In this chapter we will look at a new type of descriptor: _combined 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 set to include such a combined image sampler 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.
 
 == Updating the descriptors