Fix glfwDestroyWindow never being called

Overv · Overv · commit 382c7a3f9278 · 2017-01-12T22:37:44.000+01:00
diff --git a/03_Drawing_a_triangle/00_Setup/00_Base_code.md b/03_Drawing_a_triangle/00_Setup/00_Base_code.md
@@ -305,12 +305,15 @@ void mainLoop() {
     while (!glfwWindowShouldClose(window)) {
         glfwPollEvents();
     }
+
+    glfwDestroyWindow(window);
 }
 ```
 
 This code should be fairly self-explanatory. It loops and checks for events like
 pressing the X button until the window has been closed by the user. This is also
-the loop where we'll later call a function to render a single frame.
+the loop where we'll later call a function to render a single frame. Once the
+window is closed, we need to clean up resources by destroying it.
 
 When you run the program now you should see a window titled `Vulkan` show up
 until the application is terminated by closing the window. Now that we have the
diff --git a/03_Drawing_a_triangle/03_Drawing/02_Rendering_and_presentation.md b/03_Drawing_a_triangle/03_Drawing/02_Rendering_and_presentation.md
@@ -10,6 +10,8 @@ void mainLoop() {
         glfwPollEvents();
         drawFrame();
     }
+
+    glfwDestroyWindow(window);
 }
 
 ...
@@ -319,7 +321,7 @@ may still be going on. Cleaning up resources while that is happening is a bad
 idea.
 
 To fix that problem, we should wait for the logical device to finish operations
-before exiting `mainLoop`:
+before exiting `mainLoop` and destroying the window:
 
 ```c++
 void mainLoop() {
@@ -329,6 +331,8 @@ void mainLoop() {
     }
 
     vkDeviceWaitIdle(device);
+
+    glfwDestroyWindow(window);
 }
 ```
 
diff --git a/05_Uniform_buffers/00_Descriptor_layout_and_buffer.md b/05_Uniform_buffers/00_Descriptor_layout_and_buffer.md
@@ -265,6 +265,8 @@ void mainLoop() {
     }
 
     vkDeviceWaitIdle(device);
+
+    glfwDestroyWindow(window);
 }
 
 ...
diff --git a/code/base_code.cpp b/code/base_code.cpp
@@ -94,6 +94,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 };
 
diff --git a/code/command_buffers.cpp b/code/command_buffers.cpp
@@ -179,6 +179,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/depth_buffering.cpp b/code/depth_buffering.cpp
@@ -293,6 +293,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/descriptor_layout.cpp b/code/descriptor_layout.cpp
@@ -259,6 +259,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/descriptor_set.cpp b/code/descriptor_set.cpp
@@ -264,6 +264,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/fixed_functions.cpp b/code/fixed_functions.cpp
@@ -171,6 +171,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/framebuffers.cpp b/code/framebuffers.cpp
@@ -174,6 +174,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/graphics_pipeline.cpp b/code/graphics_pipeline.cpp
@@ -167,6 +167,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/graphics_pipeline_complete.cpp b/code/graphics_pipeline_complete.cpp
@@ -173,6 +173,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/hello_triangle.cpp b/code/hello_triangle.cpp
@@ -186,6 +186,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/image_views.cpp b/code/image_views.cpp
@@ -165,6 +165,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/index_buffer.cpp b/code/index_buffer.cpp
@@ -240,6 +240,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/instance_creation.cpp b/code/instance_creation.cpp
@@ -96,6 +96,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/logical_device.cpp b/code/logical_device.cpp
@@ -142,6 +142,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/model_loading.cpp b/code/model_loading.cpp
@@ -299,6 +299,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/physical_device_selection.cpp b/code/physical_device_selection.cpp
@@ -138,6 +138,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/render_passes.cpp b/code/render_passes.cpp
@@ -172,6 +172,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/sampler.cpp b/code/sampler.cpp
@@ -275,6 +275,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/shader_modules.cpp b/code/shader_modules.cpp
@@ -167,6 +167,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/staging_buffer.cpp b/code/staging_buffer.cpp
@@ -232,6 +232,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/swap_chain_creation.cpp b/code/swap_chain_creation.cpp
@@ -163,6 +163,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/swap_chain_recreation.cpp b/code/swap_chain_recreation.cpp
@@ -188,6 +188,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/texture_image.cpp b/code/texture_image.cpp
@@ -271,6 +271,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/texture_mapping.cpp b/code/texture_mapping.cpp
@@ -281,6 +281,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/validation_layers.cpp b/code/validation_layers.cpp
@@ -126,6 +126,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {
diff --git a/code/vertex_buffer.cpp b/code/vertex_buffer.cpp
@@ -232,6 +232,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/vertex_input.cpp b/code/vertex_input.cpp
@@ -227,6 +227,8 @@ class HelloTriangleApplication {
         }
 
         vkDeviceWaitIdle(device);
+
+        glfwDestroyWindow(window);
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/window_surface.cpp b/code/window_surface.cpp
@@ -146,6 +146,8 @@ class HelloTriangleApplication {
         while (!glfwWindowShouldClose(window)) {
             glfwPollEvents();
         }
+
+        glfwDestroyWindow(window);
     }
 
     void createInstance() {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ void mainLoop() {`
