Make vkQueueWaitIdle call conditional on enabling of validation layers

Overv · Overv · commit dca38fe27791 · 2018-04-08T20:29:06.000+02:00
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
@@ -363,7 +363,9 @@ void drawFrame() {
 
     vkQueuePresentKHR(presentQueue, &presentInfo);
 
-    vkQueueWaitIdle(presentQueue);
+    if (enableValidationLayers) {
+        vkQueueWaitIdle(presentQueue);
+    }
 }
 ```
 
diff --git a/code/15_hello_triangle.cpp b/code/15_hello_triangle.cpp
@@ -644,7 +644,9 @@ class HelloTriangleApplication {
 
         vkQueuePresentKHR(presentQueue, &presentInfo);
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/16_swap_chain_recreation.cpp b/code/16_swap_chain_recreation.cpp
@@ -686,7 +686,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/17_vertex_input.cpp b/code/17_vertex_input.cpp
@@ -731,7 +731,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/18_vertex_buffer.cpp b/code/18_vertex_buffer.cpp
@@ -787,7 +787,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/19_staging_buffer.cpp b/code/19_staging_buffer.cpp
@@ -835,7 +835,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/20_index_buffer.cpp b/code/20_index_buffer.cpp
@@ -868,7 +868,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/21_descriptor_layout.cpp b/code/21_descriptor_layout.cpp
@@ -930,7 +930,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/22_descriptor_set.cpp b/code/22_descriptor_set.cpp
@@ -984,7 +984,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/23_texture_image.cpp b/code/23_texture_image.cpp
@@ -1139,7 +1139,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/24_sampler.cpp b/code/24_sampler.cpp
@@ -1175,7 +1175,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/25_texture_mapping.cpp b/code/25_texture_mapping.cpp
@@ -1205,7 +1205,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/26_depth_buffering.cpp b/code/26_depth_buffering.cpp
@@ -1303,7 +1303,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/27_model_loading.cpp b/code/27_model_loading.cpp
@@ -1349,7 +1349,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {
diff --git a/code/28_mipmapping.cpp b/code/28_mipmapping.cpp
@@ -1431,7 +1431,9 @@ class HelloTriangleApplication {
             throw std::runtime_error("failed to present swap chain image!");
         }
 
-        vkQueueWaitIdle(presentQueue);
+        if (enableValidationLayers) {
+            vkQueueWaitIdle(presentQueue);
+        }
     }
 
     VkShaderModule createShaderModule(const std::vector<char>& code) {

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,9 @@ void drawFrame() {`
`363`	`363`
`364`	`364`	`vkQueuePresentKHR(presentQueue, &presentInfo);`
`365`	`365`
`366`		`- vkQueueWaitIdle(presentQueue);`
	`366`	`+ if (enableValidationLayers) {`
	`367`	`+ vkQueueWaitIdle(presentQueue);`
	`368`	`+ }`
`367`	`369`	`}`
`368`	`370`	```
`369`	`371`
Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,9 @@ class HelloTriangleApplication {`
`644`	`644`
`645`	`645`	`vkQueuePresentKHR(presentQueue, &presentInfo);`
`646`	`646`
`647`		`- vkQueueWaitIdle(presentQueue);`
	`647`	`+ if (enableValidationLayers) {`
	`648`	`+ vkQueueWaitIdle(presentQueue);`
	`649`	`+ }`
