Merge pull request #101 from lmichaudel/patch-1

gpx1000 · web-flow · commit f7d889ff273b · 2025-07-21T10:58:58.000-07:00
cleanupSwapChain in 17_swap_chain_recreation.cpp was not destroying the previous swapchain
diff --git a/attachments/17_swap_chain_recreation.cpp b/attachments/17_swap_chain_recreation.cpp
@@ -124,6 +124,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() {
diff --git a/attachments/18_vertex_input.cpp b/attachments/18_vertex_input.cpp
@@ -148,6 +148,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() {
diff --git a/attachments/19_vertex_buffer.cpp b/attachments/19_vertex_buffer.cpp
@@ -152,6 +152,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() {
diff --git a/attachments/20_staging_buffer.cpp b/attachments/20_staging_buffer.cpp
@@ -152,6 +152,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() {
diff --git a/attachments/21_index_buffer.cpp b/attachments/21_index_buffer.cpp
@@ -160,7 +160,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
-        swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() {
diff --git a/attachments/22_descriptor_layout.cpp b/attachments/22_descriptor_layout.cpp
@@ -177,6 +177,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() {
diff --git a/attachments/23_descriptor_sets.cpp b/attachments/23_descriptor_sets.cpp
@@ -182,6 +182,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() {
diff --git a/attachments/24_texture_image.cpp b/attachments/24_texture_image.cpp
@@ -189,6 +189,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() {
diff --git a/attachments/25_sampler.cpp b/attachments/25_sampler.cpp
@@ -193,6 +193,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() {
diff --git a/attachments/26_texture_mapping.cpp b/attachments/26_texture_mapping.cpp
@@ -195,6 +195,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() {
diff --git a/attachments/27_depth_buffering.cpp b/attachments/27_depth_buffering.cpp
@@ -207,6 +207,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() const {
diff --git a/attachments/28_model_loading.cpp b/attachments/28_model_loading.cpp
@@ -211,6 +211,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() const {
diff --git a/attachments/29_mipmapping.cpp b/attachments/29_mipmapping.cpp
@@ -212,6 +212,7 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() const {
diff --git a/attachments/30_multisampling.cpp b/attachments/30_multisampling.cpp
@@ -219,7 +219,8 @@ class HelloTriangleApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
-        }
+        swapChain = nullptr;
+    }
 
     void cleanup() const {
         glfwDestroyWindow(window);
diff --git a/attachments/31_compute_shader.cpp b/attachments/31_compute_shader.cpp
@@ -191,6 +191,7 @@ class ComputeShaderApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() const {
diff --git a/attachments/32_ecosystem_utilities.cpp b/attachments/32_ecosystem_utilities.cpp
@@ -237,6 +237,7 @@ class HelloTriangleApplication {
     void cleanupSwapChain() {
         swapChainFramebuffers.clear();
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
     void cleanup() const {
diff --git a/attachments/35_gltf_ktx.cpp b/attachments/35_gltf_ktx.cpp
@@ -358,6 +358,7 @@ class VulkanApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
 #if PLATFORM_DESKTOP
diff --git a/attachments/36_multiple_objects.cpp b/attachments/36_multiple_objects.cpp
@@ -405,6 +405,7 @@ class VulkanApplication {
 
     void cleanupSwapChain() {
         swapChainImageViews.clear();
+        swapChain = nullptr;
     }
 
 #if PLATFORM_DESKTOP
diff --git a/attachments/37_multithreading.cpp b/attachments/37_multithreading.cpp
@@ -435,6 +435,8 @@ class MultithreadedApplication {
         // Clean up shader storage buffers
         shaderStorageBuffers.clear();
         shaderStorageBuffersMemory.clear();
+
+        swapChain = nullptr;
     }
 
     void stopThreads() {

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ class HelloTriangleApplication {`
`124`	`124`
`125`	`125`	`void cleanupSwapChain() {`
`126`	`126`	`swapChainImageViews.clear();`
	`127`	`+ swapChain = nullptr;`
`127`	`128`	`}`
`128`	`129`
`129`	`130`	`void cleanup() {`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ class HelloTriangleApplication {`
`148`	`148`
`149`	`149`	`void cleanupSwapChain() {`
`150`	`150`	`swapChainImageViews.clear();`
	`151`	`+ swapChain = nullptr;`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`void cleanup() {`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ class HelloTriangleApplication {`
`152`	`152`
`153`	`153`	`void cleanupSwapChain() {`
`154`	`154`	`swapChainImageViews.clear();`
	`155`	`+ swapChain = nullptr;`
`155`	`156`	`}`
`156`	`157`
`157`	`158`	`void cleanup() {`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ class HelloTriangleApplication {`
`160`	`160`
`161`	`161`	`void cleanupSwapChain() {`
`162`	`162`	`swapChainImageViews.clear();`
`163`		`- swapChainImageViews.clear();`
	`163`	`+ swapChain = nullptr;`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`void cleanup() {`
Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,7 @@ class HelloTriangleApplication {`
`177`	`177`
`178`	`178`	`void cleanupSwapChain() {`
`179`	`179`	`swapChainImageViews.clear();`
	`180`	`+ swapChain = nullptr;`
`180`	`181`	`}`
`181`	`182`
`182`	`183`	`void cleanup() {`
Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ class HelloTriangleApplication {`
`182`	`182`
`183`	`183`	`void cleanupSwapChain() {`
`184`	`184`	`swapChainImageViews.clear();`
	`185`	`+ swapChain = nullptr;`
`185`	`186`	`}`
`186`	`187`
`187`	`188`	`void cleanup() {`
Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,7 @@ class HelloTriangleApplication {`
`189`	`189`
`190`	`190`	`void cleanupSwapChain() {`
`191`	`191`	`swapChainImageViews.clear();`
	`192`	`+ swapChain = nullptr;`
`192`	`193`	`}`
`193`	`194`
`194`	`195`	`void cleanup() {`
Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,7 @@ class HelloTriangleApplication {`
`193`	`193`
`194`	`194`	`void cleanupSwapChain() {`
`195`	`195`	`swapChainImageViews.clear();`
	`196`	`+ swapChain = nullptr;`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`void cleanup() {`
Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,7 @@ class HelloTriangleApplication {`
`195`	`195`
`196`	`196`	`void cleanupSwapChain() {`
`197`	`197`	`swapChainImageViews.clear();`
	`198`	`+ swapChain = nullptr;`
`198`	`199`	`}`
`199`	`200`
`200`	`201`	`void cleanup() {`