Use range-based for loop for deleting framebuffers

Overv · Overv · commit e5846255c4c2 · 2017-12-03T01:26:27.000+01:00
diff --git a/03_Drawing_a_triangle/03_Drawing/00_Framebuffers.md b/03_Drawing_a_triangle/03_Drawing/00_Framebuffers.md
@@ -90,8 +90,8 @@ they are based on, but only after we've finished rendering:
 
 ```c++
 void cleanup() {
-    for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-        vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+    for (auto framebuffer : swapChainFramebuffers) {
+        vkDestroyFramebuffer(device, framebuffer, nullptr);
     }
 
     ...
diff --git a/code/command_buffers.cpp b/code/command_buffers.cpp
@@ -126,8 +126,8 @@ class HelloTriangleApplication {
     void cleanup() {
         vkDestroyCommandPool(device, commandPool, nullptr);
 
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkDestroyPipeline(device, graphicsPipeline, nullptr);
diff --git a/code/depth_buffering.cpp b/code/depth_buffering.cpp
@@ -240,8 +240,8 @@ class HelloTriangleApplication {
         vkDestroyImage(device, depthImage, nullptr);
         vkFreeMemory(device, depthImageMemory, nullptr);
 
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
diff --git a/code/descriptor_layout.cpp b/code/descriptor_layout.cpp
@@ -202,8 +202,8 @@ class HelloTriangleApplication {
     }
 
     void cleanupSwapChain() {
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
diff --git a/code/descriptor_set.cpp b/code/descriptor_set.cpp
@@ -207,8 +207,8 @@ class HelloTriangleApplication {
     }
 
     void cleanupSwapChain() {
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
diff --git a/code/framebuffers.cpp b/code/framebuffers.cpp
@@ -119,8 +119,8 @@ class HelloTriangleApplication {
     }
 
     void cleanup() {
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkDestroyPipeline(device, graphicsPipeline, nullptr);
diff --git a/code/hello_triangle.cpp b/code/hello_triangle.cpp
@@ -136,8 +136,8 @@ class HelloTriangleApplication {
 
         vkDestroyCommandPool(device, commandPool, nullptr);
 
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkDestroyPipeline(device, graphicsPipeline, nullptr);
diff --git a/code/index_buffer.cpp b/code/index_buffer.cpp
@@ -185,8 +185,8 @@ class HelloTriangleApplication {
     }
 
     void cleanupSwapChain() {
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
diff --git a/code/model_loading.cpp b/code/model_loading.cpp
@@ -247,8 +247,8 @@ class HelloTriangleApplication {
         vkDestroyImage(device, depthImage, nullptr);
         vkFreeMemory(device, depthImageMemory, nullptr);
 
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
diff --git a/code/sampler.cpp b/code/sampler.cpp
@@ -218,8 +218,8 @@ class HelloTriangleApplication {
     }
 
     void cleanupSwapChain() {
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
diff --git a/code/staging_buffer.cpp b/code/staging_buffer.cpp
@@ -177,8 +177,8 @@ class HelloTriangleApplication {
     }
 
     void cleanupSwapChain() {
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
diff --git a/code/swap_chain_recreation.cpp b/code/swap_chain_recreation.cpp
@@ -133,8 +133,8 @@ class HelloTriangleApplication {
     }
 
     void cleanupSwapChain() {
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
diff --git a/code/texture_image.cpp b/code/texture_image.cpp
@@ -214,8 +214,8 @@ class HelloTriangleApplication {
     }
 
     void cleanupSwapChain() {
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
diff --git a/code/texture_mapping.cpp b/code/texture_mapping.cpp
@@ -224,8 +224,8 @@ class HelloTriangleApplication {
     }
 
     void cleanupSwapChain() {
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
diff --git a/code/vertex_buffer.cpp b/code/vertex_buffer.cpp
@@ -177,8 +177,8 @@ class HelloTriangleApplication {
     }
 
     void cleanupSwapChain() {
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
diff --git a/code/vertex_input.cpp b/code/vertex_input.cpp
@@ -172,8 +172,8 @@ class HelloTriangleApplication {
     }
 
     void cleanupSwapChain() {
-        for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {
-            vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);
+        for (auto framebuffer : swapChainFramebuffers) {
+            vkDestroyFramebuffer(device, framebuffer, nullptr);
         }
 
         vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,8 @@ they are based on, but only after we've finished rendering:`
