Fix DestroyDebugReportCallbackEXT also being called when validation layers are disabled

Overv · Overv · commit 869635af0916 · 2018-03-26T20:15:39.000+02:00
diff --git a/03_Drawing_a_triangle/00_Setup/02_Validation_layers.md b/03_Drawing_a_triangle/00_Setup/02_Validation_layers.md
@@ -351,7 +351,10 @@ outside the class. We can then call it in the `cleanup` function:
 
 ```c++
 void cleanup() {
-    DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+    if (enableValidationLayers) {
+        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+    }
+
     vkDestroyInstance(instance, nullptr);
 
     glfwDestroyWindow(window);
diff --git a/code/02_validation_layers.cpp b/code/02_validation_layers.cpp
@@ -72,7 +72,10 @@ class HelloTriangleApplication {
     }
 
     void cleanup() {
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroyInstance(instance, nullptr);
 
         glfwDestroyWindow(window);
diff --git a/code/03_physical_device_selection.cpp b/code/03_physical_device_selection.cpp
@@ -83,7 +83,10 @@ class HelloTriangleApplication {
     }
 
     void cleanup() {
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroyInstance(instance, nullptr);
 
         glfwDestroyWindow(window);
diff --git a/code/04_logical_device.cpp b/code/04_logical_device.cpp
@@ -88,7 +88,11 @@ class HelloTriangleApplication {
 
     void cleanup() {
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroyInstance(instance, nullptr);
 
         glfwDestroyWindow(window);
diff --git a/code/05_window_surface.cpp b/code/05_window_surface.cpp
@@ -93,7 +93,11 @@ class HelloTriangleApplication {
 
     void cleanup() {
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/06_swap_chain_creation.cpp b/code/06_swap_chain_creation.cpp
@@ -111,7 +111,11 @@ class HelloTriangleApplication {
     void cleanup() {
         vkDestroySwapchainKHR(device, swapChain, nullptr);
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/07_image_views.cpp b/code/07_image_views.cpp
@@ -117,7 +117,11 @@ class HelloTriangleApplication {
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/08_graphics_pipeline.cpp b/code/08_graphics_pipeline.cpp
@@ -118,7 +118,11 @@ class HelloTriangleApplication {
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/09_shader_modules.cpp b/code/09_shader_modules.cpp
@@ -119,7 +119,11 @@ class HelloTriangleApplication {
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/10_fixed_functions.cpp b/code/10_fixed_functions.cpp
@@ -123,7 +123,11 @@ class HelloTriangleApplication {
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/11_render_passes.cpp b/code/11_render_passes.cpp
@@ -126,7 +126,11 @@ class HelloTriangleApplication {
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/12_graphics_pipeline_complete.cpp b/code/12_graphics_pipeline_complete.cpp
@@ -128,7 +128,11 @@ class HelloTriangleApplication {
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/13_framebuffers.cpp b/code/13_framebuffers.cpp
@@ -134,7 +134,11 @@ class HelloTriangleApplication {
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/14_command_buffers.cpp b/code/14_command_buffers.cpp
@@ -141,7 +141,11 @@ class HelloTriangleApplication {
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/15_hello_triangle.cpp b/code/15_hello_triangle.cpp
@@ -151,7 +151,11 @@ class HelloTriangleApplication {
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/16_swap_chain_recreation.cpp b/code/16_swap_chain_recreation.cpp
@@ -160,7 +160,11 @@ class HelloTriangleApplication {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/17_vertex_input.cpp b/code/17_vertex_input.cpp
@@ -199,7 +199,11 @@ class HelloTriangleApplication {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/18_vertex_buffer.cpp b/code/18_vertex_buffer.cpp
@@ -207,7 +207,11 @@ class HelloTriangleApplication {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/19_staging_buffer.cpp b/code/19_staging_buffer.cpp
@@ -207,7 +207,11 @@ class HelloTriangleApplication {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/20_index_buffer.cpp b/code/20_index_buffer.cpp
@@ -218,7 +218,11 @@ class HelloTriangleApplication {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/21_descriptor_layout.cpp b/code/21_descriptor_layout.cpp
@@ -239,7 +239,11 @@ class HelloTriangleApplication {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/22_descriptor_set.cpp b/code/22_descriptor_set.cpp
@@ -246,7 +246,11 @@ class HelloTriangleApplication {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/23_texture_image.cpp b/code/23_texture_image.cpp
@@ -256,7 +256,11 @@ class HelloTriangleApplication {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/24_sampler.cpp b/code/24_sampler.cpp
@@ -263,7 +263,11 @@ class HelloTriangleApplication {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/25_texture_mapping.cpp b/code/25_texture_mapping.cpp
@@ -269,7 +269,11 @@ class HelloTriangleApplication {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/26_depth_buffering.cpp b/code/26_depth_buffering.cpp
@@ -285,7 +285,11 @@ class HelloTriangleApplication {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
diff --git a/code/27_model_loading.cpp b/code/27_model_loading.cpp
@@ -292,7 +292,11 @@ class HelloTriangleApplication {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
         vkDestroyDevice(device, nullptr);
-        DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+
+        if (enableValidationLayers) {
+            DestroyDebugReportCallbackEXT(instance, callback, nullptr);
+        }
+
         vkDestroySurfaceKHR(instance, surface, nullptr);
         vkDestroyInstance(instance, nullptr);
 
