Move resetFences call to prevent deadlock on out of date swapchain

mjrapson · mjrapson · commit 5be959df07ba · 2025-12-18T17:30:24.000Z
diff --git a/attachments/17_swap_chain_recreation.cpp b/attachments/17_swap_chain_recreation.cpp
@@ -510,7 +510,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -524,6 +523,7 @@ class HelloTriangleApplication
 			throw std::runtime_error("failed to acquire swap chain image!");
 		}
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/18_vertex_input.cpp b/attachments/18_vertex_input.cpp
@@ -529,7 +529,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -543,6 +542,7 @@ class HelloTriangleApplication
 			throw std::runtime_error("failed to acquire swap chain image!");
 		}
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/19_vertex_buffer.cpp b/attachments/19_vertex_buffer.cpp
@@ -565,7 +565,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -579,6 +578,7 @@ class HelloTriangleApplication
 			throw std::runtime_error("failed to acquire swap chain image!");
 		}
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/20_staging_buffer.cpp b/attachments/20_staging_buffer.cpp
@@ -585,7 +585,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -599,6 +598,7 @@ class HelloTriangleApplication
 			throw std::runtime_error("failed to acquire swap chain image!");
 		}
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/21_index_buffer.cpp b/attachments/21_index_buffer.cpp
@@ -611,7 +611,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -625,6 +624,7 @@ class HelloTriangleApplication
 			throw std::runtime_error("failed to acquire swap chain image!");
 		}
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/22_descriptor_layout.cpp b/attachments/22_descriptor_layout.cpp
@@ -670,7 +670,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -685,6 +684,7 @@ class HelloTriangleApplication
 		}
 		updateUniformBuffer(frameIndex);
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/23_descriptor_sets.cpp b/attachments/23_descriptor_sets.cpp
@@ -698,7 +698,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -713,6 +712,7 @@ class HelloTriangleApplication
 		}
 		updateUniformBuffer(frameIndex);
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/24_texture_image.cpp b/attachments/24_texture_image.cpp
@@ -807,7 +807,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -822,6 +821,7 @@ class HelloTriangleApplication
 		}
 		updateUniformBuffer(frameIndex);
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/25_sampler.cpp b/attachments/25_sampler.cpp
@@ -843,7 +843,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -858,6 +857,7 @@ class HelloTriangleApplication
 		}
 		updateUniformBuffer(frameIndex);
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/26_texture_mapping.cpp b/attachments/26_texture_mapping.cpp
@@ -908,7 +908,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -923,6 +922,7 @@ class HelloTriangleApplication
 		}
 		updateUniformBuffer(frameIndex);
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/27_depth_buffering.cpp b/attachments/27_depth_buffering.cpp
@@ -1009,7 +1009,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -1024,6 +1023,7 @@ class HelloTriangleApplication
 		}
 		updateUniformBuffer(frameIndex);
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/28_model_loading.cpp b/attachments/28_model_loading.cpp
@@ -1065,7 +1065,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -1080,6 +1079,7 @@ class HelloTriangleApplication
 		}
 		updateUniformBuffer(frameIndex);
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/29_mipmapping.cpp b/attachments/29_mipmapping.cpp
@@ -1135,7 +1135,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -1150,6 +1149,7 @@ class HelloTriangleApplication
 		}
 		updateUniformBuffer(frameIndex);
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/30_multisampling.cpp b/attachments/30_multisampling.cpp
@@ -1198,7 +1198,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -1213,6 +1212,7 @@ class HelloTriangleApplication
 		}
 		updateUniformBuffer(frameIndex);
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/32_ecosystem_utilities.cpp b/attachments/32_ecosystem_utilities.cpp
@@ -1589,7 +1589,6 @@ class HelloTriangleApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -1604,6 +1603,7 @@ class HelloTriangleApplication
 		}
 		updateUniformBuffer(frameIndex);
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/35_gltf_ktx.cpp b/attachments/35_gltf_ktx.cpp
@@ -1398,7 +1398,6 @@ class VulkanApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -1413,6 +1412,7 @@ class VulkanApplication
 		}
 		updateUniformBuffer(frameIndex);
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/36_multiple_objects.cpp b/attachments/36_multiple_objects.cpp
@@ -1531,7 +1531,6 @@ class VulkanApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -1548,6 +1547,7 @@ class VulkanApplication
 		// Update uniform buffers for all objects
 		updateUniformBuffers();
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 
diff --git a/attachments/38_ray_tracing.cpp b/attachments/38_ray_tracing.cpp
@@ -1828,7 +1828,6 @@ class VulkanRaytracingApplication
 		{
 			throw std::runtime_error("failed to wait for fence!");
 		}
