Fix remaining Sonar Scanner issues continued

Author: egorodet

Modules/Graphics/Mesh/Include/Methane/Graphics/CubeMesh.hpp

@@ -61,7 +61,7 @@ class CubeMesh : public QuadMesh<VType>
         BaseMeshT::AppendVertices(face_mesh.GetVertices());
 
         const Mesh::Indices& face_indices = face_mesh.GetIndices();
-        std::transform(face_indices.begin(), face_indices.end(), Mesh::GetIndicesBackInserter(),
+        std::ranges::transform(face_indices, Mesh::GetIndicesBackInserter(),
             [initial_vertices_count](const Mesh::Index& index)
             {
                 return static_cast<Mesh::Index>(initial_vertices_count + index);

Modules/Graphics/Mesh/Include/Methane/Graphics/UberMesh.hpp

@@ -57,7 +57,7 @@ class UberMesh : public BaseMesh<VType>
             META_CHECK_LESS(vertex_count, std::numeric_limits<Mesh::Index>::max());
 
             const auto index_offset = static_cast<Mesh::Index>(vertex_count);
-            std::transform(sub_indices.begin(), sub_indices.end(), BaseMeshT::GetIndicesBackInserter(),
+            std::ranges::transform(sub_indices, BaseMeshT::GetIndicesBackInserter(),
                            [index_offset](const Mesh::Index& index)
                            {
                                META_CHECK_LESS(index_offset, std::numeric_limits<Mesh::Index>::max() - index);

Modules/Graphics/RHI/Base/Sources/Methane/Graphics/Base/DescriptorManager.cpp

@@ -28,6 +28,7 @@ Base descriptor manager implementation.
 #include <Methane/Instrumentation.h>
 
 #include <taskflow/algorithm/for_each.hpp>
+#include <ranges>
 
 namespace Methane::Graphics::Base
 {
@@ -55,12 +56,12 @@ void DescriptorManager::ReleaseExpiredProgramBindings()
     META_FUNCTION_TASK();
     std::scoped_lock lock_guard(m_program_bindings_mutex);
 
-    const auto program_bindings_end_it = std::remove_if(m_program_bindings.begin(), m_program_bindings.end(),
+    const auto remove_range = std::ranges::remove_if(m_program_bindings,
         [](const WeakPtr<Rhi::IProgramBindings>& program_bindings_wptr)
         { return program_bindings_wptr.expired(); }
     );
 
-    m_program_bindings.erase(program_bindings_end_it, m_program_bindings.end());
+    m_program_bindings.erase(remove_range.begin(), remove_range.end());
 }
 
 void DescriptorManager::CompleteProgramBindingsInitialization()
@@ -99,7 +100,7 @@ void DescriptorManager::AddProgramBindings(Rhi::IProgramBindings& program_bindin
 #ifdef _DEBUG
     // This may cause performance drop on adding massive amount of program bindings,
     // so we assume that only different program bindings are added and check it in Debug builds only
-    const auto program_bindings_it = std::find_if(m_program_bindings.begin(), m_program_bindings.end(),
+    const auto program_bindings_it = std::ranges::find_if(m_program_bindings,
         [&program_bindings](const WeakPtr<Rhi::IProgramBindings>& program_bindings_ptr)
         { return !program_bindings_ptr.expired() && program_bindings_ptr.lock().get() == std::addressof(program_bindings); }
     );

Modules/Graphics/RHI/Base/Sources/Methane/Graphics/Base/Program.cpp

@@ -28,6 +28,7 @@ Base implementation of the program interface.
 
 #include <magic_enum/magic_enum.hpp>
 #include <algorithm>
+#include <ranges>
 
 namespace Methane::Graphics::Base
 {
@@ -165,7 +166,7 @@ void Program::InitFrameConstantArgumentBindings()
     if (m_context.GetType() != Rhi::IContext::Type::Render)
     {
         const auto frame_constant_binding_by_arg_it =
-            std::find_if(m_binding_by_argument.begin(), m_binding_by_argument.end(),
+            std::ranges::find_if(m_binding_by_argument,
                          [](const std::pair<Rhi::ProgramArgument, Ptr<ArgumentBinding>>& arg_binding)
                          { return arg_binding.second->GetSettings().argument.IsFrameConstant(); });
         META_CHECK_TRUE_DESCR(frame_constant_binding_by_arg_it == m_binding_by_argument.end(),
@@ -273,7 +274,7 @@ uint32_t Program::GetInputBufferIndexByArgumentSemantic(const std::string& argum
     for (size_t buffer_index = 0; buffer_index < m_settings.input_buffer_layouts.size(); buffer_index++)
     {
         const InputBufferLayout& input_buffer_layout = m_settings.input_buffer_layouts[buffer_index];
-        if (auto argument_it = std::find(input_buffer_layout.argument_semantics.begin(), input_buffer_layout.argument_semantics.end(), argument_semantic);
+        if (auto argument_it = std::ranges::find(input_buffer_layout.argument_semantics, argument_semantic);
             argument_it != input_buffer_layout.argument_semantics.end())
             return static_cast<uint32_t>(buffer_index);
     }

Modules/Graphics/RHI/Base/Sources/Methane/Graphics/Base/RenderPattern.cpp

@@ -66,7 +66,7 @@ AttachmentFormats RenderPattern::GetAttachmentFormats() const noexcept
     AttachmentFormats attachment_formats;
 
     attachment_formats.colors.reserve(m_settings.color_attachments.size());
-    std::transform(m_settings.color_attachments.begin(), m_settings.color_attachments.end(), std::back_inserter(attachment_formats.colors),
+    std::ranges::transform(m_settings.color_attachments, std::back_inserter(attachment_formats.colors),
                    [](const ColorAttachment& color_attachment) { return color_attachment.format; });
 
     if (m_settings.depth_attachment)

Modules/Graphics/RHI/DirectX/Sources/Methane/Graphics/DirectX/BufferSet.cpp

@@ -47,7 +47,7 @@ static std::vector<D3D12_VERTEX_BUFFER_VIEW> GetNativeVertexBufferViews(const Re
 {
     META_FUNCTION_TASK();
     std::vector<D3D12_VERTEX_BUFFER_VIEW> vertex_buffer_views;
-    std::transform(buffer_refs.begin(), buffer_refs.end(), std::back_inserter(vertex_buffer_views),
+    std::ranges::transform(buffer_refs, std::back_inserter(vertex_buffer_views),
         [](const Ref<Rhi::IBuffer>& buffer_ref)
         {
            const auto& buffer = static_cast<const Buffer&>(buffer_ref.get());

Modules/Graphics/RHI/DirectX/Sources/Methane/Graphics/DirectX/DescriptorManager.cpp

@@ -28,6 +28,7 @@ Descriptor manager is a central place for creating and accessing descriptor heap
 #include <Methane/Checks.hpp>
 
 #include <magic_enum/magic_enum.hpp>
+#include <ranges>
 
 namespace Methane::Graphics::DirectX
 {
@@ -151,7 +152,7 @@ DescriptorHeap& DescriptorManager::GetDefaultShaderVisibleDescriptorHeap(Descrip
                      "can not get reference to 'Undefined' descriptor heap");
 
     const UniquePtrs<DescriptorHeap>& descriptor_heaps = m_descriptor_heap_types[magic_enum::enum_integer(type)];
-    auto descriptor_heaps_it = std::find_if(descriptor_heaps.begin(), descriptor_heaps.end(),
+    auto descriptor_heaps_it = std::ranges::find_if(descriptor_heaps,
                                             [](const UniquePtr<DescriptorHeap>& descriptor_heap_ptr)
                                             {
                                                 META_CHECK_NOT_NULL(descriptor_heap_ptr);

Modules/Graphics/RHI/DirectX/Sources/Methane/Graphics/DirectX/ProgramArgumentBinding.cpp

@@ -178,7 +178,7 @@ bool ProgramArgumentBinding::UpdateRootConstantResourceViews()
     const Rhi::ResourceViews& resource_views = (Base::ProgramArgumentBinding::GetResourceViews());
     m_resource_views_dx.clear();
 
-    std::transform(resource_views.begin(), resource_views.end(), std::back_inserter(m_resource_views_dx),
+    std::ranges::transform(resource_views, std::back_inserter(m_resource_views_dx),
         [this](const Rhi::ResourceView& resource_view)
         { return ResourceView(resource_view, m_shader_usage); });
 

Modules/Graphics/RHI/DirectX/Sources/Methane/Graphics/DirectX/RenderPass.cpp

@@ -186,7 +186,7 @@ RenderPass::RenderPass(Base::RenderPattern& render_pattern, const Settings& sett
     , m_dx_context(static_cast<const RenderContext&>(render_pattern.GetBaseRenderContext()))
 {
     META_FUNCTION_TASK();
-    std::transform(settings.attachments.begin(), settings.attachments.end(), std::back_inserter(m_dx_attachments),
+    std::ranges::transform(settings.attachments, std::back_inserter(m_dx_attachments),
                    [](const Rhi::ITexture::View& texture_location)
                    { return ResourceView(texture_location, Rhi::ResourceUsageMask({ Rhi::ResourceUsage::RenderTarget })); });
 
@@ -216,7 +216,7 @@ bool RenderPass::Update(const Settings& settings)
         m_begin_transition_barriers_ptr.reset();
         m_end_transition_barriers_ptr.reset();
 
-        std::transform(settings.attachments.begin(), settings.attachments.end(), std::back_inserter(m_dx_attachments),
+        std::ranges::transform(settings.attachments, std::back_inserter(m_dx_attachments),
                        [](const Rhi::ITexture::View& texture_location)
                        { return ResourceView(texture_location, Rhi::ResourceUsageMask({ Rhi::ResourceUsage::RenderTarget })); });
     }

Modules/Graphics/RHI/DirectX/Sources/Methane/Graphics/DirectX/ResourceBarriers.cpp

@@ -28,6 +28,7 @@ DirectX 12 specialization of the resource barriers.
 #include <Methane/Checks.hpp>
 
 #include <directx/d3dx12_barriers.h>
+#include <ranges>
 
 namespace Methane::Graphics::Rhi
 {
@@ -142,7 +143,7 @@ bool ResourceBarriers::Remove(const Barrier::Id& id)
 
     const D3D12_RESOURCE_BARRIER_TYPE native_barrier_type = GetNativeBarrierType(id.GetType());
     const ID3D12Resource* native_resource_ptr = dynamic_cast<const IResource&>(id.GetResource()).GetNativeResource();
-    const auto native_resource_barrier_it = std::find_if(m_native_resource_barriers.begin(), m_native_resource_barriers.end(),
+    const auto native_resource_barrier_it = std::ranges::find_if(m_native_resource_barriers,
                                                          GetNativeResourceBarrierPredicate(native_barrier_type, native_resource_ptr));
     META_CHECK_TRUE_DESCR(native_resource_barrier_it != m_native_resource_barriers.end(), "can not find DX resource barrier to update");
     m_native_resource_barriers.erase(native_resource_barrier_it);
@@ -169,7 +170,7 @@ void ResourceBarriers::UpdateNativeResourceBarrier(const Barrier::Id& id, const
     META_FUNCTION_TASK();
     const D3D12_RESOURCE_BARRIER_TYPE native_barrier_type = GetNativeBarrierType(id.GetType());
     const ID3D12Resource* native_resource_ptr = dynamic_cast<const IResource&>(id.GetResource()).GetNativeResource();
-    const auto native_resource_barrier_it = std::find_if(m_native_resource_barriers.begin(), m_native_resource_barriers.end(),
+    const auto native_resource_barrier_it = std::ranges::find_if(m_native_resource_barriers,
                                                          GetNativeResourceBarrierPredicate(native_barrier_type, native_resource_ptr));
     META_CHECK_TRUE_DESCR(native_resource_barrier_it != m_native_resource_barriers.end(), "can not find DX resource barrier to update");