Fix duplicated code, clarify deadlock fix, and fix a real close-while-minimized hang

attachments/17_swap_chain_recreation.cpp

@@ -135,11 +135,15 @@ class HelloTriangleApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/19_vertex_buffer.cpp

@@ -163,11 +163,15 @@ class HelloTriangleApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/20_staging_buffer.cpp

@@ -163,11 +163,15 @@ class HelloTriangleApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/21_index_buffer.cpp

@@ -170,11 +170,15 @@ class HelloTriangleApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/22_descriptor_layout.cpp

@@ -188,11 +188,15 @@ class HelloTriangleApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/23_descriptor_sets.cpp

@@ -193,11 +193,15 @@ class HelloTriangleApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/24_texture_image.cpp

@@ -200,11 +200,15 @@ class HelloTriangleApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/25_sampler.cpp

@@ -204,11 +204,15 @@ class HelloTriangleApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/26_texture_mapping.cpp

@@ -205,11 +205,15 @@ class HelloTriangleApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/27_depth_buffering.cpp

@@ -219,11 +219,15 @@ class HelloTriangleApplication
 	void recreateSwapChain()
 	{
 		int width = 0, height = 0;
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/28_model_loading.cpp

@@ -226,11 +226,15 @@ class HelloTriangleApplication
 	void recreateSwapChain()
 	{
 		int width = 0, height = 0;
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/29_mipmapping.cpp

@@ -227,11 +227,15 @@ class HelloTriangleApplication
 	void recreateSwapChain()
 	{
 		int width = 0, height = 0;
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/30_multisampling.cpp

@@ -233,11 +233,15 @@ class HelloTriangleApplication
 	void recreateSwapChain()
 	{
 		int width = 0, height = 0;
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/31_compute_shader.cpp

@@ -203,11 +203,15 @@ class ComputeShaderApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/32_ecosystem_utilities.cpp

@@ -262,11 +262,15 @@ class HelloTriangleApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/33_vulkan_profiles.cpp

@@ -263,11 +263,15 @@ class HelloTriangleApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();
 

attachments/34_android.cpp

@@ -1389,11 +1389,15 @@ class HelloTriangleApplication
 		if (window)
 		{
 			glfwGetFramebufferSize(window, &width, &height);
-			while (width == 0 || height == 0)
+			while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 			{
 				glfwGetFramebufferSize(window, &width, &height);
 				glfwWaitEvents();
 			}
+			if (glfwWindowShouldClose(window))
+			{
+				return;
+			}
 		}
 #endif
 		// Wait for device to finish operations

attachments/35_gltf_ktx.cpp

@@ -404,11 +404,15 @@ class VulkanApplication
 #if PLATFORM_DESKTOP
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 #endif
 
 		device.waitIdle();

attachments/36_multiple_objects.cpp

@@ -477,11 +477,15 @@ class VulkanApplication
 #if PLATFORM_DESKTOP
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 #endif
 
 		device.waitIdle();

attachments/37_multithreading.cpp

@@ -499,11 +499,15 @@ class MultithreadedApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 		device.waitIdle();
 
 		cleanupSwapChain();

attachments/38_ray_tracing.cpp

@@ -310,11 +310,15 @@ class VulkanRaytracingApplication
 	{
 		int width = 0, height = 0;
 		glfwGetFramebufferSize(window, &width, &height);
-		while (width == 0 || height == 0)
+		while ((width == 0 || height == 0) && !glfwWindowShouldClose(window))
 		{
 			glfwGetFramebufferSize(window, &width, &height);
 			glfwWaitEvents();
 		}
+		if (glfwWindowShouldClose(window))
+		{
+			return;
+		}
 
 		device.waitIdle();