Fix missing glfwTerminate calls

Overv · Overv · commit 2a716d85797d · 2017-02-24T01:28:34.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
@@ -307,13 +307,16 @@ void mainLoop() {
     }
 
     glfwDestroyWindow(window);
+
+    glfwTerminate();
 }
 ```
 
 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. Once the
-window is closed, we need to clean up resources by destroying it.
+window is closed, we need to clean up resources by destroying it and GLFW]
+itself.
 
 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/code/base_code.cpp b/code/base_code.cpp
@@ -96,6 +96,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 };
 
diff --git a/code/command_buffers.cpp b/code/command_buffers.cpp
@@ -181,6 +181,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/depth_buffering.cpp b/code/depth_buffering.cpp
@@ -295,6 +295,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/descriptor_layout.cpp b/code/descriptor_layout.cpp
@@ -261,6 +261,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/descriptor_set.cpp b/code/descriptor_set.cpp
@@ -266,6 +266,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/fixed_functions.cpp b/code/fixed_functions.cpp
@@ -173,6 +173,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/framebuffers.cpp b/code/framebuffers.cpp
@@ -176,6 +176,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/graphics_pipeline.cpp b/code/graphics_pipeline.cpp
@@ -169,6 +169,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/graphics_pipeline_complete.cpp b/code/graphics_pipeline_complete.cpp
@@ -175,6 +175,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/hello_triangle.cpp b/code/hello_triangle.cpp
@@ -188,6 +188,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/image_views.cpp b/code/image_views.cpp
@@ -167,6 +167,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/index_buffer.cpp b/code/index_buffer.cpp
@@ -242,6 +242,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/instance_creation.cpp b/code/instance_creation.cpp
@@ -98,6 +98,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/logical_device.cpp b/code/logical_device.cpp
@@ -144,6 +144,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/model_loading.cpp b/code/model_loading.cpp
@@ -301,6 +301,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/physical_device_selection.cpp b/code/physical_device_selection.cpp
@@ -140,6 +140,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/render_passes.cpp b/code/render_passes.cpp
@@ -174,6 +174,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/sampler.cpp b/code/sampler.cpp
@@ -277,6 +277,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/shader_modules.cpp b/code/shader_modules.cpp
@@ -169,6 +169,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/staging_buffer.cpp b/code/staging_buffer.cpp
@@ -234,6 +234,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/swap_chain_creation.cpp b/code/swap_chain_creation.cpp
@@ -165,6 +165,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/swap_chain_recreation.cpp b/code/swap_chain_recreation.cpp
@@ -190,6 +190,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/texture_image.cpp b/code/texture_image.cpp
@@ -273,6 +273,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/texture_mapping.cpp b/code/texture_mapping.cpp
@@ -283,6 +283,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/validation_layers.cpp b/code/validation_layers.cpp
@@ -128,6 +128,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {
diff --git a/code/vertex_buffer.cpp b/code/vertex_buffer.cpp
@@ -234,6 +234,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/vertex_input.cpp b/code/vertex_input.cpp
@@ -229,6 +229,8 @@ class HelloTriangleApplication {
         vkDeviceWaitIdle(device);
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     static void onWindowResized(GLFWwindow* window, int width, int height) {
diff --git a/code/window_surface.cpp b/code/window_surface.cpp
@@ -148,6 +148,8 @@ class HelloTriangleApplication {
         }
 
         glfwDestroyWindow(window);
+
+        glfwTerminate();
     }
 
     void createInstance() {

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,8 @@ class HelloTriangleApplication {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`glfwDestroyWindow(window);`
	`99`	`+`
	`100`	`+ glfwTerminate();`
`99`	`101`	`}`
`100`	`102`	`};`
`101`	`103`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,8 @@ class HelloTriangleApplication {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`glfwDestroyWindow(window);`
	`184`	`+`
	`185`	`+ glfwTerminate();`
`184`	`186`	`}`
`185`	`187`
`186`	`188`	`void createInstance() {`
Original file line number	Diff line number	Diff line change
`@@ -295,6 +295,8 @@ class HelloTriangleApplication {`
`295`	`295`	`vkDeviceWaitIdle(device);`
`296`	`296`
`297`	`297`	`glfwDestroyWindow(window);`
	`298`	`+`
	`299`	`+ glfwTerminate();`
`298`	`300`	`}`
`299`	`301`
`300`	`302`	`static void onWindowResized(GLFWwindow* window, int width, int height) {`
Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,8 @@ class HelloTriangleApplication {`
`261`	`261`	`vkDeviceWaitIdle(device);`
`262`	`262`
`263`	`263`	`glfwDestroyWindow(window);`
	`264`	`+`
	`265`	`+ glfwTerminate();`
`264`	`266`	`}`
`265`	`267`
`266`	`268`	`static void onWindowResized(GLFWwindow* window, int width, int height) {`
Original file line number	Diff line number	Diff line change
`@@ -266,6 +266,8 @@ class HelloTriangleApplication {`
`266`	`266`	`vkDeviceWaitIdle(device);`
`267`	`267`
`268`	`268`	`glfwDestroyWindow(window);`
	`269`	`+`
	`270`	`+ glfwTerminate();`
`269`	`271`	`}`
`270`	`272`
`271`	`273`	`static void onWindowResized(GLFWwindow* window, int width, int height) {`
Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,8 @@ class HelloTriangleApplication {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`glfwDestroyWindow(window);`
	`176`	`+`
	`177`	`+ glfwTerminate();`
`176`	`178`	`}`
`177`	`179`
`178`	`180`	`void createInstance() {`
Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,8 @@ class HelloTriangleApplication {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`glfwDestroyWindow(window);`
	`179`	`+`
	`180`	`+ glfwTerminate();`
`179`	`181`	`}`
`180`	`182`
`181`	`183`	`void createInstance() {`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,8 @@ class HelloTriangleApplication {`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`glfwDestroyWindow(window);`
	`172`	`+`
	`173`	`+ glfwTerminate();`
`172`	`174`	`}`
`173`	`175`
`174`	`176`	`void createInstance() {`
Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,8 @@ class HelloTriangleApplication {`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`glfwDestroyWindow(window);`
	`178`	`+`
	`179`	`+ glfwTerminate();`
`178`	`180`	`}`
`179`	`181`
`180`	`182`	`void createInstance() {`