Fix semaphores usage

Author: lwjglgamedev

booksamples/chapter-10/src/main/java/org/vulkanb/eng/graph/Render.java

@@ -76,6 +76,7 @@ public void loadMeshes(MeshData[] meshDataList) {
     }
 
     public void render(Window window, Scene scene) {
+        // TODO: MISSING SEMAPHORE TO PREVENT LIGHTING STAGE TO START
         if (window.isResized() || swapChain.acquireNextImage()) {
             window.resetResized();
             resize(window, scene);

booksamples/chapter-10/src/main/java/org/vulkanb/eng/graph/geometry/GeometryAttachments.java

@@ -11,6 +11,7 @@ public class GeometryAttachments {
     public static final int NUMBER_ATTACHMENTS = 4;
     public static final int NUMBER_COLOR_ATTACHMENTS = NUMBER_ATTACHMENTS - 1;
     private Attachment[] attachments;
+    private int depthAttachmentPos;
 
     public GeometryAttachments(Device device, int width, int height) {
         attachments = new Attachment[NUMBER_ATTACHMENTS];
@@ -38,6 +39,7 @@ public GeometryAttachments(Device device, int width, int height) {
         attachment = new Attachment(device, width, height,
                 VK_FORMAT_D32_SFLOAT, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
         attachments[i] = attachment;
+        depthAttachmentPos = i;
     }
 
     public void cleanup() {
@@ -49,6 +51,6 @@ public Attachment[] getAttachments() {
     }
 
     public Attachment getDepthAttachment() {
-        return attachments[3];
+        return attachments[depthAttachmentPos];
     }
 }

booksamples/chapter-10/src/main/java/org/vulkanb/eng/graph/geometry/GeometryFrameBuffer.java

@@ -25,7 +25,7 @@ public GeometryFrameBuffer(SwapChain swapChain) {
             int height = extent2D.height();
 
             geometryAttachments = new GeometryAttachments(device, width, height);
-            geometryRenderPass = new GeometryRenderPass(device, geometryAttachments);
+            geometryRenderPass = new GeometryRenderPass(device, geometryAttachments.getAttachments());
 
             Attachment[] attachments = geometryAttachments.getAttachments();
             int numAttachments = attachments.length;

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

@@ -89,7 +89,7 @@ private void createCommandBuffers(CommandPool commandPool, int numImages) {
     private void createDescriptorPool() {
         EngineProperties engineProps = EngineProperties.getInstance();
         List<DescriptorPool.DescriptorTypeCount> descriptorTypeCounts = new ArrayList<>();
-        descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(2, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER));
+        descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(swapChain.getNumImages() + 1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER));
         descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(engineProps.getMaxMaterials() * 3, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER));
         descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC));
         descriptorPool = new DescriptorPool(device, descriptorTypeCounts);
@@ -303,7 +303,7 @@ public void submit(Queue queue) {
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),
                     stack.ints(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT),
-                    null, currentFence);
+                    stack.longs(syncSemaphores.geometryCompleteSemaphore().getVkSemaphore()), currentFence);
         }
     }
 

booksamples/chapter-10/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderPass.java

@@ -15,10 +15,9 @@ public class GeometryRenderPass {
     private Device device;
     private long vkRenderPass;
 
-    public GeometryRenderPass(Device device, GeometryAttachments offscreenAttachments) {
+    public GeometryRenderPass(Device device, Attachment[] attachments) {
         this.device = device;
         try (MemoryStack stack = MemoryStack.stackPush()) {
-            Attachment[] attachments = offscreenAttachments.getAttachments();
             int numAttachments = attachments.length;
             VkAttachmentDescription.Buffer attachmentsDesc = VkAttachmentDescription.callocStack(numAttachments, stack);
             int depthAttachmentPos = 0;
@@ -39,7 +38,6 @@ public GeometryRenderPass(Device device, GeometryAttachments offscreenAttachment
                 }
             }
 
-            // Create color references
             VkAttachmentReference.Buffer colorReferences = VkAttachmentReference.callocStack(GeometryAttachments.NUMBER_COLOR_ATTACHMENTS,
                     stack);
             for (int i = 0; i < GeometryAttachments.NUMBER_COLOR_ATTACHMENTS; i++) {

booksamples/chapter-10/src/main/java/org/vulkanb/eng/graph/lighting/LightingRenderActivity.java

@@ -233,6 +233,7 @@ public void recordCommandBuffer(Scene scene) {
     }
 
     public void resize(SwapChain swapChain, GeometryFrameBuffer geometryFrameBuffer, Scene scene) {
+        this.swapChain = swapChain;
         lightingFrameBuffer.cleanup();
         pipeline.cleanup();
         attachmentsDescriptorSet.update(geometryFrameBuffer);
@@ -254,9 +255,10 @@ public void submit(Queue queue) {
             Fence currentFence = fences[idx];
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
-                    null,
+                    stack.longs(syncSemaphores.geometryCompleteSemaphore().getVkSemaphore()),
                     stack.ints(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT),
-                    stack.longs(syncSemaphores.renderCompleteSemaphore().getVkSemaphore()), currentFence);
+                    stack.longs(syncSemaphores.renderCompleteSemaphore().getVkSemaphore()),
+                    currentFence);
         }
     }
 

booksamples/chapter-10/src/main/java/org/vulkanb/eng/graph/vk/SwapChain.java

@@ -66,7 +66,7 @@ public SwapChain(Device device, Surface surface, Window window, int requestedIma
             numImages = imageViews.length;
             syncSemaphoresList = new SyncSemaphores[numImages];
             for (int i = 0; i < numImages; i++) {
-                syncSemaphoresList[i] = new SyncSemaphores(new Semaphore(device), new Semaphore(device));
+                syncSemaphoresList[i] = new SyncSemaphores(new Semaphore(device), new Semaphore(device), new Semaphore(device));
             }
             currentFrame = 0;
         }
@@ -165,6 +165,7 @@ public void cleanup() {
             imageViews[i].cleanup();
             SyncSemaphores syncSemaphores = syncSemaphoresList[i];
             syncSemaphores.imgAcquisitionSemaphore().cleanup();
+            syncSemaphores.geometryCompleteSemaphore().cleanup();
             syncSemaphores.renderCompleteSemaphore().cleanup();
         }
 
@@ -250,6 +251,7 @@ public boolean presentImage(Queue queue) {
     public record SurfaceFormat(int imageFormat, int colorSpace) {
     }
 
-    public record SyncSemaphores(Semaphore imgAcquisitionSemaphore, Semaphore renderCompleteSemaphore) {
+    public record SyncSemaphores(Semaphore imgAcquisitionSemaphore, Semaphore geometryCompleteSemaphore,
+                                 Semaphore renderCompleteSemaphore) {
     }
 }