Skip to content

Commit 06a2b6e

Browse files
asuessenbachasuessenbach
committed
Add option BraceWrapping: BeforeLambdaBody: true
1 parent c075c7e commit 06a2b6e

File tree

66 files changed

+527
-419
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+527
-419
lines changed

‎.clang-format‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ BraceWrapping:
3434
AfterExternBlock: true
3535
BeforeCatch: true
3636
BeforeElse: true
37+
BeforeLambdaBody: true
3738
IndentBraces: false
3839
SplitEmptyFunction: false
3940
SplitEmptyRecord: false

‎framework/api_vulkan_sample.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -478,10 +478,12 @@ void ApiVulkanSample::update_overlay(float delta_time, const std::function<void(
478478
accumulated_time = 0.0f;
479479
}
480480

481-
get_gui().show_simple_window(get_name(), fps, [this, additional_ui]() {
482-
on_update_ui_overlay(get_gui().get_drawer());
483-
additional_ui();
484-
});
481+
get_gui().show_simple_window(get_name(), fps,
482+
[this, additional_ui]()
483+
{
484+
on_update_ui_overlay(get_gui().get_drawer());
485+
additional_ui();
486+
});
485487

486488
get_gui().update(delta_time);
487489

‎framework/buffer_pool.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,10 +331,8 @@ template <vkb::BindingType bindingType>
331331
BufferBlock<bindingType> &BufferPool<bindingType>::request_buffer_block(DeviceSizeType minimum_size, bool minimal)
332332
{
333333
// Find a block in the range of the blocks which can fit the minimum size
334-
auto it = minimal ? std::ranges::find_if(buffer_blocks,
335-
[&minimum_size](auto const &buffer_block) {
336-
return (buffer_block->get_size() == minimum_size) && buffer_block->can_allocate(minimum_size);
337-
}) :
334+
auto it = minimal ? std::ranges::find_if(buffer_blocks, [&minimum_size](auto const &buffer_block)
335+
{ return (buffer_block->get_size() == minimum_size) && buffer_block->can_allocate(minimum_size); }) :
338336
std::ranges::find_if(buffer_blocks, [&minimum_size](auto const &buffer_block) { return buffer_block->can_allocate(minimum_size); });
339337

340338
if (it == buffer_blocks.end())

‎framework/common/hpp_vk_common.h‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ inline vk::SurfaceFormatKHR select_surface_format(vk::PhysicalDevice gpu, vk::Su
155155
std::vector<vk::SurfaceFormatKHR> supported_surface_formats = gpu.getSurfaceFormatsKHR(surface);
156156
assert(!supported_surface_formats.empty());
157157

158-
auto it = std::ranges::find_if(supported_surface_formats, [&preferred_formats](vk::SurfaceFormatKHR surface_format) {
159-
return std::ranges::any_of(preferred_formats, [&surface_format](vk::Format format) { return format == surface_format.format; });
160-
});
158+
auto it = std::ranges::find_if(
159+
supported_surface_formats, [&preferred_formats](vk::SurfaceFormatKHR surface_format)
160+
{ return std::ranges::any_of(preferred_formats, [&surface_format](vk::Format format) { return format == surface_format.format; }); });
161161

162162
// We use the first supported format as a fallback in case none of the preferred formats is available
163163
return it != supported_surface_formats.end() ? *it : supported_surface_formats[0];
@@ -370,9 +370,8 @@ inline uint32_t get_queue_family_index(std::vector<vk::QueueFamilyProperties> co
370370
// Try to find a queue family index that supports compute but not graphics
371371
if (queue_flag & vk::QueueFlagBits::eCompute)
372372
{
373-
auto propertyIt = std::ranges::find_if(queue_family_properties, [queue_flag](const vk::QueueFamilyProperties &property) {
374-
return (property.queueFlags & queue_flag) && !(property.queueFlags & vk::QueueFlagBits::eGraphics);
375-
});
373+
auto propertyIt = std::ranges::find_if(queue_family_properties, [queue_flag](const vk::QueueFamilyProperties &property)
374+
{ return (property.queueFlags & queue_flag) && !(property.queueFlags & vk::QueueFlagBits::eGraphics); });
376375
if (propertyIt != queue_family_properties.end())
377376
{
378377
return static_cast<uint32_t>(std::distance(queue_family_properties.begin(), propertyIt));
@@ -383,19 +382,21 @@ inline uint32_t get_queue_family_index(std::vector<vk::QueueFamilyProperties> co
383382
// Try to find a queue family index that supports transfer but not graphics and compute
384383
if (queue_flag & vk::QueueFlagBits::eTransfer)
385384
{
386-
auto propertyIt = std::ranges::find_if(queue_family_properties, [queue_flag](const vk::QueueFamilyProperties &property) {
387-
return (property.queueFlags & queue_flag) && !(property.queueFlags & vk::QueueFlagBits::eGraphics) &&
388-
!(property.queueFlags & vk::QueueFlagBits::eCompute);
389-
});
385+
auto propertyIt = std::ranges::find_if(queue_family_properties,
386+
[queue_flag](const vk::QueueFamilyProperties &property)
387+
{
388+
return (property.queueFlags & queue_flag) && !(property.queueFlags & vk::QueueFlagBits::eGraphics) &&
389+
!(property.queueFlags & vk::QueueFlagBits::eCompute);
390+
});
390391
if (propertyIt != queue_family_properties.end())
391392
{
392393
return static_cast<uint32_t>(std::distance(queue_family_properties.begin(), propertyIt));
393394
}
394395
}
395396

396397
// For other queue types or if no separate compute queue is present, return the first one to support the requested flags
397-
auto propertyIt = std::ranges::find_if(
398-
queue_family_properties, [queue_flag](const vk::QueueFamilyProperties &property) { return (property.queueFlags & queue_flag) == queue_flag; });
398+
auto propertyIt = std::ranges::find_if(queue_family_properties, [queue_flag](const vk::QueueFamilyProperties &property)
399+
{ return (property.queueFlags & queue_flag) == queue_flag; });
399400
if (propertyIt != queue_family_properties.end())
400401
{
401402
return static_cast<uint32_t>(std::distance(queue_family_properties.begin(), propertyIt));

‎framework/common/vk_common.cpp‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -548,9 +548,9 @@ VkSurfaceFormatKHR select_surface_format(VkPhysicalDevice gpu, VkSurfaceKHR surf
548548
std::vector<VkSurfaceFormatKHR> supported_surface_formats(surface_format_count);
549549
vkGetPhysicalDeviceSurfaceFormatsKHR(gpu, surface, &surface_format_count, supported_surface_formats.data());
550550

551-
auto it = std::ranges::find_if(supported_surface_formats, [&preferred_formats](VkSurfaceFormatKHR surface_format) {
552-
return std::ranges::any_of(preferred_formats, [&surface_format](VkFormat format) { return format == surface_format.format; });
553-
});
551+
auto it = std::ranges::find_if(
552+
supported_surface_formats, [&preferred_formats](VkSurfaceFormatKHR surface_format)
553+
{ return std::ranges::any_of(preferred_formats, [&surface_format](VkFormat format) { return format == surface_format.format; }); });
554554

555555
// We use the first supported format as a fallback in case none of the preferred formats is available
556556
return it != supported_surface_formats.end() ? *it : supported_surface_formats[0];
@@ -649,9 +649,8 @@ uint32_t get_queue_family_index(std::vector<VkQueueFamilyProperties> const &queu
649649
// Try to find a queue family index that supports compute but not graphics
650650
if (queue_flag & VK_QUEUE_COMPUTE_BIT)
651651
{
652-
auto propertyIt = std::ranges::find_if(queue_family_properties, [queue_flag](const VkQueueFamilyProperties &property) {
653-
return (property.queueFlags & queue_flag) && !(property.queueFlags & VK_QUEUE_GRAPHICS_BIT);
654-
});
652+
auto propertyIt = std::ranges::find_if(queue_family_properties, [queue_flag](const VkQueueFamilyProperties &property)
653+
{ return (property.queueFlags & queue_flag) && !(property.queueFlags & VK_QUEUE_GRAPHICS_BIT); });
655654
if (propertyIt != queue_family_properties.end())
656655
{
657656
return static_cast<uint32_t>(std::distance(queue_family_properties.begin(), propertyIt));
@@ -662,9 +661,9 @@ uint32_t get_queue_family_index(std::vector<VkQueueFamilyProperties> const &queu
662661
// Try to find a queue family index that supports transfer but not graphics and compute
663662
if (queue_flag & VK_QUEUE_TRANSFER_BIT)
664663
{
665-
auto propertyIt = std::ranges::find_if(queue_family_properties, [queue_flag](const VkQueueFamilyProperties &property) {
666-
return (property.queueFlags & queue_flag) && !(property.queueFlags & VK_QUEUE_GRAPHICS_BIT) && !(property.queueFlags & VK_QUEUE_COMPUTE_BIT);
667-
});
664+
auto propertyIt = std::ranges::find_if(
665+
queue_family_properties, [queue_flag](const VkQueueFamilyProperties &property)
666+
{ return (property.queueFlags & queue_flag) && !(property.queueFlags & VK_QUEUE_GRAPHICS_BIT) && !(property.queueFlags & VK_QUEUE_COMPUTE_BIT); });
668667
if (propertyIt != queue_family_properties.end())
669668
{
670669
return static_cast<uint32_t>(std::distance(queue_family_properties.begin(), propertyIt));

‎framework/core/device.h‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,9 @@ inline typename Device<bindingType>::CoreQueueType const &Device<bindingType>::g
427427
template <vkb::BindingType bindingType>
428428
inline typename Device<bindingType>::CoreQueueType const &Device<bindingType>::get_queue_by_present(uint32_t queue_index) const
429429
{
430-
auto queueIt = std::ranges::find_if(queues, [queue_index](const std::vector<vkb::core::HPPQueue> &queue_family) {
431-
return !queue_family.empty() && queue_index < queue_family[0].get_properties().queueCount && queue_family[0].support_present();
432-
});
430+
auto queueIt = std::ranges::find_if(
431+
queues, [queue_index](const std::vector<vkb::core::HPPQueue> &queue_family)
432+
{ return !queue_family.empty() && queue_index < queue_family[0].get_properties().queueCount && queue_family[0].support_present(); });
433433
if (queueIt != queues.end())
434434
{
435435
if constexpr (bindingType == vkb::BindingType::Cpp)
@@ -592,11 +592,14 @@ inline void Device<bindingType>::flush_command_buffer_impl(vk::Device device, vk
592592
template <vkb::BindingType bindingType>
593593
vkb::core::HPPQueue const &Device<bindingType>::get_queue_by_flags_impl(vk::QueueFlags required_queue_flags, uint32_t queue_index) const
594594
{
595-
auto queueIt = std::ranges::find_if(queues, [required_queue_flags, queue_index](const std::vector<vkb::core::HPPQueue> &queue) {
596-
assert(!queue.empty());
597-
vk::QueueFamilyProperties const &properties = queue[0].get_properties();
598-
return ((properties.queueFlags & required_queue_flags) == required_queue_flags) && (queue_index < properties.queueCount);
599-
});
595+
auto queueIt =
596+
std::ranges::find_if(queues,
597+
[required_queue_flags, queue_index](const std::vector<vkb::core::HPPQueue> &queue)
598+
{
599+
assert(!queue.empty());
600+
vk::QueueFamilyProperties const &properties = queue[0].get_properties();
601+
return ((properties.queueFlags & required_queue_flags) == required_queue_flags) && (queue_index < properties.queueCount);
602+
});
600603

601604
if (queueIt == queues.end())
602605
{

‎framework/core/hpp_swapchain.cpp‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ vk::PresentModeKHR choose_present_mode(vk::PresentModeKHR request_present_mode,
6363
if (present_mode_it == available_present_modes.end())
6464
{
6565
// If the requested present mode isn't found, then try to find a mode from the priority list
66-
auto const chosen_present_mode_it = std::ranges::find_if(present_mode_priority_list, [&available_present_modes](vk::PresentModeKHR present_mode) {
67-
return std::ranges::find(available_present_modes, present_mode) != available_present_modes.end();
68-
});
66+
auto const chosen_present_mode_it =
67+
std::ranges::find_if(present_mode_priority_list, [&available_present_modes](vk::PresentModeKHR present_mode)
68+
{ return std::ranges::find(available_present_modes, present_mode) != available_present_modes.end(); });
6969

7070
// If nothing found, always default to FIFO
7171
vk::PresentModeKHR const chosen_present_mode =
@@ -92,9 +92,8 @@ vk::SurfaceFormatKHR choose_surface_format(const vk::SurfaceFormatKHR
9292
if (surface_format_it == available_surface_formats.end())
9393
{
9494
auto const chosen_surface_format_it =
95-
std::ranges::find_if(surface_format_priority_list, [&available_surface_formats](vk::SurfaceFormatKHR surface_format) {
96-
return std::ranges::find(available_surface_formats, surface_format) != available_surface_formats.end();
97-
});
95+
std::ranges::find_if(surface_format_priority_list, [&available_surface_formats](vk::SurfaceFormatKHR surface_format)
96+
{ return std::ranges::find(available_surface_formats, surface_format) != available_surface_formats.end(); });
9897

9998
// If nothing found, default to the first available format
10099
vk::SurfaceFormatKHR const &chosen_surface_format =
@@ -184,9 +183,9 @@ std::set<vk::ImageUsageFlagBits> choose_image_usage(const std::set<vk::ImageUsag
184183
static const std::vector<vk::ImageUsageFlagBits> image_usage_priority_list = {
185184
vk::ImageUsageFlagBits::eColorAttachment, vk::ImageUsageFlagBits::eStorage, vk::ImageUsageFlagBits::eSampled, vk::ImageUsageFlagBits::eTransferDst};
186185

187-
auto const priority_list_it = std::ranges::find_if(image_usage_priority_list, [&supported_image_usage, &supported_features](auto const image_usage) {
188-
return ((image_usage & supported_image_usage) && validate_format_feature(image_usage, supported_features));
189-
});
186+
auto const priority_list_it =
187+
std::ranges::find_if(image_usage_priority_list, [&supported_image_usage, &supported_features](auto const image_usage)
188+
{ return ((image_usage & supported_image_usage) && validate_format_feature(image_usage, supported_features)); });
190189
if (priority_list_it != image_usage_priority_list.end())
191190
{
192191
validated_image_usage_flags.insert(*priority_list_it);

‎framework/core/instance.h‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,17 @@ class Instance
7676
std::function<void *(std::vector<std::string> const &, std::vector<std::string> const &)> const &get_pNext =
7777
[](std::vector<std::string> const &, std::vector<std::string> const &) { return nullptr; },
7878
std::function<InstanceCreateFlagsType(std::vector<std::string> const &)> const &get_create_flags =
79-
[](std::vector<std::string> const &) {
80-
if constexpr (bindingType == vkb::BindingType::Cpp)
81-
{
82-
return vk::InstanceCreateFlags{};
83-
}
84-
else
85-
{
86-
return 0;
87-
}
88-
});
79+
[](std::vector<std::string> const &)
80+
{
81+
if constexpr (bindingType == vkb::BindingType::Cpp)
82+
{
83+
return vk::InstanceCreateFlags{};
84+
}
85+
else
86+
{
87+
return 0;
88+
}
89+
});
8990

9091
/**
9192
* @brief Queries the GPUs of a InstanceType that is already created
@@ -140,8 +141,8 @@ namespace
140141
inline bool enable_extension(std::string const &requested_extension, std::vector<vk::ExtensionProperties> const &available_extensions,
141142
std::vector<std::string> &enabled_extensions)
142143
{
143-
bool is_available = std::ranges::any_of(
144-
available_extensions, [&requested_extension](auto const &available_extension) { return requested_extension == available_extension.extensionName; });
144+
bool is_available = std::ranges::any_of(available_extensions, [&requested_extension](auto const &available_extension)
145+
{ return requested_extension == available_extension.extensionName; });
145146
if (is_available)
146147
{
147148
bool is_already_enabled =

‎framework/core/physical_device.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,8 @@ inline bool PhysicalDevice<bindingType>::has_high_priority_graphics_queue() cons
468468
template <vkb::BindingType bindingType>
469469
inline bool PhysicalDevice<bindingType>::is_extension_supported(const std::string &requested_extension) const
470470
{
471-
return std::ranges::find_if(device_extensions, [requested_extension](auto &device_extension) {
472-
return std::strcmp(device_extension.extensionName, requested_extension.c_str()) == 0;
473-
}) != device_extensions.end();
471+
return std::ranges::find_if(device_extensions, [requested_extension](auto &device_extension)
472+
{ return std::strcmp(device_extension.extensionName, requested_extension.c_str()) == 0; }) != device_extensions.end();
474473
}
475474

476475
template <vkb::BindingType bindingType>

‎framework/core/render_pass.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,13 @@ bool is_depth_a_dependency(std::vector<T_SubpassDescription> &subpass_descriptio
260260
}
261261

262262
// Otherwise check if any uses depth as an input
263-
return std::ranges::any_of(subpass_descriptions, [&attachment_descriptions](auto const &subpass) {
264-
return std::ranges::any_of(std::span{subpass.pInputAttachments, subpass.inputAttachmentCount}, [&attachment_descriptions](auto const &reference) {
265-
return vkb::is_depth_format(attachment_descriptions[reference.attachment].format);
266-
});
267-
});
263+
return std::ranges::any_of(subpass_descriptions,
264+
[&attachment_descriptions](auto const &subpass)
265+
{
266+
return std::ranges::any_of(std::span{subpass.pInputAttachments, subpass.inputAttachmentCount},
267+
[&attachment_descriptions](auto const &reference)
268+
{ return vkb::is_depth_format(attachment_descriptions[reference.attachment].format); });
269+
});
268270

269271
return false;
270272
}

0 commit comments

Comments
 (0)