Merge pull request #84 from gpx1000/wrong-color-space-74

gpx1000 · web-flow · commit 109a00053188 · 2025-07-06T08:58:01.000-07:00
Refactor `chooseSwapSurfaceFormat` issue #74
diff --git a/attachments/00_base_code.cpp b/attachments/00_base_code.cpp
@@ -48,9 +48,8 @@ class HelloTriangleApplication {
 };
 
 int main() {
-    HelloTriangleApplication app{};
-
     try {
+        HelloTriangleApplication app;
         app.run();
     } catch (const std::exception& e) {
         std::cerr << e.what() << std::endl;
diff --git a/attachments/06_swap_chain_creation.cpp b/attachments/06_swap_chain_creation.cpp
@@ -295,7 +295,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/07_image_views.cpp b/attachments/07_image_views.cpp
@@ -308,7 +308,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+            [](const auto& format) {
+                return format.format == vk::Format::eB8G8R8A8Srgb &&
+                       format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+            });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/08_graphics_pipeline.cpp b/attachments/08_graphics_pipeline.cpp
@@ -313,7 +313,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+            [](const auto& format) {
+                return format.format == vk::Format::eB8G8R8A8Srgb &&
+                       format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+            });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/09_shader_modules.cpp b/attachments/09_shader_modules.cpp
@@ -325,7 +325,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/10_fixed_functions.cpp b/attachments/10_fixed_functions.cpp
@@ -354,7 +354,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/12_graphics_pipeline_complete.cpp b/attachments/12_graphics_pipeline_complete.cpp
@@ -365,7 +365,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/14_command_buffers.cpp b/attachments/14_command_buffers.cpp
@@ -462,7 +462,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/15_hello_triangle.cpp b/attachments/15_hello_triangle.cpp
@@ -505,7 +505,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/16_frames_in_flight.cpp b/attachments/16_frames_in_flight.cpp
@@ -521,7 +521,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/17_swap_chain_recreation.cpp b/attachments/17_swap_chain_recreation.cpp
@@ -556,7 +556,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/18_vertex_input.cpp b/attachments/18_vertex_input.cpp
@@ -583,7 +583,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/19_vertex_buffer.cpp b/attachments/19_vertex_buffer.cpp
@@ -613,7 +613,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/20_staging_buffer.cpp b/attachments/20_staging_buffer.cpp
@@ -632,7 +632,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/21_index_buffer.cpp b/attachments/21_index_buffer.cpp
@@ -658,7 +658,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/22_descriptor_layout.cpp b/attachments/22_descriptor_layout.cpp
@@ -712,7 +712,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/23_descriptor_sets.cpp b/attachments/23_descriptor_sets.cpp
@@ -737,7 +737,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/24_texture_image.cpp b/attachments/24_texture_image.cpp
@@ -841,7 +841,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/25_sampler.cpp b/attachments/25_sampler.cpp
@@ -875,7 +875,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/26_texture_mapping.cpp b/attachments/26_texture_mapping.cpp
@@ -952,7 +952,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return (availableFormats[0].format == vk::Format::eUndefined) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/27_depth_buffering.cpp b/attachments/27_depth_buffering.cpp
@@ -1080,7 +1080,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return (availableFormats[0].format == vk::Format::eUndefined) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/28_model_loading.cpp b/attachments/28_model_loading.cpp
@@ -1125,7 +1125,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return (availableFormats[0].format == vk::Format::eUndefined) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/29_mipmapping.cpp b/attachments/29_mipmapping.cpp
@@ -1191,7 +1191,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return (availableFormats[0].format == vk::Format::eUndefined) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
diff --git a/attachments/30_multisampling.cpp b/attachments/30_multisampling.cpp
@@ -1263,7 +1263,12 @@ class HelloTriangleApplication {
     }
 
     static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
