Skip to content

Refactor chooseSwapSurfaceFormat issue #74 #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpx1000 merged 1 commit into from
Jul 6, 2025
Merged

Refactor chooseSwapSurfaceFormat issue #74 #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions attachments/00_base_code.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 6 additions & 1 deletion attachments/06_swap_chain_creation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/07_image_views.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/08_graphics_pipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/09_shader_modules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/10_fixed_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/12_graphics_pipeline_complete.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/14_command_buffers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/15_hello_triangle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/16_frames_in_flight.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/17_swap_chain_recreation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/18_vertex_input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/19_vertex_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/20_staging_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/21_index_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/22_descriptor_layout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/23_descriptor_sets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/24_texture_image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/25_sampler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/26_texture_mapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/27_depth_buffering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/28_model_loading.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/29_mipmapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,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) {
Expand Down
7 changes: 6 additions & 1 deletion attachments/30_multisampling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,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) {
Expand Down
Loading