mirror/vk-bootstrap
1
0
Fork 0
mirror of https://github.com/charles-lunarg/vk-bootstrap.git synced 2024-11-26 00:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused phys_dev parameter

Browse Source
This commit is contained in:
Odilon Vatonne 2022-10-15 10:13:36 +02:00 committed by Charles Giessen
parent 262ba0a857
commit 6d0c3763cc
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/VkBootstrap.cpp
View File

@ -1633,9 +1633,8 @@ Result<SurfaceSupportDetails> query_surface_support_details(VkPhysicalDevice phy
return SurfaceSupportDetails{ capabilities, formats, present_modes }; return SurfaceSupportDetails{ capabilities, formats, present_modes };
} }
Result<VkSurfaceFormatKHR> find_desired_surface_format(VkPhysicalDevice /* phys_device */, Result<VkSurfaceFormatKHR> find_desired_surface_format(
std::vector<VkSurfaceFormatKHR> const& available_formats, std::vector<VkSurfaceFormatKHR> const& available_formats, std::vector<VkSurfaceFormatKHR> const& desired_formats) {
std::vector<VkSurfaceFormatKHR> const& desired_formats) {
for (auto const& desired_format : desired_formats) { for (auto const& desired_format : desired_formats) {
for (auto const& available_format : available_formats) { for (auto const& available_format : available_formats) {
// finds the first format that is desired and available // finds the first format that is desired and available
@ -1649,10 +1648,9 @@ Result<VkSurfaceFormatKHR> find_desired_surface_format(VkPhysicalDevice /* phys_
return { make_error_code(SurfaceSupportError::no_suitable_desired_format) }; return { make_error_code(SurfaceSupportError::no_suitable_desired_format) };
} }
VkSurfaceFormatKHR find_best_surface_format(VkPhysicalDevice phys_device, VkSurfaceFormatKHR find_best_surface_format(
std::vector<VkSurfaceFormatKHR> const& available_formats, std::vector<VkSurfaceFormatKHR> const& available_formats, std::vector<VkSurfaceFormatKHR> const& desired_formats) {
std::vector<VkSurfaceFormatKHR> const& desired_formats) { auto surface_format_ret = detail::find_desired_surface_format(available_formats, desired_formats);
auto surface_format_ret = detail::find_desired_surface_format(phys_device, available_formats, desired_formats);
if (surface_format_ret.has_value()) return surface_format_ret.value(); if (surface_format_ret.has_value()) return surface_format_ret.value();
// use the first available format as a fallback if any desired formats aren't found // use the first available format as a fallback if any desired formats aren't found
@ -1775,7 +1773,7 @@ Result<Swapchain> SwapchainBuilder::build() const {
} }
VkSurfaceFormatKHR surface_format = VkSurfaceFormatKHR surface_format =
detail::find_best_surface_format(info.physical_device, surface_support.formats, desired_formats); detail::find_best_surface_format(surface_support.formats, desired_formats);
VkExtent2D extent = detail::find_extent(surface_support.capabilities, info.desired_width, info.desired_height); VkExtent2D extent = detail::find_extent(surface_support.capabilities, info.desired_width, info.desired_height);