`648`	`650`	`}`
`649`	`651`
`650`	`652`	`VkShaderModule createShaderModule(const std::vector<char>& code) {`
Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,9 @@ class HelloTriangleApplication {`
`686`	`686`	`throw std::runtime_error("failed to present swap chain image!");`
`687`	`687`	`}`
`688`	`688`
`689`		`- vkQueueWaitIdle(presentQueue);`
	`689`	`+ if (enableValidationLayers) {`
	`690`	`+ vkQueueWaitIdle(presentQueue);`
	`691`	`+ }`
`690`	`692`	`}`
`691`	`693`
`692`	`694`	`VkShaderModule createShaderModule(const std::vector<char>& code) {`
Original file line number	Diff line number	Diff line change
`@@ -731,7 +731,9 @@ class HelloTriangleApplication {`
`731`	`731`	`throw std::runtime_error("failed to present swap chain image!");`
`732`	`732`	`}`
`733`	`733`
`734`		`- vkQueueWaitIdle(presentQueue);`
	`734`	`+ if (enableValidationLayers) {`
	`735`	`+ vkQueueWaitIdle(presentQueue);`
	`736`	`+ }`
`735`	`737`	`}`
`736`	`738`
`737`	`739`	`VkShaderModule createShaderModule(const std::vector<char>& code) {`
Original file line number	Diff line number	Diff line change
`@@ -787,7 +787,9 @@ class HelloTriangleApplication {`
`787`	`787`	`throw std::runtime_error("failed to present swap chain image!");`
`788`	`788`	`}`
`789`	`789`
`790`		`- vkQueueWaitIdle(presentQueue);`
	`790`	`+ if (enableValidationLayers) {`
	`791`	`+ vkQueueWaitIdle(presentQueue);`
	`792`	`+ }`
`791`	`793`	`}`
`792`	`794`
`793`	`795`	`VkShaderModule createShaderModule(const std::vector<char>& code) {`
Original file line number	Diff line number	Diff line change
`@@ -835,7 +835,9 @@ class HelloTriangleApplication {`
`835`	`835`	`throw std::runtime_error("failed to present swap chain image!");`
`836`	`836`	`}`
`837`	`837`
`838`		`- vkQueueWaitIdle(presentQueue);`
	`838`	`+ if (enableValidationLayers) {`
	`839`	`+ vkQueueWaitIdle(presentQueue);`
	`840`	`+ }`
`839`	`841`	`}`
`840`	`842`
`841`	`843`	`VkShaderModule createShaderModule(const std::vector<char>& code) {`
Original file line number	Diff line number	Diff line change
`@@ -868,7 +868,9 @@ class HelloTriangleApplication {`
`868`	`868`	`throw std::runtime_error("failed to present swap chain image!");`
`869`	`869`	`}`
`870`	`870`
`871`		`- vkQueueWaitIdle(presentQueue);`
	`871`	`+ if (enableValidationLayers) {`
	`872`	`+ vkQueueWaitIdle(presentQueue);`
	`873`	`+ }`
`872`	`874`	`}`
`873`	`875`
`874`	`876`	`VkShaderModule createShaderModule(const std::vector<char>& code) {`
Original file line number	Diff line number	Diff line change
`@@ -930,7 +930,9 @@ class HelloTriangleApplication {`
`930`	`930`	`throw std::runtime_error("failed to present swap chain image!");`
`931`	`931`	`}`
`932`	`932`
`933`		`- vkQueueWaitIdle(presentQueue);`
	`933`	`+ if (enableValidationLayers) {`
	`934`	`+ vkQueueWaitIdle(presentQueue);`
	`935`	`+ }`
`934`	`936`	`}`
`935`	`937`
`936`	`938`	`VkShaderModule createShaderModule(const std::vector<char>& code) {`
Original file line number	Diff line number	Diff line change
`@@ -984,7 +984,9 @@ class HelloTriangleApplication {`
`984`	`984`	`throw std::runtime_error("failed to present swap chain image!");`
`985`	`985`	`}`
`986`	`986`
`987`		`- vkQueueWaitIdle(presentQueue);`
	`987`	`+ if (enableValidationLayers) {`
	`988`	`+ vkQueueWaitIdle(presentQueue);`
	`989`	`+ }`
`988`	`990`	`}`
`989`	`991`
`990`	`992`	`VkShaderModule createShaderModule(const std::vector<char>& code) {`
Original file line number	Diff line number	Diff line change
`@@ -1139,7 +1139,9 @@ class HelloTriangleApplication {`
`1139`	`1139`	`throw std::runtime_error("failed to present swap chain image!");`
`1140`	`1140`	`}`
`1141`	`1141`
`1142`		`- vkQueueWaitIdle(presentQueue);`
	`1142`	`+ if (enableValidationLayers) {`
	`1143`	`+ vkQueueWaitIdle(presentQueue);`
	`1144`	`+ }`
`1143`	`1145`	`}`
`1144`	`1146`
`1145`	`1147`	`VkShaderModule createShaderModule(const std::vector<char>& code) {`