Merge pull request #155 from asuessenbach/07_image_views

marty-johnson59 · web-flow · commit 805e16a09e45 · 2025-09-08T09:23:23.000-07:00
Replace defensive clear with assert in createImageViews
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,6 @@ temp_ebook.md
 ebook/*.pdf
 ebook/*.epub
 
-convert.py
+convert.py
+
+attachments/build/
diff --git a/attachments/07_image_views.cpp b/attachments/07_image_views.cpp
@@ -267,7 +267,7 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
-        swapChainImageViews.clear();
+        assert(swapChainImageViews.empty());
 
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
diff --git a/attachments/08_graphics_pipeline.cpp b/attachments/08_graphics_pipeline.cpp
@@ -268,7 +268,7 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
-        swapChainImageViews.clear();
+        assert(swapChainImageViews.empty());
 
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
diff --git a/attachments/09_shader_modules.cpp b/attachments/09_shader_modules.cpp
@@ -269,7 +269,7 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
-        swapChainImageViews.clear();
+        assert(swapChainImageViews.empty());
 
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
diff --git a/attachments/10_fixed_functions.cpp b/attachments/10_fixed_functions.cpp
@@ -271,7 +271,7 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
-        swapChainImageViews.clear();
+        assert(swapChainImageViews.empty());
 
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
diff --git a/attachments/12_graphics_pipeline_complete.cpp b/attachments/12_graphics_pipeline_complete.cpp
@@ -272,7 +272,7 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
-        swapChainImageViews.clear();
+        assert(swapChainImageViews.empty());
 
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
diff --git a/attachments/14_command_buffers.cpp b/attachments/14_command_buffers.cpp
@@ -276,7 +276,7 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
-        swapChainImageViews.clear();
+        assert(swapChainImageViews.empty());
 
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
diff --git a/attachments/15_hello_triangle.cpp b/attachments/15_hello_triangle.cpp
@@ -285,7 +285,7 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
-        swapChainImageViews.clear();
+        assert(swapChainImageViews.empty());
 
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
diff --git a/attachments/16_frames_in_flight.cpp b/attachments/16_frames_in_flight.cpp
@@ -289,7 +289,7 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
-        swapChainImageViews.clear();
+        assert(swapChainImageViews.empty());
 
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
diff --git a/attachments/17_swap_chain_recreation.cpp b/attachments/17_swap_chain_recreation.cpp
@@ -316,7 +316,7 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
-        swapChainImageViews.clear();
+        assert(swapChainImageViews.empty());
 
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
diff --git a/attachments/18_vertex_input.cpp b/attachments/18_vertex_input.cpp
@@ -340,7 +340,7 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
-        swapChainImageViews.clear();
+        assert(swapChainImageViews.empty());
 
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
diff --git a/attachments/19_vertex_buffer.cpp b/attachments/19_vertex_buffer.cpp
@@ -344,6 +344,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
         for ( auto image : swapChainImages )
diff --git a/attachments/20_staging_buffer.cpp b/attachments/20_staging_buffer.cpp
@@ -344,6 +344,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
         for ( auto image : swapChainImages )
diff --git a/attachments/21_index_buffer.cpp b/attachments/21_index_buffer.cpp
@@ -352,6 +352,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
         for ( auto image : swapChainImages )
diff --git a/attachments/22_descriptor_layout.cpp b/attachments/22_descriptor_layout.cpp
@@ -369,6 +369,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
         for ( auto image : swapChainImages )
diff --git a/attachments/23_descriptor_sets.cpp b/attachments/23_descriptor_sets.cpp
@@ -374,6 +374,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
         for ( auto image : swapChainImages )
diff --git a/attachments/24_texture_image.cpp b/attachments/24_texture_image.cpp
@@ -381,6 +381,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
         for ( auto image : swapChainImages )
diff --git a/attachments/25_sampler.cpp b/attachments/25_sampler.cpp
@@ -386,6 +386,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
         for ( auto image : swapChainImages )
diff --git a/attachments/26_texture_mapping.cpp b/attachments/26_texture_mapping.cpp
@@ -388,6 +388,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
           .subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
         for ( auto image : swapChainImages )
diff --git a/attachments/27_depth_buffering.cpp b/attachments/27_depth_buffering.cpp
@@ -401,6 +401,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{
             .viewType = vk::ImageViewType::e2D,
             .format = swapChainSurfaceFormat.format,
diff --git a/attachments/28_model_loading.cpp b/attachments/28_model_loading.cpp
@@ -405,6 +405,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{
             .viewType = vk::ImageViewType::e2D,
             .format = swapChainSurfaceFormat.format,
diff --git a/attachments/29_mipmapping.cpp b/attachments/29_mipmapping.cpp
@@ -405,6 +405,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{
             .viewType = vk::ImageViewType::e2D,
             .format = swapChainSurfaceFormat.format,
diff --git a/attachments/30_multisampling.cpp b/attachments/30_multisampling.cpp
@@ -414,6 +414,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{
             .viewType = vk::ImageViewType::e2D,
             .format = swapChainSurfaceFormat.format,
diff --git a/attachments/31_compute_shader.cpp b/attachments/31_compute_shader.cpp
@@ -393,6 +393,8 @@ class ComputeShaderApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{
             .viewType = vk::ImageViewType::e2D,
             .format = swapChainSurfaceFormat.format,
diff --git a/attachments/32_ecosystem_utilities.cpp b/attachments/32_ecosystem_utilities.cpp
@@ -517,6 +517,8 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{
             .viewType = vk::ImageViewType::e2D,
             .format = swapChainSurfaceFormat.format,
diff --git a/attachments/33_vulkan_profiles.cpp b/attachments/33_vulkan_profiles.cpp
@@ -237,6 +237,7 @@ class HelloTriangleApplication {
             imageView = nullptr;
         }
 
+        swapChainImageViews.clear();
         swapChain = nullptr;
     }
 
@@ -493,6 +494,7 @@ class HelloTriangleApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
         swapChainImageViews.reserve(swapChainImages.size());
 
         for (const auto& image : swapChainImages) {
diff --git a/attachments/34_android.cpp b/attachments/34_android.cpp
@@ -612,6 +612,7 @@ class HelloTriangleApplication {
 
     // Create image views
     void createImageViews() {
+        assert(swapChainImageViews.empty());
         swapChainImageViews.reserve(swapChainImages.size());
 
         for (const auto& image : swapChainImages) {
@@ -1202,6 +1203,7 @@ class HelloTriangleApplication {
             imageView = nullptr;
         }
 
+        swapChainImageViews.clear();
         swapChain = nullptr;
     }
 
diff --git a/attachments/35_gltf_ktx.cpp b/attachments/35_gltf_ktx.cpp
@@ -587,6 +587,8 @@ class VulkanApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{
             .viewType = vk::ImageViewType::e2D,
             .format = swapChainSurfaceFormat.format,
diff --git a/attachments/36_multiple_objects.cpp b/attachments/36_multiple_objects.cpp
@@ -651,6 +651,8 @@ class VulkanApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{
             .viewType = vk::ImageViewType::e2D,
             .format = swapChainSurfaceFormat.format,
diff --git a/attachments/37_multithreading.cpp b/attachments/37_multithreading.cpp
@@ -608,6 +608,8 @@ class MultithreadedApplication {
     }
 
     void createImageViews() {
+        assert(swapChainImageViews.empty());
+
         vk::ImageViewCreateInfo imageViewCreateInfo{
             .viewType = vk::ImageViewType::e2D,
             .format = swapChainSurfaceFormat.format,

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ class HelloTriangleApplication {`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`void createImageViews() {`
`270`		`- swapChainImageViews.clear();`
	`270`	`+ assert(swapChainImageViews.empty());`
`271`	`271`
`272`	`272`	`vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,`
`273`	`273`	`.subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ class HelloTriangleApplication {`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`void createImageViews() {`
`271`		`- swapChainImageViews.clear();`
	`271`	`+ assert(swapChainImageViews.empty());`
`272`	`272`
`273`	`273`	`vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,`
`274`	`274`	`.subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ class HelloTriangleApplication {`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`void createImageViews() {`
`272`		`- swapChainImageViews.clear();`
	`272`	`+ assert(swapChainImageViews.empty());`
`273`	`273`
`274`	`274`	`vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,`
`275`	`275`	`.subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ class HelloTriangleApplication {`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`void createImageViews() {`
`274`		`- swapChainImageViews.clear();`
	`274`	`+ assert(swapChainImageViews.empty());`
`275`	`275`
`276`	`276`	`vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,`
`277`	`277`	`.subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ class HelloTriangleApplication {`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`void createImageViews() {`
`275`		`- swapChainImageViews.clear();`
	`275`	`+ assert(swapChainImageViews.empty());`
`276`	`276`
`277`	`277`	`vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,`
`278`	`278`	`.subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ class HelloTriangleApplication {`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`void createImageViews() {`
`279`		`- swapChainImageViews.clear();`
	`279`	`+ assert(swapChainImageViews.empty());`
`280`	`280`
`281`	`281`	`vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,`
`282`	`282`	`.subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ class HelloTriangleApplication {`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`void createImageViews() {`
`288`		`- swapChainImageViews.clear();`
	`288`	`+ assert(swapChainImageViews.empty());`
`289`	`289`
`290`	`290`	`vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,`
`291`	`291`	`.subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ class HelloTriangleApplication {`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`void createImageViews() {`
`292`		`- swapChainImageViews.clear();`
	`292`	`+ assert(swapChainImageViews.empty());`
`293`	`293`
`294`	`294`	`vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,`
`295`	`295`	`.subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ class HelloTriangleApplication {`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`void createImageViews() {`
`319`		`- swapChainImageViews.clear();`
	`319`	`+ assert(swapChainImageViews.empty());`
`320`	`320`
`321`	`321`	`vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,`
`322`	`322`	`.subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };`