From 3594bff3f7db75976d832ce0decb1e4bd7cf63d5 Mon Sep 17 00:00:00 2001 From: Onyrew <44711065+Onyrew@users.noreply.github.com> Date: Mon, 28 Feb 2022 21:52:31 +0100 Subject: [PATCH 1/3] vkDestroyDescriptorPool added --- en/05_Uniform_buffers/01_Descriptor_pool_and_sets.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/en/05_Uniform_buffers/01_Descriptor_pool_and_sets.md b/en/05_Uniform_buffers/01_Descriptor_pool_and_sets.md index 2318502e..82b79ec3 100644 --- a/en/05_Uniform_buffers/01_Descriptor_pool_and_sets.md +++ b/en/05_Uniform_buffers/01_Descriptor_pool_and_sets.md @@ -135,6 +135,14 @@ automatically freed when the descriptor pool is destroyed. The call to `vkAllocateDescriptorSets` will allocate descriptor sets, each with one uniform buffer descriptor. +```c++ +void cleanup() { + vkDestroyDescriptorPool(device, descriptorPool, nullptr); + + vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr); +} +``` + The descriptor sets have been allocated now, but the descriptors within still need to be configured. We'll now add a loop to populate every descriptor: From 87d4dc082843d1259f44a04cd1285dff82975818 Mon Sep 17 00:00:00 2001 From: Onyrew <44711065+Onyrew@users.noreply.github.com> Date: Mon, 28 Feb 2022 21:53:46 +0100 Subject: [PATCH 2/3] dots --- en/05_Uniform_buffers/01_Descriptor_pool_and_sets.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/en/05_Uniform_buffers/01_Descriptor_pool_and_sets.md b/en/05_Uniform_buffers/01_Descriptor_pool_and_sets.md index 82b79ec3..f8cc8e6e 100644 --- a/en/05_Uniform_buffers/01_Descriptor_pool_and_sets.md +++ b/en/05_Uniform_buffers/01_Descriptor_pool_and_sets.md @@ -137,9 +137,11 @@ buffer descriptor. ```c++ void cleanup() { + ... vkDestroyDescriptorPool(device, descriptorPool, nullptr); vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr); + ... } ``` From 655d7f4852ff8978cf88c7bb14bc0080c4db14c0 Mon Sep 17 00:00:00 2001 From: Onyrew <44711065+Onyrew@users.noreply.github.com> Date: Tue, 1 Mar 2022 22:18:41 +0100 Subject: [PATCH 3/3] vkDestroyDescriptorPool added for French chapter --- fr/05_Uniform_buffers/01_Descriptor_pool_et_sets.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fr/05_Uniform_buffers/01_Descriptor_pool_et_sets.md b/fr/05_Uniform_buffers/01_Descriptor_pool_et_sets.md index 725257e4..d4763b92 100644 --- a/fr/05_Uniform_buffers/01_Descriptor_pool_et_sets.md +++ b/fr/05_Uniform_buffers/01_Descriptor_pool_et_sets.md @@ -146,6 +146,16 @@ Il n'est pas nécessaire de détruire les sets de descripteurs explicitement, ca destruction de la pool. L'appel à `vkAllocateDescriptorSets` alloue donc tous les sets, chacun possédant un unique descripteur d'UBO. +```c++ +void cleanup() { + ... + vkDestroyDescriptorPool(device, descriptorPool, nullptr); + + vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr); + ... +} +``` + Nous avons créé les sets mais nous n'avons pas paramétré les descripteurs. Nous allons maintenant créer une boucle pour rectifier ce problème :