-		device.resetFences(*inFlightFences[frameIndex]);
 
 		auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
 
@@ -1847,6 +1846,7 @@ class VulkanRaytracingApplication
 		updateTopLevelAS(ubo.model);
 #endif        // LAB_TASK_LEVEL >= LAB_TASK_AS_ANIMATION
 
+		device.resetFences(*inFlightFences[frameIndex]);
 		commandBuffers[frameIndex].reset();
 		recordCommandBuffer(imageIndex);
 

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,6 @@ class HelloTriangleApplication`
`510`	`510`	`{`
`511`	`511`	`throw std::runtime_error("failed to wait for fence!");`
`512`	`512`	`}`
`513`		`- device.resetFences(*inFlightFences[frameIndex]);`
`514`	`513`
`515`	`514`	`auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);`
`516`	`515`
`@@ -524,6 +523,7 @@ class HelloTriangleApplication`
`524`	`523`	`throw std::runtime_error("failed to acquire swap chain image!");`
`525`	`524`	`}`
`526`	`525`
	`526`	`+ device.resetFences(*inFlightFences[frameIndex]);`
`527`	`527`	`commandBuffers[frameIndex].reset();`
`528`	`528`	`recordCommandBuffer(imageIndex);`
`529`	`529`
Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,6 @@ class HelloTriangleApplication`
`529`	`529`	`{`
`530`	`530`	`throw std::runtime_error("failed to wait for fence!");`
`531`	`531`	`}`
`532`		`- device.resetFences(*inFlightFences[frameIndex]);`
`533`	`532`
`534`	`533`	`auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);`
`535`	`534`
`@@ -543,6 +542,7 @@ class HelloTriangleApplication`
`543`	`542`	`throw std::runtime_error("failed to acquire swap chain image!");`
`544`	`543`	`}`
`545`	`544`
	`545`	`+ device.resetFences(*inFlightFences[frameIndex]);`
`546`	`546`	`commandBuffers[frameIndex].reset();`
`547`	`547`	`recordCommandBuffer(imageIndex);`
`548`	`548`
Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,6 @@ class HelloTriangleApplication`
`565`	`565`	`{`
`566`	`566`	`throw std::runtime_error("failed to wait for fence!");`
`567`	`567`	`}`
`568`		`- device.resetFences(*inFlightFences[frameIndex]);`
`569`	`568`
`570`	`569`	`auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);`
`571`	`570`
`@@ -579,6 +578,7 @@ class HelloTriangleApplication`
`579`	`578`	`throw std::runtime_error("failed to acquire swap chain image!");`
`580`	`579`	`}`
`581`	`580`
	`581`	`+ device.resetFences(*inFlightFences[frameIndex]);`
`582`	`582`	`commandBuffers[frameIndex].reset();`
`583`	`583`	`recordCommandBuffer(imageIndex);`
`584`	`584`
Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,6 @@ class HelloTriangleApplication`
`585`	`585`	`{`
`586`	`586`	`throw std::runtime_error("failed to wait for fence!");`
`587`	`587`	`}`
`588`		`- device.resetFences(*inFlightFences[frameIndex]);`
`589`	`588`
`590`	`589`	`auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);`
`591`	`590`
`@@ -599,6 +598,7 @@ class HelloTriangleApplication`
`599`	`598`	`throw std::runtime_error("failed to acquire swap chain image!");`
`600`	`599`	`}`
`601`	`600`
	`601`	`+ device.resetFences(*inFlightFences[frameIndex]);`
