Use range-based for loop for deleting swap chain image views

Overv · Overv · commit b7b3f7929b31 · 2017-12-03T01:21:06.000+01:00
diff --git a/03_Drawing_a_triangle/01_Presentation/02_Image_views.md b/03_Drawing_a_triangle/01_Presentation/02_Image_views.md
@@ -111,8 +111,8 @@ a similar loop to destroy them again at the end of the program:
 
 ```c++
 void cleanup() {
-    for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-        vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+    for (auto imageView : swapChainImageViews) {
+        vkDestroyImageView(device, imageView, nullptr);
     }
 
     ...
diff --git a/code/command_buffers.cpp b/code/command_buffers.cpp
@@ -134,8 +134,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/depth_buffering.cpp b/code/depth_buffering.cpp
@@ -250,8 +250,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/descriptor_layout.cpp b/code/descriptor_layout.cpp
@@ -212,8 +212,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/descriptor_set.cpp b/code/descriptor_set.cpp
@@ -217,8 +217,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/fixed_functions.cpp b/code/fixed_functions.cpp
@@ -116,8 +116,8 @@ class HelloTriangleApplication {
     void cleanup() {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/framebuffers.cpp b/code/framebuffers.cpp
@@ -127,8 +127,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/graphics_pipeline.cpp b/code/graphics_pipeline.cpp
@@ -111,8 +111,8 @@ class HelloTriangleApplication {
     }
 
     void cleanup() {
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/graphics_pipeline_complete.cpp b/code/graphics_pipeline_complete.cpp
@@ -121,8 +121,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/hello_triangle.cpp b/code/hello_triangle.cpp
@@ -144,8 +144,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/image_views.cpp b/code/image_views.cpp
@@ -110,8 +110,8 @@ class HelloTriangleApplication {
     }
 
     void cleanup() {
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/index_buffer.cpp b/code/index_buffer.cpp
@@ -195,8 +195,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/model_loading.cpp b/code/model_loading.cpp
@@ -257,8 +257,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/render_passes.cpp b/code/render_passes.cpp
@@ -119,8 +119,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/sampler.cpp b/code/sampler.cpp
@@ -228,8 +228,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/shader_modules.cpp b/code/shader_modules.cpp
@@ -112,8 +112,8 @@ class HelloTriangleApplication {
     }
 
     void cleanup() {
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/staging_buffer.cpp b/code/staging_buffer.cpp
@@ -187,8 +187,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/swap_chain_recreation.cpp b/code/swap_chain_recreation.cpp
@@ -143,8 +143,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/texture_image.cpp b/code/texture_image.cpp
@@ -224,8 +224,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/texture_mapping.cpp b/code/texture_mapping.cpp
@@ -234,8 +234,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/vertex_buffer.cpp b/code/vertex_buffer.cpp
@@ -187,8 +187,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);
diff --git a/code/vertex_input.cpp b/code/vertex_input.cpp
@@ -182,8 +182,8 @@ class HelloTriangleApplication {
         vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
         vkDestroyRenderPass(device, renderPass, nullptr);
 
-        for (size_t i = 0; i < swapChainImageViews.size(); i++) {
-            vkDestroyImageView(device, swapChainImageViews[i], nullptr);
+        for (auto imageView : swapChainImageViews) {
+            vkDestroyImageView(device, imageView, nullptr);
         }
 
         vkDestroySwapchainKHR(device, swapChain, nullptr);

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,8 @@ a similar loop to destroy them again at the end of the program:`
`111`	`111`
`112`	`112`	```c++
`113`	`113`	`void cleanup() {`
`114`		`- for (size_t i = 0; i < swapChainImageViews.size(); i++) {`
`115`		`- vkDestroyImageView(device, swapChainImageViews[i], nullptr);`
	`114`	`+ for (auto imageView : swapChainImageViews) {`
	`115`	`+ vkDestroyImageView(device, imageView, nullptr);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`...`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,8 @@ class HelloTriangleApplication {`
`134`	`134`	`vkDestroyPipelineLayout(device, pipelineLayout, nullptr);`
`135`	`135`	`vkDestroyRenderPass(device, renderPass, nullptr);`
`136`	`136`
`137`		`- for (size_t i = 0; i < swapChainImageViews.size(); i++) {`
`138`		`- vkDestroyImageView(device, swapChainImageViews[i], nullptr);`
	`137`	`+ for (auto imageView : swapChainImageViews) {`
	`138`	`+ vkDestroyImageView(device, imageView, nullptr);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`vkDestroySwapchainKHR(device, swapChain, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,8 @@ class HelloTriangleApplication {`
`250`	`250`	`vkDestroyPipelineLayout(device, pipelineLayout, nullptr);`
`251`	`251`	`vkDestroyRenderPass(device, renderPass, nullptr);`
`252`	`252`
`253`		`- for (size_t i = 0; i < swapChainImageViews.size(); i++) {`
`254`		`- vkDestroyImageView(device, swapChainImageViews[i], nullptr);`
	`253`	`+ for (auto imageView : swapChainImageViews) {`
	`254`	`+ vkDestroyImageView(device, imageView, nullptr);`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`vkDestroySwapchainKHR(device, swapChain, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -212,8 +212,8 @@ class HelloTriangleApplication {`
`212`	`212`	`vkDestroyPipelineLayout(device, pipelineLayout, nullptr);`
`213`	`213`	`vkDestroyRenderPass(device, renderPass, nullptr);`
`214`	`214`
`215`		`- for (size_t i = 0; i < swapChainImageViews.size(); i++) {`
`216`		`- vkDestroyImageView(device, swapChainImageViews[i], nullptr);`
	`215`	`+ for (auto imageView : swapChainImageViews) {`
	`216`	`+ vkDestroyImageView(device, imageView, nullptr);`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`vkDestroySwapchainKHR(device, swapChain, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -217,8 +217,8 @@ class HelloTriangleApplication {`
`217`	`217`	`vkDestroyPipelineLayout(device, pipelineLayout, nullptr);`
`218`	`218`	`vkDestroyRenderPass(device, renderPass, nullptr);`
`219`	`219`
`220`		`- for (size_t i = 0; i < swapChainImageViews.size(); i++) {`
`221`		`- vkDestroyImageView(device, swapChainImageViews[i], nullptr);`
	`220`	`+ for (auto imageView : swapChainImageViews) {`
	`221`	`+ vkDestroyImageView(device, imageView, nullptr);`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`vkDestroySwapchainKHR(device, swapChain, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,8 @@ class HelloTriangleApplication {`
`116`	`116`	`void cleanup() {`
`117`	`117`	`vkDestroyPipelineLayout(device, pipelineLayout, nullptr);`
`118`	`118`
`119`		`- for (size_t i = 0; i < swapChainImageViews.size(); i++) {`
`120`		`- vkDestroyImageView(device, swapChainImageViews[i], nullptr);`
	`119`	`+ for (auto imageView : swapChainImageViews) {`
	`120`	`+ vkDestroyImageView(device, imageView, nullptr);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`vkDestroySwapchainKHR(device, swapChain, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,8 @@ class HelloTriangleApplication {`
`127`	`127`	`vkDestroyPipelineLayout(device, pipelineLayout, nullptr);`
`128`	`128`	`vkDestroyRenderPass(device, renderPass, nullptr);`
`129`	`129`
`130`		`- for (size_t i = 0; i < swapChainImageViews.size(); i++) {`
`131`		`- vkDestroyImageView(device, swapChainImageViews[i], nullptr);`
	`130`	`+ for (auto imageView : swapChainImageViews) {`
	`131`	`+ vkDestroyImageView(device, imageView, nullptr);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`vkDestroySwapchainKHR(device, swapChain, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,8 @@ class HelloTriangleApplication {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`void cleanup() {`
`114`		`- for (size_t i = 0; i < swapChainImageViews.size(); i++) {`
`115`		`- vkDestroyImageView(device, swapChainImageViews[i], nullptr);`
	`114`	`+ for (auto imageView : swapChainImageViews) {`
	`115`	`+ vkDestroyImageView(device, imageView, nullptr);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`vkDestroySwapchainKHR(device, swapChain, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,8 @@ class HelloTriangleApplication {`
`121`	`121`	`vkDestroyPipelineLayout(device, pipelineLayout, nullptr);`
`122`	`122`	`vkDestroyRenderPass(device, renderPass, nullptr);`
`123`	`123`
`124`		`- for (size_t i = 0; i < swapChainImageViews.size(); i++) {`
`125`		`- vkDestroyImageView(device, swapChainImageViews[i], nullptr);`
	`124`	`+ for (auto imageView : swapChainImageViews) {`
	`125`	`+ vkDestroyImageView(device, imageView, nullptr);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`vkDestroySwapchainKHR(device, swapChain, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,8 @@ class HelloTriangleApplication {`
`144`	`144`	`vkDestroyPipelineLayout(device, pipelineLayout, nullptr);`
`145`	`145`	`vkDestroyRenderPass(device, renderPass, nullptr);`
`146`	`146`
`147`		`- for (size_t i = 0; i < swapChainImageViews.size(); i++) {`
`148`		`- vkDestroyImageView(device, swapChainImageViews[i], nullptr);`
	`147`	`+ for (auto imageView : swapChainImageViews) {`
	`148`	`+ vkDestroyImageView(device, imageView, nullptr);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`vkDestroySwapchainKHR(device, swapChain, nullptr);`