From 976a3ed3bfc4653cf7e90899afb8b1a53a57817c Mon Sep 17 00:00:00 2001 From: kd-11 Date: Mon, 22 May 2023 22:48:20 +0300 Subject: [PATCH] Formatting fixes --- rpcs3/Emu/RSX/VK/vkutils/device.cpp | 14 ++++++++------ rpcs3/Emu/RSX/VK/vkutils/sampler.cpp | 16 ++++++++-------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/rpcs3/Emu/RSX/VK/vkutils/device.cpp b/rpcs3/Emu/RSX/VK/vkutils/device.cpp index b3efdf9aea..efb5c31e4c 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/device.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/device.cpp @@ -85,13 +85,15 @@ namespace vk ensure(_vkGetPhysicalDeviceFeatures2KHR); // "vkGetInstanceProcAddress failed to find entry point!" _vkGetPhysicalDeviceFeatures2KHR(dev, &features2); - shader_types_support.allow_float64 = !!features2.features.shaderFloat64; - shader_types_support.allow_float16 = !!shader_support_info.shaderFloat16; - shader_types_support.allow_int8 = !!shader_support_info.shaderInt8; - optional_features_support.framebuffer_loops = !!fbo_loops_info.attachmentFeedbackLoopLayout; - optional_features_support.barycentric_coords = !!shader_barycentric_info.fragmentShaderBarycentric; + shader_types_support.allow_float64 = !!features2.features.shaderFloat64; + shader_types_support.allow_float16 = !!shader_support_info.shaderFloat16; + shader_types_support.allow_int8 = !!shader_support_info.shaderInt8; + optional_features_support.custom_border_color = !!custom_border_color_info.customBorderColors && !!custom_border_color_info.customBorderColorWithoutFormat; - features = features2.features; + optional_features_support.barycentric_coords = !!shader_barycentric_info.fragmentShaderBarycentric; + optional_features_support.framebuffer_loops = !!fbo_loops_info.attachmentFeedbackLoopLayout; + + features = features2.features; if (descriptor_indexing_support) { diff --git a/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp b/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp index 586656c621..66575a5f26 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp @@ -163,11 +163,11 @@ namespace vk } const auto block = m_custom_color_sampler_pool.equal_range(key.base_key); - for (auto It = block.first; It != block.second; ++It) + for (auto it = block.first; it != block.second; ++it) { - if (It->second->key.border_color_key == key.border_color_key) + if (it->second->key.border_color_key == key.border_color_key) { - return It->second.get(); + return it->second.get(); } } @@ -194,16 +194,16 @@ namespace vk const auto collect_fn = [&](auto& container) { - for (auto It = container.begin(); It != container.end();) + for (auto it = container.begin(); it != container.end();) { - if (!predicate(*It->second)) + if (!predicate(*it->second)) { - It++; + it++; continue; } - result.emplace_back(std::move(It->second)); - It = container.erase(It); + result.emplace_back(std::move(it->second)); + it = container.erase(it); } };