`602`	`602`	`commandBuffers[frameIndex].reset();`
`603`	`603`	`recordCommandBuffer(imageIndex);`
`604`	`604`
Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,6 @@ class HelloTriangleApplication`
`611`	`611`	`{`
`612`	`612`	`throw std::runtime_error("failed to wait for fence!");`
`613`	`613`	`}`
`614`		`- device.resetFences(*inFlightFences[frameIndex]);`
`615`	`614`
`616`	`615`	`auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);`
`617`	`616`
`@@ -625,6 +624,7 @@ class HelloTriangleApplication`
`625`	`624`	`throw std::runtime_error("failed to acquire swap chain image!");`
`626`	`625`	`}`
`627`	`626`
	`627`	`+ device.resetFences(*inFlightFences[frameIndex]);`
`628`	`628`	`commandBuffers[frameIndex].reset();`
`629`	`629`	`recordCommandBuffer(imageIndex);`
`630`	`630`
Original file line number	Diff line number	Diff line change
`@@ -670,7 +670,6 @@ class HelloTriangleApplication`
`670`	`670`	`{`
`671`	`671`	`throw std::runtime_error("failed to wait for fence!");`
`672`	`672`	`}`
`673`		`- device.resetFences(*inFlightFences[frameIndex]);`
`674`	`673`
`675`	`674`	`auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);`
`676`	`675`
`@@ -685,6 +684,7 @@ class HelloTriangleApplication`
`685`	`684`	`}`
`686`	`685`	`updateUniformBuffer(frameIndex);`
`687`	`686`
	`687`	`+ device.resetFences(*inFlightFences[frameIndex]);`
`688`	`688`	`commandBuffers[frameIndex].reset();`
`689`	`689`	`recordCommandBuffer(imageIndex);`
`690`	`690`
Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,6 @@ class HelloTriangleApplication`
`698`	`698`	`{`
`699`	`699`	`throw std::runtime_error("failed to wait for fence!");`
`700`	`700`	`}`
`701`		`- device.resetFences(*inFlightFences[frameIndex]);`
`702`	`701`
`703`	`702`	`auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);`
`704`	`703`
`@@ -713,6 +712,7 @@ class HelloTriangleApplication`
`713`	`712`	`}`
`714`	`713`	`updateUniformBuffer(frameIndex);`
`715`	`714`
	`715`	`+ device.resetFences(*inFlightFences[frameIndex]);`
`716`	`716`	`commandBuffers[frameIndex].reset();`
`717`	`717`	`recordCommandBuffer(imageIndex);`
`718`	`718`
Original file line number	Diff line number	Diff line change
`@@ -807,7 +807,6 @@ class HelloTriangleApplication`
`807`	`807`	`{`
`808`	`808`	`throw std::runtime_error("failed to wait for fence!");`
`809`	`809`	`}`
`810`		`- device.resetFences(*inFlightFences[frameIndex]);`
`811`	`810`
`812`	`811`	`auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);`
`813`	`812`
`@@ -822,6 +821,7 @@ class HelloTriangleApplication`
`822`	`821`	`}`
`823`	`822`	`updateUniformBuffer(frameIndex);`
`824`	`823`
	`824`	`+ device.resetFences(*inFlightFences[frameIndex]);`
`825`	`825`	`commandBuffers[frameIndex].reset();`
`826`	`826`	`recordCommandBuffer(imageIndex);`
`827`	`827`
Original file line number	Diff line number	Diff line change
`@@ -843,7 +843,6 @@ class HelloTriangleApplication`
`843`	`843`	`{`
`844`	`844`	`throw std::runtime_error("failed to wait for fence!");`
`845`	`845`	`}`
`846`		`- device.resetFences(*inFlightFences[frameIndex]);`
`847`	`846`
`848`	`847`	`auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);`
`849`	`848`
`@@ -858,6 +857,7 @@ class HelloTriangleApplication`
`858`	`857`	`}`
`859`	`858`	`updateUniformBuffer(frameIndex);`
`860`	`859`
	`860`	`+ device.resetFences(*inFlightFences[frameIndex]);`
`861`	`861`	`commandBuffers[frameIndex].reset();`
`862`	`862`	`recordCommandBuffer(imageIndex);`
`863`	`863`
Original file line number	Diff line number	Diff line change
`@@ -908,7 +908,6 @@ class HelloTriangleApplication`
`908`	`908`	`{`
`909`	`909`	`throw std::runtime_error("failed to wait for fence!");`
`910`	`910`	`}`
`911`		`- device.resetFences(*inFlightFences[frameIndex]);`
`912`	`911`
`913`	`912`	`auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);`
`914`	`913`
`@@ -923,6 +922,7 @@ class HelloTriangleApplication`
`923`	`922`	`}`
`924`	`923`	`updateUniformBuffer(frameIndex);`
`925`	`924`
	`925`	`+ device.resetFences(*inFlightFences[frameIndex]);`
`926`	`926`	`commandBuffers[frameIndex].reset();`
`927`	`927`	`recordCommandBuffer(imageIndex);`
`928`	`928`