-        return (availableFormats[0].format == vk::Format::eUndefined) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;
+        const auto formatIt = std::ranges::find_if(availableFormats,
+        [](const auto& format) {
+            return format.format == vk::Format::eB8G8R8A8Srgb &&
+                   format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
+        });
+        return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
     }
 
     static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,12 @@ class HelloTriangleApplication {`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {`
`298`		`- return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;`
	`298`	`+ const auto formatIt = std::ranges::find_if(availableFormats,`
	`299`	`+ [](const auto& format) {`
	`300`	`+ return format.format == vk::Format::eB8G8R8A8Srgb &&`
	`301`	`+ format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;`
	`302`	`+ });`
	`303`	`+ return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;`
`299`	`304`	`}`
`300`	`305`
`301`	`306`	`static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,12 @@ class HelloTriangleApplication {`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {`
`311`		`- return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;`
	`311`	`+ const auto formatIt = std::ranges::find_if(availableFormats,`
	`312`	`+ [](const auto& format) {`
	`313`	`+ return format.format == vk::Format::eB8G8R8A8Srgb &&`
	`314`	`+ format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;`
	`315`	`+ });`
	`316`	`+ return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;`
`312`	`317`	`}`
`313`	`318`
`314`	`319`	`static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,12 @@ class HelloTriangleApplication {`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {`
`316`		`- return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;`
	`316`	`+ const auto formatIt = std::ranges::find_if(availableFormats,`
	`317`	`+ [](const auto& format) {`
	`318`	`+ return format.format == vk::Format::eB8G8R8A8Srgb &&`
	`319`	`+ format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;`
	`320`	`+ });`
	`321`	`+ return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;`
`317`	`322`	`}`
`318`	`323`
`319`	`324`	`static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,12 @@ class HelloTriangleApplication {`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {`
`328`		`- return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;`
	`328`	`+ const auto formatIt = std::ranges::find_if(availableFormats,`
	`329`	`+ [](const auto& format) {`
	`330`	`+ return format.format == vk::Format::eB8G8R8A8Srgb &&`
	`331`	`+ format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;`
	`332`	`+ });`
	`333`	`+ return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;`
`329`	`334`	`}`
`330`	`335`
`331`	`336`	`static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,12 @@ class HelloTriangleApplication {`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {`
`357`		`- return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;`
	`357`	`+ const auto formatIt = std::ranges::find_if(availableFormats,`
	`358`	`+ [](const auto& format) {`
	`359`	`+ return format.format == vk::Format::eB8G8R8A8Srgb &&`
	`360`	`+ format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;`
	`361`	`+ });`
	`362`	`+ return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;`
`358`	`363`	`}`
`359`	`364`
`360`	`365`	`static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {`
Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,12 @@ class HelloTriangleApplication {`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {`
`368`		`- return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;`
	`368`	`+ const auto formatIt = std::ranges::find_if(availableFormats,`
	`369`	`+ [](const auto& format) {`
	`370`	`+ return format.format == vk::Format::eB8G8R8A8Srgb &&`
	`371`	`+ format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;`
	`372`	`+ });`
	`373`	`+ return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;`
`369`	`374`	`}`
`370`	`375`
`371`	`376`	`static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {`
Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,12 @@ class HelloTriangleApplication {`
`462`	`462`	`}`
`463`	`463`
`464`	`464`	`static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {`
`465`		`- return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;`
	`465`	`+ const auto formatIt = std::ranges::find_if(availableFormats,`
	`466`	`+ [](const auto& format) {`
	`467`	`+ return format.format == vk::Format::eB8G8R8A8Srgb &&`
	`468`	`+ format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;`
	`469`	`+ });`
	`470`	`+ return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;`
`466`	`471`	`}`
`467`	`472`
`468`	`473`	`static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {`
Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,12 @@ class HelloTriangleApplication {`
`505`	`505`	`}`
`506`	`506`
`507`	`507`	`static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {`
`508`		`- return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;`
	`508`	`+ const auto formatIt = std::ranges::find_if(availableFormats,`
	`509`	`+ [](const auto& format) {`
	`510`	`+ return format.format == vk::Format::eB8G8R8A8Srgb &&`
	`511`	`+ format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;`
	`512`	`+ });`
	`513`	`+ return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;`
`509`	`514`	`}`
`510`	`515`
`511`	`516`	`static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {`
Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,12 @@ class HelloTriangleApplication {`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {`
`524`		`- return ( availableFormats[0].format == vk::Format::eUndefined ) ? vk::Format::eB8G8R8A8Unorm : availableFormats[0].format;`
	`524`	`+ const auto formatIt = std::ranges::find_if(availableFormats,`
	`525`	`+ [](const auto& format) {`
	`526`	`+ return format.format == vk::Format::eB8G8R8A8Srgb &&`
	`527`	`+ format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;`
	`528`	`+ });`
	`529`	`+ return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;`
`525`	`530`	`}`
`526`	`531`
`527`	`532`	`static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {`