Complete proper resource cleanup

bookcontents/chapter-13/chapter-13.md

@@ -560,6 +560,7 @@ public class ShadowRenderActivity {
                 GeometryAttachments.NUMBER_COLOR_ATTACHMENTS, true, true, GraphConstants.MAT4X4_SIZE,
                 new VertexBufferStructure(), descriptorSetLayouts);
         pipeLine = new Pipeline(pipelineCache, pipeLineCreationInfo);
+        pipeLineCreationInfo.cleanup();
     }
     ...
 }

bookcontents/chapter-14/chapter-14.md

@@ -793,6 +793,10 @@ public class MemoryBarrier {
                 .dstAccessMask(dstAccessMask);
     }
 
+    public void cleanup() {
+        MemoryUtil.memFree(vkMemoryBarrier);
+    }
+
     public VkMemoryBarrier.Buffer getVkMemoryBarrier() {
         return vkMemoryBarrier;
     }
@@ -856,6 +860,7 @@ public class AnimationComputeActivity {
         for (Map.Entry<String, List<EntityAnimationBuffer>> entry : entityAnimationsBuffers.entrySet()) {
             entry.getValue().forEach(EntityAnimationBuffer::cleanup);
         }
+        memoryBarrier.cleanup();
     }
     ...
 }
@@ -1281,6 +1286,8 @@ public class GeometryRenderActivity {
 
 You can see that the `recordCommandBuffer` has a new reference to the buffers that hold the animated vertices for each of the entities. This will be used in the `recordEntities` method. In this method, we just need to check if the entity is related to a model that has animations or not. If so, instead of using the data associated to the meshes of the model, we use the buffer associated to the animation for that entity.
 ```java
+public class GeometryRenderActivity {
+    ...
     private void recordEntities(MemoryStack stack, VkCommandBuffer cmdHandle, LongBuffer descriptorSets,
                                 List<VulkanModel> vulkanModelList,
                                 Map<String, List<AnimationComputeActivity.EntityAnimationBuffer>> entityAnimationsBuffers) {
@@ -1324,6 +1331,18 @@ You can see that the `recordCommandBuffer` has a new reference to the buffers th
 }
 ```
 
+Finally, we need to free the memory barrier in the `cleanup` method:
+```java
+public class GeometryRenderActivity {
+    ...
+    public void cleanup() {
+        ...
+        memoryBarrier.cleanup();
+    }
+    ...
+}
+```
+
 Note that we do not need to modify the geometry shaders. Animated models are rendered exactly the same way as non animated ways. The only thing that we need to do is select the appropriate buffer.
 
 ## Updates on shadow rendering

booksamples/appendix-01/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java

@@ -55,6 +55,7 @@ public void cleanup() {
         descriptorPool.cleanup();
         storageDescriptorSetLayout.cleanup();
         fence.cleanup();
+        memoryBarrier.cleanup();
     }
 
     private void createCommandBuffers(CommandPool commandPool) {

booksamples/appendix-01/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java

@@ -72,6 +72,7 @@ public void cleanup() {
         descriptorPool.cleanup();
         shaderProgram.cleanup();
         geometryFrameBuffer.cleanup();
+        memoryBarrier.cleanup();
     }
 
     private void createDescriptorPool() {

booksamples/appendix-01/src/main/java/org/vulkanb/eng/graph/shadows/ShadowRenderActivity.java

@@ -110,6 +110,7 @@ private void createPipeline(PipelineCache pipelineCache) {
                 GeometryAttachments.NUMBER_COLOR_ATTACHMENTS, true, true, 0,
                 new InstancedVertexBufferStructure(), descriptorSetLayouts);
         pipeLine = new Pipeline(pipelineCache, pipeLineCreationInfo);
+        pipeLineCreationInfo.cleanup();
     }
 
     private void createShaders() {

booksamples/appendix-01/src/main/java/org/vulkanb/eng/graph/vk/MemoryBarrier.java

@@ -1,5 +1,6 @@
 package org.vulkanb.eng.graph.vk;
 
+import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.vulkan.VkMemoryBarrier;
 
 import static org.lwjgl.vulkan.VK11.VK_STRUCTURE_TYPE_MEMORY_BARRIER;
@@ -15,6 +16,10 @@ public MemoryBarrier(int srcAccessMask, int dstAccessMask) {
                 .dstAccessMask(dstAccessMask);
     }
 
+    public void cleanup() {
+        MemoryUtil.memFree(vkMemoryBarrier);
+    }
+
     public VkMemoryBarrier.Buffer getVkMemoryBarrier() {
         return vkMemoryBarrier;
     }

booksamples/appendix-02/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java

@@ -55,6 +55,7 @@ public void cleanup() {
         descriptorPool.cleanup();
         storageDescriptorSetLayout.cleanup();
         fence.cleanup();
+        memoryBarrier.cleanup();
     }
 
     private void createCommandBuffers(CommandPool commandPool) {

booksamples/appendix-02/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java

@@ -72,6 +72,7 @@ public void cleanup() {
         descriptorPool.cleanup();
         shaderProgram.cleanup();
         geometryFrameBuffer.cleanup();
+        memoryBarrier.cleanup();
     }
 
     private void createDescriptorPool() {

booksamples/appendix-02/src/main/java/org/vulkanb/eng/graph/shadows/ShadowRenderActivity.java

@@ -110,6 +110,7 @@ private void createPipeline(PipelineCache pipelineCache) {
                 GeometryAttachments.NUMBER_COLOR_ATTACHMENTS, true, true, 0,
                 new InstancedVertexBufferStructure(), descriptorSetLayouts);
         pipeLine = new Pipeline(pipelineCache, pipeLineCreationInfo);
+        pipeLineCreationInfo.cleanup();
     }
 
     private void createShaders() {

booksamples/appendix-02/src/main/java/org/vulkanb/eng/graph/vk/MemoryBarrier.java

@@ -1,5 +1,6 @@
 package org.vulkanb.eng.graph.vk;
 
+import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.vulkan.VkMemoryBarrier;
 
 import static org.lwjgl.vulkan.VK11.VK_STRUCTURE_TYPE_MEMORY_BARRIER;
@@ -15,6 +16,10 @@ public MemoryBarrier(int srcAccessMask, int dstAccessMask) {
                 .dstAccessMask(dstAccessMask);
     }
 
+    public void cleanup() {
+        MemoryUtil.memFree(vkMemoryBarrier);
+    }
+
     public VkMemoryBarrier.Buffer getVkMemoryBarrier() {
         return vkMemoryBarrier;
     }

booksamples/chapter-13/src/main/java/org/vulkanb/eng/graph/shadows/ShadowRenderActivity.java

@@ -102,6 +102,7 @@ private void createPipeline(PipelineCache pipelineCache) {
                 GeometryAttachments.NUMBER_COLOR_ATTACHMENTS, true, true, GraphConstants.MAT4X4_SIZE,
                 new VertexBufferStructure(), descriptorSetLayouts);
         pipeLine = new Pipeline(pipelineCache, pipeLineCreationInfo);
+        pipeLineCreationInfo.cleanup();
     }
 
     private void createShaders() {

booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java

@@ -63,6 +63,7 @@ public void cleanup() {
         for (Map.Entry<String, List<EntityAnimationBuffer>> entry : entityAnimationsBuffers.entrySet()) {
             entry.getValue().forEach(EntityAnimationBuffer::cleanup);
         }
+        memoryBarrier.cleanup();
     }
 
     private void createCommandBuffers(CommandPool commandPool) {

booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java

@@ -101,6 +101,7 @@ public void cleanup() {
         geometryFrameBuffer.cleanup();
         Arrays.asList(commandBuffers).forEach(CommandBuffer::cleanup);
         Arrays.asList(fences).forEach(Fence::cleanup);
+        memoryBarrier.cleanup();
     }
 
     private void createCommandBuffers(CommandPool commandPool, int numImages) {

booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/shadows/ShadowRenderActivity.java

@@ -103,6 +103,7 @@ private void createPipeline(PipelineCache pipelineCache) {
                 GeometryAttachments.NUMBER_COLOR_ATTACHMENTS, true, true, GraphConstants.MAT4X4_SIZE,
                 new VertexBufferStructure(), descriptorSetLayouts);
         pipeLine = new Pipeline(pipelineCache, pipeLineCreationInfo);
+        pipeLineCreationInfo.cleanup();
     }
 
     private void createShaders() {

booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/vk/MemoryBarrier.java

@@ -1,5 +1,6 @@
 package org.vulkanb.eng.graph.vk;
 
+import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.vulkan.VkMemoryBarrier;
 
 import static org.lwjgl.vulkan.VK11.VK_STRUCTURE_TYPE_MEMORY_BARRIER;
@@ -15,6 +16,10 @@ public MemoryBarrier(int srcAccessMask, int dstAccessMask) {
                 .dstAccessMask(dstAccessMask);
     }
 
+    public void cleanup() {
+        MemoryUtil.memFree(vkMemoryBarrier);
+    }
+
     public VkMemoryBarrier.Buffer getVkMemoryBarrier() {
         return vkMemoryBarrier;
     }

booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java

@@ -62,6 +62,7 @@ public void cleanup() {
         for (Map.Entry<String, List<EntityAnimationBuffer>> entry : entityAnimationsBuffers.entrySet()) {
             entry.getValue().forEach(EntityAnimationBuffer::cleanup);
         }
+        memoryBarrier.cleanup();
     }
 
     private void createCommandBuffers(CommandPool commandPool) {

booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java

@@ -101,6 +101,7 @@ public void cleanup() {
         geometryFrameBuffer.cleanup();
         Arrays.asList(commandBuffers).forEach(CommandBuffer::cleanup);
         Arrays.asList(fences).forEach(Fence::cleanup);
+        memoryBarrier.cleanup();
     }
 
     private void createCommandBuffers(CommandPool commandPool, int numImages) {

booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/shadows/ShadowRenderActivity.java

@@ -103,6 +103,7 @@ private void createPipeline(PipelineCache pipelineCache) {
                 GeometryAttachments.NUMBER_COLOR_ATTACHMENTS, true, true, GraphConstants.MAT4X4_SIZE,
                 new VertexBufferStructure(), descriptorSetLayouts);
         pipeLine = new Pipeline(pipelineCache, pipeLineCreationInfo);
+        pipeLineCreationInfo.cleanup();
     }
 
     private void createShaders() {

booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/vk/MemoryBarrier.java

@@ -1,5 +1,6 @@
 package org.vulkanb.eng.graph.vk;
 
+import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.vulkan.VkMemoryBarrier;
 
 import static org.lwjgl.vulkan.VK11.VK_STRUCTURE_TYPE_MEMORY_BARRIER;
@@ -15,6 +16,10 @@ public MemoryBarrier(int srcAccessMask, int dstAccessMask) {
                 .dstAccessMask(dstAccessMask);
     }
 
+    public void cleanup() {
+        MemoryUtil.memFree(vkMemoryBarrier);
+    }
+
     public VkMemoryBarrier.Buffer getVkMemoryBarrier() {
         return vkMemoryBarrier;
     }

booksamples/chapter-16/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java

@@ -55,6 +55,7 @@ public void cleanup() {
         descriptorPool.cleanup();
         storageDescriptorSetLayout.cleanup();
         fence.cleanup();
+        memoryBarrier.cleanup();
     }
 
     private void createCommandBuffers(CommandPool commandPool) {

booksamples/chapter-16/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java

@@ -72,6 +72,7 @@ public void cleanup() {
         descriptorPool.cleanup();
         shaderProgram.cleanup();
         geometryFrameBuffer.cleanup();
+        memoryBarrier.cleanup();
     }
 
     private void createDescriptorPool() {

booksamples/chapter-16/src/main/java/org/vulkanb/eng/graph/shadows/ShadowRenderActivity.java

@@ -110,6 +110,7 @@ private void createPipeline(PipelineCache pipelineCache) {
                 GeometryAttachments.NUMBER_COLOR_ATTACHMENTS, true, true, 0,
                 new InstancedVertexBufferStructure(), descriptorSetLayouts);
         pipeLine = new Pipeline(pipelineCache, pipeLineCreationInfo);
+        pipeLineCreationInfo.cleanup();
     }
 
     private void createShaders() {

booksamples/chapter-16/src/main/java/org/vulkanb/eng/graph/vk/MemoryBarrier.java

@@ -1,5 +1,6 @@
 package org.vulkanb.eng.graph.vk;
 
+import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.vulkan.VkMemoryBarrier;
 
 import static org.lwjgl.vulkan.VK11.VK_STRUCTURE_TYPE_MEMORY_BARRIER;
@@ -15,6 +16,10 @@ public MemoryBarrier(int srcAccessMask, int dstAccessMask) {
                 .dstAccessMask(dstAccessMask);
     }
 
+    public void cleanup() {
+        MemoryUtil.memFree(vkMemoryBarrier);
+    }
+
     public VkMemoryBarrier.Buffer getVkMemoryBarrier() {
         return vkMemoryBarrier;
     }

booksamples/chapter-17/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java

@@ -55,6 +55,7 @@ public void cleanup() {
         descriptorPool.cleanup();
         storageDescriptorSetLayout.cleanup();
         fence.cleanup();
+        memoryBarrier.cleanup();
     }
 
     private void createCommandBuffers(CommandPool commandPool) {

booksamples/chapter-17/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java

@@ -72,6 +72,7 @@ public void cleanup() {
         descriptorPool.cleanup();
         shaderProgram.cleanup();
         geometryFrameBuffer.cleanup();
+        memoryBarrier.cleanup();
     }
 
     private void createDescriptorPool() {

booksamples/chapter-17/src/main/java/org/vulkanb/eng/graph/shadows/ShadowRenderActivity.java

@@ -110,6 +110,7 @@ private void createPipeline(PipelineCache pipelineCache) {
                 GeometryAttachments.NUMBER_COLOR_ATTACHMENTS, true, true, 0,
                 new InstancedVertexBufferStructure(), descriptorSetLayouts);
         pipeLine = new Pipeline(pipelineCache, pipeLineCreationInfo);
+        pipeLineCreationInfo.cleanup();
     }
 
     private void createShaders() {