`90`	`90`
`91`	`91`	```c++
`92`	`92`	`void cleanup() {`
`93`		`- for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {`
`94`		`- vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);`
	`93`	`+ for (auto framebuffer : swapChainFramebuffers) {`
	`94`	`+ vkDestroyFramebuffer(device, framebuffer, nullptr);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`...`
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,8 @@ class HelloTriangleApplication {`
`126`	`126`	`void cleanup() {`
`127`	`127`	`vkDestroyCommandPool(device, commandPool, nullptr);`
`128`	`128`
`129`		`- for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {`
`130`		`- vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);`
	`129`	`+ for (auto framebuffer : swapChainFramebuffers) {`
	`130`	`+ vkDestroyFramebuffer(device, framebuffer, nullptr);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`vkDestroyPipeline(device, graphicsPipeline, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,8 @@ class HelloTriangleApplication {`
`240`	`240`	`vkDestroyImage(device, depthImage, nullptr);`
`241`	`241`	`vkFreeMemory(device, depthImageMemory, nullptr);`
`242`	`242`
`243`		`- for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {`
`244`		`- vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);`
	`243`	`+ for (auto framebuffer : swapChainFramebuffers) {`
	`244`	`+ vkDestroyFramebuffer(device, framebuffer, nullptr);`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());`
Original file line number	Diff line number	Diff line change
`@@ -202,8 +202,8 @@ class HelloTriangleApplication {`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`void cleanupSwapChain() {`
`205`		`- for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {`
`206`		`- vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);`
	`205`	`+ for (auto framebuffer : swapChainFramebuffers) {`
	`206`	`+ vkDestroyFramebuffer(device, framebuffer, nullptr);`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());`
Original file line number	Diff line number	Diff line change
`@@ -207,8 +207,8 @@ class HelloTriangleApplication {`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`void cleanupSwapChain() {`
`210`		`- for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {`
`211`		`- vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);`
	`210`	`+ for (auto framebuffer : swapChainFramebuffers) {`
	`211`	`+ vkDestroyFramebuffer(device, framebuffer, nullptr);`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());`
Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,8 @@ class HelloTriangleApplication {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`void cleanup() {`
`122`		`- for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {`
`123`		`- vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);`
	`122`	`+ for (auto framebuffer : swapChainFramebuffers) {`
	`123`	`+ vkDestroyFramebuffer(device, framebuffer, nullptr);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`vkDestroyPipeline(device, graphicsPipeline, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,8 @@ class HelloTriangleApplication {`
`136`	`136`
`137`	`137`	`vkDestroyCommandPool(device, commandPool, nullptr);`
`138`	`138`
`139`		`- for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {`
`140`		`- vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);`
	`139`	`+ for (auto framebuffer : swapChainFramebuffers) {`
	`140`	`+ vkDestroyFramebuffer(device, framebuffer, nullptr);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`vkDestroyPipeline(device, graphicsPipeline, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,8 @@ class HelloTriangleApplication {`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`void cleanupSwapChain() {`
`188`		`- for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {`
`189`		`- vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);`
	`188`	`+ for (auto framebuffer : swapChainFramebuffers) {`
	`189`	`+ vkDestroyFramebuffer(device, framebuffer, nullptr);`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());`
Original file line number	Diff line number	Diff line change
`@@ -247,8 +247,8 @@ class HelloTriangleApplication {`
`247`	`247`	`vkDestroyImage(device, depthImage, nullptr);`
`248`	`248`	`vkFreeMemory(device, depthImageMemory, nullptr);`
`249`	`249`
`250`		`- for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {`
`251`		`- vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);`
	`250`	`+ for (auto framebuffer : swapChainFramebuffers) {`
	`251`	`+ vkDestroyFramebuffer(device, framebuffer, nullptr);`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());`
Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,8 @@ class HelloTriangleApplication {`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`void cleanupSwapChain() {`
`221`		`- for (size_t i = 0; i < swapChainFramebuffers.size(); i++) {`
`222`		`- vkDestroyFramebuffer(device, swapChainFramebuffers[i], nullptr);`
	`221`	`+ for (auto framebuffer : swapChainFramebuffers) {`
	`222`	`+ vkDestroyFramebuffer(device, framebuffer, nullptr);`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());`