Fix deadlock when resizing

lwjglgamedev · Jan 20, 2024 · 6a0addb · 6a0addb
1 parent 0a1b384
commit 6a0addb
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/bookcontents/chapter-05/chapter-05.md b/bookcontents/chapter-05/chapter-05.md
@@ -813,12 +813,11 @@ public class ForwardRenderActivity {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
     ...
 }
 ```
-We just invoke the `fenceWait` and the `reset` on the frame associated to current swap chain image, to prevent acquiring an image, using a semaphore that has not been signaled, that is, previous operations have not finished. 
+We just invoke the `fenceWait` on the frame associated to current swap chain image, to prevent acquiring an image, using a semaphore that has not been signaled, that is, previous operations have not finished. 
 
 The definition of the `recordCommandBuffer` is:
 ```java
@@ -863,6 +862,7 @@ public class ForwardRenderActivity {
             int idx = swapChain.getCurrentFrame();
             CommandBuffer commandBuffer = commandBuffers[idx];
             Fence currentFence = fences[idx];
+            currentFence.reset();
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),

diff --git a/bookcontents/chapter-10/chapter-10.md b/bookcontents/chapter-10/chapter-10.md
@@ -664,6 +664,7 @@ public class GeometryRenderActivity {
             int idx = swapChain.getCurrentFrame();
             CommandBuffer commandBuffer = commandBuffers[idx];
             Fence currentFence = fences[idx];
+            currentFence.reset();
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),
@@ -676,7 +677,6 @@ public class GeometryRenderActivity {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
     ...    
 }

diff --git a/booksamples/chapter-05/src/main/java/org/vulkanb/eng/graph/ForwardRenderActivity.java b/booksamples/chapter-05/src/main/java/org/vulkanb/eng/graph/ForwardRenderActivity.java
@@ -74,6 +74,7 @@ public void submit(Queue queue) {
         try (MemoryStack stack = MemoryStack.stackPush()) {
             int idx = swapChain.getCurrentFrame();
             Fence currentFence = fences[idx];
+            currentFence.reset();
             CommandBuffer commandBuffer = commandBuffers[idx];
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
@@ -88,6 +89,5 @@ public void waitForFence() {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
 }
diff --git a/booksamples/chapter-06/src/main/java/org/vulkanb/eng/graph/ForwardRenderActivity.java b/booksamples/chapter-06/src/main/java/org/vulkanb/eng/graph/ForwardRenderActivity.java
@@ -145,6 +145,7 @@ public void submit(Queue queue) {
             int idx = swapChain.getCurrentFrame();
             CommandBuffer commandBuffer = commandBuffers[idx];
             Fence currentFence = fences[idx];
+            currentFence.reset();
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),
@@ -157,6 +158,5 @@ public void waitForFence() {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
 }
diff --git a/booksamples/chapter-07/src/main/java/org/vulkanb/eng/graph/ForwardRenderActivity.java b/booksamples/chapter-07/src/main/java/org/vulkanb/eng/graph/ForwardRenderActivity.java
@@ -205,6 +205,7 @@ public void submit(Queue queue) {
             int idx = swapChain.getCurrentFrame();
             CommandBuffer commandBuffer = commandBuffers[idx];
             Fence currentFence = fences[idx];
+            currentFence.reset();
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),
@@ -217,6 +218,5 @@ public void waitForFence() {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
 }
diff --git a/booksamples/chapter-08/src/main/java/org/vulkanb/eng/graph/ForwardRenderActivity.java b/booksamples/chapter-08/src/main/java/org/vulkanb/eng/graph/ForwardRenderActivity.java
@@ -249,6 +249,7 @@ public void submit(Queue queue) {
             int idx = swapChain.getCurrentFrame();
             CommandBuffer commandBuffer = commandBuffers[idx];
             Fence currentFence = fences[idx];
+            currentFence.reset();
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),
@@ -271,6 +272,5 @@ public void waitForFence() {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
 }
diff --git a/booksamples/chapter-09/src/main/java/org/vulkanb/eng/graph/ForwardRenderActivity.java b/booksamples/chapter-09/src/main/java/org/vulkanb/eng/graph/ForwardRenderActivity.java
@@ -306,6 +306,7 @@ public void submit(Queue queue) {
             int idx = swapChain.getCurrentFrame();
             CommandBuffer commandBuffer = commandBuffers[idx];
             Fence currentFence = fences[idx];
+            currentFence.reset();
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),
@@ -335,6 +336,5 @@ public void waitForFence() {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
 }
diff --git a/...mples/chapter-10/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java b/...mples/chapter-10/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java
@@ -290,6 +290,7 @@ public void submit(Queue queue) {
             int idx = swapChain.getCurrentFrame();
             CommandBuffer commandBuffer = commandBuffers[idx];
             Fence currentFence = fences[idx];
+            currentFence.reset();
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),
@@ -319,6 +320,5 @@ public void waitForFence() {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
 }
diff --git a/...mples/chapter-11/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java b/...mples/chapter-11/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java
@@ -298,6 +298,7 @@ public void submit(Queue queue) {
             int idx = swapChain.getCurrentFrame();
             CommandBuffer commandBuffer = commandBuffers[idx];
             Fence currentFence = fences[idx];
+            currentFence.reset();
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),
@@ -332,6 +333,5 @@ public void waitForFence() {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
 }
diff --git a/...mples/chapter-12/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java b/...mples/chapter-12/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java
@@ -298,6 +298,7 @@ public void submit(Queue queue) {
             int idx = swapChain.getCurrentFrame();
             CommandBuffer commandBuffer = commandBuffers[idx];
             Fence currentFence = fences[idx];
+            currentFence.reset();
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),
@@ -332,6 +333,5 @@ public void waitForFence() {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
 }
diff --git a/...mples/chapter-13/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java b/...mples/chapter-13/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java
@@ -305,6 +305,7 @@ public void submit(Queue queue) {
             int idx = swapChain.getCurrentFrame();
             CommandBuffer commandBuffer = commandBuffers[idx];
             Fence currentFence = fences[idx];
+            currentFence.reset();
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),
@@ -339,6 +340,5 @@ public void waitForFence() {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
 }
diff --git a/...mples/chapter-14/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java b/...mples/chapter-14/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java
@@ -325,6 +325,7 @@ public void submit(Queue queue) {
             int idx = swapChain.getCurrentFrame();
             CommandBuffer commandBuffer = commandBuffers[idx];
             Fence currentFence = fences[idx];
+            currentFence.reset();
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),
@@ -359,6 +360,5 @@ public void waitForFence() {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
 }
diff --git a/...mples/chapter-15/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java b/...mples/chapter-15/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java
@@ -325,6 +325,7 @@ public void submit(Queue queue) {
             int idx = swapChain.getCurrentFrame();
             CommandBuffer commandBuffer = commandBuffers[idx];
             Fence currentFence = fences[idx];
+            currentFence.reset();
             SwapChain.SyncSemaphores syncSemaphores = swapChain.getSyncSemaphoresList()[idx];
             queue.submit(stack.pointers(commandBuffer.getVkCommandBuffer()),
                     stack.longs(syncSemaphores.imgAcquisitionSemaphore().getVkSemaphore()),
@@ -359,6 +360,5 @@ public void waitForFence() {
         int idx = swapChain.getCurrentFrame();
         Fence currentFence = fences[idx];
         currentFence.fenceWait();
-        currentFence.reset();
     }
 }