`10`	`10`	`glfwPollEvents();`
`11`	`11`	`drawFrame();`
`12`	`12`	`}`
	`13`	`+`
	`14`	`+ glfwDestroyWindow(window);`
`13`	`15`	`}`
`14`	`16`
`15`	`17`	`...`
`@@ -319,7 +321,7 @@ may still be going on. Cleaning up resources while that is happening is a bad`
`319`	`321`	`idea.`
`320`	`322`
`321`	`323`	`To fix that problem, we should wait for the logical device to finish operations`
`322`		-before exiting `mainLoop`:
	`324`	+before exiting `mainLoop` and destroying the window:
`323`	`325`
`324`	`326`	```c++
`325`	`327`	`void mainLoop() {`
`@@ -329,6 +331,8 @@ void mainLoop() {`
`329`	`331`	`}`
`330`	`332`
`331`	`333`	`vkDeviceWaitIdle(device);`
	`334`	`+`
	`335`	`+ glfwDestroyWindow(window);`
`332`	`336`	`}`
`333`	`337`	```
`334`	`338`
Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,8 @@ void mainLoop() {`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`vkDeviceWaitIdle(device);`
	`268`	`+`
	`269`	`+ glfwDestroyWindow(window);`
`268`	`270`	`}`
`269`	`271`
`270`	`272`	`...`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,8 @@ class HelloTriangleApplication {`
`94`	`94`	`while (!glfwWindowShouldClose(window)) {`
`95`	`95`	`glfwPollEvents();`
`96`	`96`	`}`
	`97`	`+`
	`98`	`+ glfwDestroyWindow(window);`
`97`	`99`	`}`
`98`	`100`	`};`
`99`	`101`
Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,8 @@ class HelloTriangleApplication {`
`179`	`179`	`while (!glfwWindowShouldClose(window)) {`
`180`	`180`	`glfwPollEvents();`
`181`	`181`	`}`
	`182`	`+`
	`183`	`+ glfwDestroyWindow(window);`
`182`	`184`	`}`
`183`	`185`
`184`	`186`	`void createInstance() {`
Original file line number	Diff line number	Diff line change
`@@ -293,6 +293,8 @@ class HelloTriangleApplication {`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`vkDeviceWaitIdle(device);`
	`296`	`+`
	`297`	`+ glfwDestroyWindow(window);`
`296`	`298`	`}`
`297`	`299`
`298`	`300`	`static void onWindowResized(GLFWwindow* window, int width, int height) {`
Original file line number	Diff line number	Diff line change
`@@ -259,6 +259,8 @@ class HelloTriangleApplication {`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`vkDeviceWaitIdle(device);`
	`262`	`+`
	`263`	`+ glfwDestroyWindow(window);`
`262`	`264`	`}`
`263`	`265`
`264`	`266`	`static void onWindowResized(GLFWwindow* window, int width, int height) {`
Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,8 @@ class HelloTriangleApplication {`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`vkDeviceWaitIdle(device);`
	`267`	`+`
	`268`	`+ glfwDestroyWindow(window);`
`267`	`269`	`}`
`268`	`270`
`269`	`271`	`static void onWindowResized(GLFWwindow* window, int width, int height) {`
Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,8 @@ class HelloTriangleApplication {`
`171`	`171`	`while (!glfwWindowShouldClose(window)) {`
`172`	`172`	`glfwPollEvents();`
`173`	`173`	`}`
	`174`	`+`
	`175`	`+ glfwDestroyWindow(window);`
`174`	`176`	`}`
`175`	`177`
`176`	`178`	`void createInstance() {`
Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,8 @@ class HelloTriangleApplication {`
`174`	`174`	`while (!glfwWindowShouldClose(window)) {`
`175`	`175`	`glfwPollEvents();`
`176`	`176`	`}`
	`177`	`+`
	`178`	`+ glfwDestroyWindow(window);`
`177`	`179`	`}`
`178`	`180`
`179`	`181`	`void createInstance() {`