From 36a565712cbe0b36045425b0adee933eb15a0d1d Mon Sep 17 00:00:00 2001 From: Evgeny Gorodetsky Date: Wed, 8 Feb 2023 19:55:33 +0300 Subject: [PATCH] Fix code alignment --- .../Sources/Methane/Graphics/SkyBox.cpp | 4 ++-- .../Include/Methane/Graphics/Base/CommandKit.h | 6 +++--- .../Methane/Graphics/Base/RenderCommandList.cpp | 4 ++-- .../Graphics/DirectX/ProgramArgumentBinding.h | 2 +- .../Graphics/DirectX/RenderCommandList.cpp | 4 ++-- .../Graphics/RHI/ParallelRenderCommandList.h | 2 +- .../Methane/Graphics/RHI/RenderCommandList.h | 6 +++--- .../Methane/Graphics/RHI/ResourceBarriers.h | 4 ++-- .../Impl/Include/Methane/Graphics/RHI/System.h | 2 +- .../Include/Methane/Graphics/RHI/IBuffer.h | 4 ++-- .../Include/Methane/Graphics/RHI/IProgram.h | 16 ++++++++-------- .../Methane/Graphics/RHI/IProgramBindings.h | 4 ++-- .../Methane/Graphics/RHI/IResourceBarriers.h | 6 +++--- .../Include/Methane/Graphics/RHI/ISampler.h | 14 +++++++------- .../Include/Methane/Graphics/RHI/IShader.h | 10 +++++----- .../Include/Methane/Graphics/RHI/Interfaces.h | 1 + .../Methane/Graphics/Metal/RenderCommandList.mm | 4 ++-- .../Methane/Graphics/Null/RenderCommandList.cpp | 4 ++-- .../Graphics/Vulkan/ProgramArgumentBinding.h | 2 +- .../Include/Methane/Graphics/Vulkan/QueryPool.h | 4 ++-- .../Graphics/Vulkan/RenderCommandList.cpp | 4 ++-- .../Platform/App/Include/Methane/Platform/IApp.h | 4 ++-- .../Sources/Methane/UserInterface/Text.cpp | 2 +- .../Sources/Methane/UserInterface/TextMesh.h | 6 +++--- 24 files changed, 60 insertions(+), 59 deletions(-) diff --git a/Modules/Graphics/Primitives/Sources/Methane/Graphics/SkyBox.cpp b/Modules/Graphics/Primitives/Sources/Methane/Graphics/SkyBox.cpp index f8a67b28b..75af705c0 100644 --- a/Modules/Graphics/Primitives/Sources/Methane/Graphics/SkyBox.cpp +++ b/Modules/Graphics/Primitives/Sources/Methane/Graphics/SkyBox.cpp @@ -72,8 +72,8 @@ struct SkyBoxVertex class SkyBox::Impl { private: - using Uniforms = SkyBoxUniforms; - using Vertex = SkyBoxVertex; + using Uniforms = SkyBoxUniforms; + using Vertex = SkyBoxVertex; using TexMeshBuffers = TexturedMeshBuffers; Settings m_settings; diff --git a/Modules/Graphics/RHI/Base/Include/Methane/Graphics/Base/CommandKit.h b/Modules/Graphics/RHI/Base/Include/Methane/Graphics/Base/CommandKit.h index 0addc90d3..729da541b 100644 --- a/Modules/Graphics/RHI/Base/Include/Methane/Graphics/Base/CommandKit.h +++ b/Modules/Graphics/RHI/Base/Include/Methane/Graphics/Base/CommandKit.h @@ -55,10 +55,10 @@ class CommandKit final [[nodiscard]] Rhi::IFence& GetFence(Rhi::CommandListId fence_id) const override; private: - using CommandListIndex = uint32_t; - using CommandListSetId = std::pair, uint32_t>; + using CommandListIndex = uint32_t; + using CommandListSetId = std::pair, uint32_t>; using CommandListIndexById = std::map; - using CommandListSetById = std::map>; + using CommandListSetById = std::map>; CommandListIndex GetCommandListIndexById(Rhi::CommandListId cmd_list_id) const noexcept; CommandListSetId GetCommandListSetId(const std::vector& cmd_list_ids, Opt frame_index_opt) const; diff --git a/Modules/Graphics/RHI/Base/Sources/Methane/Graphics/Base/RenderCommandList.cpp b/Modules/Graphics/RHI/Base/Sources/Methane/Graphics/Base/RenderCommandList.cpp index 3b798456e..58cc22e3f 100644 --- a/Modules/Graphics/RHI/Base/Sources/Methane/Graphics/Base/RenderCommandList.cpp +++ b/Modules/Graphics/RHI/Base/Sources/Methane/Graphics/Base/RenderCommandList.cpp @@ -201,7 +201,7 @@ bool RenderCommandList::SetIndexBuffer(Rhi::IBuffer& index_buffer, bool set_reso } void RenderCommandList::DrawIndexed(Primitive primitive_type, uint32_t index_count, uint32_t start_index, uint32_t start_vertex, - uint32_t instance_count, uint32_t start_instance) + uint32_t instance_count, uint32_t start_instance) { META_FUNCTION_TASK(); VerifyEncodingState(); @@ -230,7 +230,7 @@ void RenderCommandList::DrawIndexed(Primitive primitive_type, uint32_t index_cou } void RenderCommandList::Draw(Primitive primitive_type, uint32_t vertex_count, uint32_t start_vertex, - uint32_t instance_count, uint32_t start_instance) + uint32_t instance_count, uint32_t start_instance) { META_FUNCTION_TASK(); VerifyEncodingState(); diff --git a/Modules/Graphics/RHI/DirectX/Include/Methane/Graphics/DirectX/ProgramArgumentBinding.h b/Modules/Graphics/RHI/DirectX/Include/Methane/Graphics/DirectX/ProgramArgumentBinding.h index e249cb241..35c9e3c83 100644 --- a/Modules/Graphics/RHI/DirectX/Include/Methane/Graphics/DirectX/ProgramArgumentBinding.h +++ b/Modules/Graphics/RHI/DirectX/Include/Methane/Graphics/DirectX/ProgramArgumentBinding.h @@ -60,7 +60,7 @@ class ProgramArgumentBinding final // NOSONAR - custom destructor is required : public Base::ProgramArgumentBinding { public: - using Type = ProgramArgumentBindingType; + using Type = ProgramArgumentBindingType; using Settings = ProgramArgumentBindingSettings; struct DescriptorRange diff --git a/Modules/Graphics/RHI/DirectX/Sources/Methane/Graphics/DirectX/RenderCommandList.cpp b/Modules/Graphics/RHI/DirectX/Sources/Methane/Graphics/DirectX/RenderCommandList.cpp index 258477e2b..237fc4934 100644 --- a/Modules/Graphics/RHI/DirectX/Sources/Methane/Graphics/DirectX/RenderCommandList.cpp +++ b/Modules/Graphics/RHI/DirectX/Sources/Methane/Graphics/DirectX/RenderCommandList.cpp @@ -181,7 +181,7 @@ bool RenderCommandList::SetIndexBuffer(Rhi::IBuffer& index_buffer, bool set_reso } void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, uint32_t start_index, uint32_t start_vertex, - uint32_t instance_count, uint32_t start_instance) + uint32_t instance_count, uint32_t start_instance) { META_FUNCTION_TASK(); @@ -205,7 +205,7 @@ void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, u } void RenderCommandList::Draw(Primitive primitive, uint32_t vertex_count, uint32_t start_vertex, - uint32_t instance_count, uint32_t start_instance) + uint32_t instance_count, uint32_t start_instance) { META_FUNCTION_TASK(); Base::RenderCommandList::Draw(primitive, vertex_count, start_vertex, instance_count, start_instance); diff --git a/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/ParallelRenderCommandList.h b/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/ParallelRenderCommandList.h index 9a507e541..ecb3c8c20 100644 --- a/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/ParallelRenderCommandList.h +++ b/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/ParallelRenderCommandList.h @@ -77,7 +77,7 @@ class ParallelRenderCommandList // NOSONAR - class has more than 35 methods, con META_PIMPL_API void Reset(const DebugGroup* debug_group_ptr = nullptr) const; META_PIMPL_API void ResetOnce(const DebugGroup* debug_group_ptr = nullptr) const; META_PIMPL_API void SetProgramBindings(IProgramBindings& program_bindings, - ProgramBindingsApplyBehaviorMask apply_behavior = ProgramBindingsApplyBehaviorMask(~0U)) const; + ProgramBindingsApplyBehaviorMask apply_behavior = ProgramBindingsApplyBehaviorMask(~0U)) const; META_PIMPL_API void SetResourceBarriers(const ResourceBarriers& resource_barriers) const; META_PIMPL_API void Commit() const; META_PIMPL_API void WaitUntilCompleted(uint32_t timeout_ms = 0U) const; diff --git a/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/RenderCommandList.h b/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/RenderCommandList.h index 31d0dcb98..41e751495 100644 --- a/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/RenderCommandList.h +++ b/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/RenderCommandList.h @@ -79,7 +79,7 @@ class RenderCommandList // NOSONAR - class has more than 35 methods, constructor META_PIMPL_API void Reset(const DebugGroup* debug_group_ptr = nullptr) const; META_PIMPL_API void ResetOnce(const DebugGroup* debug_group_ptr = nullptr) const; META_PIMPL_API void SetProgramBindings(const ProgramBindings& program_bindings, - ProgramBindingsApplyBehaviorMask apply_behavior = ProgramBindingsApplyBehaviorMask(~0U)) const; + ProgramBindingsApplyBehaviorMask apply_behavior = ProgramBindingsApplyBehaviorMask(~0U)) const; META_PIMPL_API void SetResourceBarriers(const ResourceBarriers& resource_barriers) const; META_PIMPL_API void Commit() const; META_PIMPL_API void WaitUntilCompleted(uint32_t timeout_ms = 0U) const; @@ -102,9 +102,9 @@ class RenderCommandList // NOSONAR - class has more than 35 methods, constructor META_PIMPL_API bool SetVertexBuffers(const BufferSet& vertex_buffers, bool set_resource_barriers = true) const; META_PIMPL_API bool SetIndexBuffer(const Buffer& index_buffer, bool set_resource_barriers = true) const; META_PIMPL_API void DrawIndexed(Primitive primitive, uint32_t index_count = 0U, uint32_t start_index = 0U, uint32_t start_vertex = 0U, - uint32_t instance_count = 1U, uint32_t start_instance = 0U) const; + uint32_t instance_count = 1U, uint32_t start_instance = 0U) const; META_PIMPL_API void Draw(Primitive primitive, uint32_t vertex_count, uint32_t start_vertex = 0U, - uint32_t instance_count = 1U, uint32_t start_instance = 0U) const; + uint32_t instance_count = 1U, uint32_t start_instance = 0U) const; private: using Impl = Methane::Graphics::META_GFX_NAME::RenderCommandList; diff --git a/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/ResourceBarriers.h b/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/ResourceBarriers.h index be6d79aa9..0cd08de4e 100644 --- a/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/ResourceBarriers.h +++ b/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/ResourceBarriers.h @@ -54,8 +54,8 @@ class ResourceBarriers // NOSONAR - constructors and assignment operators are re META_PIMPL_API explicit ResourceBarriers(IResourceBarriers& interface_ref); META_PIMPL_API explicit ResourceBarriers(const Set& barriers); META_PIMPL_API ResourceBarriers(const Refs& resources, - const Opt& state_change, - const Opt& owner_change); + const Opt& state_change, + const Opt& owner_change); META_PIMPL_API bool IsInitialized() const META_PIMPL_NOEXCEPT; META_PIMPL_API IResourceBarriers& GetInterface() const META_PIMPL_NOEXCEPT; diff --git a/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/System.h b/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/System.h index 8ccbc9ec7..6012e9884 100644 --- a/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/System.h +++ b/Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/System.h @@ -53,7 +53,7 @@ class System // NOSONAR - constructors and assignment operators are required to META_PIMPL_API void CheckForChanges() const; META_PIMPL_API const Devices& UpdateGpuDevices(const DeviceCaps& required_device_caps = {}) const; META_PIMPL_API const Devices& UpdateGpuDevices(const Platform::AppEnvironment& app_env, - const DeviceCaps& required_device_caps = {}) const; + const DeviceCaps& required_device_caps = {}) const; [[nodiscard]] META_PIMPL_API const Devices& GetGpuDevices() const META_PIMPL_NOEXCEPT; [[nodiscard]] META_PIMPL_API Device GetNextGpuDevice(const Device& device) const META_PIMPL_NOEXCEPT; [[nodiscard]] META_PIMPL_API Device GetSoftwareGpuDevice() const META_PIMPL_NOEXCEPT; diff --git a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IBuffer.h b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IBuffer.h index 4c69d451c..d758007a3 100644 --- a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IBuffer.h +++ b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IBuffer.h @@ -66,9 +66,9 @@ struct BufferSettings struct IBuffer : virtual IResource // NOSONAR { - using Type = BufferType; + using Type = BufferType; using StorageMode = BufferStorageMode; - using Settings = BufferSettings; + using Settings = BufferSettings; // Create IBuffer instance [[nodiscard]] static Ptr Create(const IContext& context, const Settings& settings); diff --git a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IProgram.h b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IProgram.h index 57c579f8f..de4b5e444 100644 --- a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IProgram.h +++ b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IProgram.h @@ -150,14 +150,14 @@ struct IProgramBindings; struct IProgram : virtual IObject // NOSONAR { - using Shaders = ProgramShaders; - using Settings = ProgramSettings; - using InputBufferLayout = ProgramInputBufferLayout; - using InputBufferLayouts = ProgramInputBufferLayouts; - using Argument = ProgramArgument; - using Arguments = ProgramArguments; - using ArgumentAccessor = ProgramArgumentAccessor; - using ArgumentAccessors = ProgramArgumentAccessors; + using Shaders = ProgramShaders; + using Settings = ProgramSettings; + using InputBufferLayout = ProgramInputBufferLayout; + using InputBufferLayouts = ProgramInputBufferLayouts; + using Argument = ProgramArgument; + using Arguments = ProgramArguments; + using ArgumentAccessor = ProgramArgumentAccessor; + using ArgumentAccessors = ProgramArgumentAccessors; using ResourceViewsByArgument = std::unordered_map; static ArgumentAccessors::const_iterator FindArgumentAccessor(const ArgumentAccessors& argument_accessors, const Argument& argument); diff --git a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IProgramBindings.h b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IProgramBindings.h index f221c0f7c..84bce79e2 100644 --- a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IProgramBindings.h +++ b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IProgramBindings.h @@ -63,9 +63,9 @@ struct ProgramArgumentBindingSettings struct IProgramArgumentBinding : virtual Data::IEmitter // NOSONAR { - using ICallback = IProgramArgumentBindingCallback; + using ICallback = IProgramArgumentBindingCallback; using ConstantModificationException = ProgramArgumentConstantModificationException; - using Settings = ProgramArgumentBindingSettings; + using Settings = ProgramArgumentBindingSettings; // IProgramArgumentBinding interface [[nodiscard]] virtual const Settings& GetSettings() const noexcept = 0; diff --git a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IResourceBarriers.h b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IResourceBarriers.h index 234c6838c..b0b8fd3c2 100644 --- a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IResourceBarriers.h +++ b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IResourceBarriers.h @@ -165,10 +165,10 @@ class ResourceBarrier struct IResourceBarriers { - using State = ResourceState; + using State = ResourceState; using Barrier = ResourceBarrier; - using Set = std::set; - using Map = std::map; + using Set = std::set; + using Map = std::map; enum class AddResult { diff --git a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/ISampler.h b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/ISampler.h index ddbdf5996..c646981a3 100644 --- a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/ISampler.h +++ b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/ISampler.h @@ -81,9 +81,9 @@ struct SamplerLevelOfDetail { SamplerLevelOfDetail(float bias = 0.F, float min = 0.F, float max = std::numeric_limits::max()); - float min = 0.F; - float max = std::numeric_limits::max(); - float bias = 0.F; + float min = 0.F; + float max = std::numeric_limits::max(); + float bias = 0.F; }; enum class SamplerBorderColor : uint32_t @@ -115,11 +115,11 @@ struct IContext; struct ISampler : virtual IResource // NOSONAR { - using Filter = SamplerFilter; - using Address = SamplerAddress; + using Filter = SamplerFilter; + using Address = SamplerAddress; using LevelOfDetail = SamplerLevelOfDetail; - using BorderColor = SamplerBorderColor; - using Settings = SamplerSettings; + using BorderColor = SamplerBorderColor; + using Settings = SamplerSettings; // Create ISampler instance [[nodiscard]] static Ptr Create(const IContext& context, const Settings& settings); diff --git a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IShader.h b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IShader.h index 30f63b580..2b1c5898e 100644 --- a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IShader.h +++ b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IShader.h @@ -85,12 +85,12 @@ struct IContext; struct IShader { - using Type = ShaderType; - using Types = ShaderTypes; - using MacroDefinition = ShaderMacroDefinition; + using Type = ShaderType; + using Types = ShaderTypes; + using MacroDefinition = ShaderMacroDefinition; using MacroDefinitions = ShaderMacroDefinitions; - using EntryFunction = ShaderEntryFunction; - using Settings = ShaderSettings; + using EntryFunction = ShaderEntryFunction; + using Settings = ShaderSettings; // Create IShader instance [[nodiscard]] static Ptr Create(Type type, const IContext& context, const Settings& settings); diff --git a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/Interfaces.h b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/Interfaces.h index 16e3176f6..d9cf091b9 100644 --- a/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/Interfaces.h +++ b/Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/Interfaces.h @@ -38,6 +38,7 @@ Methane graphics RHI interfaces: all headers under one umbrella. #include "IBufferSet.h" #include "ITexture.h" #include "ISampler.h" +#include "IQueryPool.h" #include "ICommandKit.h" #include "ICommandListSet.h" #include "ICommandListDebugGroup.h" diff --git a/Modules/Graphics/RHI/Metal/Sources/Methane/Graphics/Metal/RenderCommandList.mm b/Modules/Graphics/RHI/Metal/Sources/Methane/Graphics/Metal/RenderCommandList.mm index b7db6e976..51b701ae1 100644 --- a/Modules/Graphics/RHI/Metal/Sources/Methane/Graphics/Metal/RenderCommandList.mm +++ b/Modules/Graphics/RHI/Metal/Sources/Methane/Graphics/Metal/RenderCommandList.mm @@ -135,7 +135,7 @@ static bool GetDeviceSupportOfGpuFamilyApple3(CommandQueue& command_queue) } void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, uint32_t start_index, uint32_t start_vertex, - uint32_t instance_count, uint32_t start_instance) + uint32_t instance_count, uint32_t start_instance) { META_FUNCTION_TASK(); @@ -184,7 +184,7 @@ static bool GetDeviceSupportOfGpuFamilyApple3(CommandQueue& command_queue) } void RenderCommandList::Draw(Primitive primitive, uint32_t vertex_count, uint32_t start_vertex, - uint32_t instance_count, uint32_t start_instance) + uint32_t instance_count, uint32_t start_instance) { META_FUNCTION_TASK(); Base::RenderCommandList::Draw(primitive, vertex_count, start_vertex, instance_count, start_instance); diff --git a/Modules/Graphics/RHI/Null/Sources/Methane/Graphics/Null/RenderCommandList.cpp b/Modules/Graphics/RHI/Null/Sources/Methane/Graphics/Null/RenderCommandList.cpp index c1f975549..b97cea26e 100644 --- a/Modules/Graphics/RHI/Null/Sources/Methane/Graphics/Null/RenderCommandList.cpp +++ b/Modules/Graphics/RHI/Null/Sources/Methane/Graphics/Null/RenderCommandList.cpp @@ -89,7 +89,7 @@ bool RenderCommandList::SetIndexBuffer(Rhi::IBuffer& index_buffer, bool set_reso } void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, uint32_t start_index, uint32_t start_vertex, - uint32_t instance_count, uint32_t start_instance) + uint32_t instance_count, uint32_t start_instance) { META_FUNCTION_TASK(); if (const DrawingState& drawing_state = GetDrawingState(); @@ -102,7 +102,7 @@ void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, u } void RenderCommandList::Draw(Primitive primitive, uint32_t vertex_count, uint32_t start_vertex, - uint32_t instance_count, uint32_t start_instance) + uint32_t instance_count, uint32_t start_instance) { META_FUNCTION_TASK(); Base::RenderCommandList::Draw(primitive, vertex_count, start_vertex, instance_count, start_instance); diff --git a/Modules/Graphics/RHI/Vulkan/Include/Methane/Graphics/Vulkan/ProgramArgumentBinding.h b/Modules/Graphics/RHI/Vulkan/Include/Methane/Graphics/Vulkan/ProgramArgumentBinding.h index 549d3bc56..8b9f4c204 100644 --- a/Modules/Graphics/RHI/Vulkan/Include/Methane/Graphics/Vulkan/ProgramArgumentBinding.h +++ b/Modules/Graphics/RHI/Vulkan/Include/Methane/Graphics/Vulkan/ProgramArgumentBinding.h @@ -52,7 +52,7 @@ class ProgramArgumentBinding final : public Base::ProgramArgumentBinding { public: - using Settings = ProgramArgumentBindingSettings; + using Settings = ProgramArgumentBindingSettings; using ByteCodeMap = ProgramArgumentBindingSettings::ByteCodeMap; ProgramArgumentBinding(const Base::Context& context, const Settings& settings); diff --git a/Modules/Graphics/RHI/Vulkan/Include/Methane/Graphics/Vulkan/QueryPool.h b/Modules/Graphics/RHI/Vulkan/Include/Methane/Graphics/Vulkan/QueryPool.h index 00ad5fcfc..345997ef9 100644 --- a/Modules/Graphics/RHI/Vulkan/Include/Methane/Graphics/Vulkan/QueryPool.h +++ b/Modules/Graphics/RHI/Vulkan/Include/Methane/Graphics/Vulkan/QueryPool.h @@ -65,8 +65,8 @@ class QueryPool : public Base::QueryPool { public: QueryPool(CommandQueue& command_queue, Type type, - Data::Size max_query_count, Rhi::IQuery::Count slots_count_per_query, - Data::Size buffer_size, Data::Size query_size); + Data::Size max_query_count, Rhi::IQuery::Count slots_count_per_query, + Data::Size buffer_size, Data::Size query_size); CommandQueue& GetVulkanCommandQueue() noexcept; const IContext& GetVulkanContext() const noexcept { return m_context_vk; } diff --git a/Modules/Graphics/RHI/Vulkan/Sources/Methane/Graphics/Vulkan/RenderCommandList.cpp b/Modules/Graphics/RHI/Vulkan/Sources/Methane/Graphics/Vulkan/RenderCommandList.cpp index 505acf8db..3621b00e4 100644 --- a/Modules/Graphics/RHI/Vulkan/Sources/Methane/Graphics/Vulkan/RenderCommandList.cpp +++ b/Modules/Graphics/RHI/Vulkan/Sources/Methane/Graphics/Vulkan/RenderCommandList.cpp @@ -154,7 +154,7 @@ bool RenderCommandList::SetIndexBuffer(Rhi::IBuffer& index_buffer, bool set_reso } void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, uint32_t start_index, uint32_t start_vertex, - uint32_t instance_count, uint32_t start_instance) + uint32_t instance_count, uint32_t start_instance) { META_FUNCTION_TASK(); if (const DrawingState& drawing_state = GetDrawingState(); @@ -170,7 +170,7 @@ void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, u } void RenderCommandList::Draw(Primitive primitive, uint32_t vertex_count, uint32_t start_vertex, - uint32_t instance_count, uint32_t start_instance) + uint32_t instance_count, uint32_t start_instance) { META_FUNCTION_TASK(); Base::RenderCommandList::Draw(primitive, vertex_count, start_vertex, instance_count, start_instance); diff --git a/Modules/Platform/App/Include/Methane/Platform/IApp.h b/Modules/Platform/App/Include/Methane/Platform/IApp.h index 9cd3b8b3b..6c616e773 100644 --- a/Modules/Platform/App/Include/Methane/Platform/IApp.h +++ b/Modules/Platform/App/Include/Methane/Platform/IApp.h @@ -75,8 +75,8 @@ struct IApp { public: using Settings = AppSettings; - using RunArgs = AppRunArgs; - using Message = AppMessage; + using RunArgs = AppRunArgs; + using Message = AppMessage; // IApp interface virtual int Run(const RunArgs& args) = 0; diff --git a/Modules/UserInterface/Typography/Sources/Methane/UserInterface/Text.cpp b/Modules/UserInterface/Typography/Sources/Methane/UserInterface/Text.cpp index 2211134bd..0d7f0d919 100644 --- a/Modules/UserInterface/Typography/Sources/Methane/UserInterface/Text.cpp +++ b/Modules/UserInterface/Typography/Sources/Methane/UserInterface/Text.cpp @@ -282,7 +282,7 @@ class Text::Impl // NOSONAR - class destructor is required , public Data::Receiver { private: - using FrameResources = TextFrameResources; + using FrameResources = TextFrameResources; using PerFrameResources = std::vector; Context& m_ui_context; diff --git a/Modules/UserInterface/Typography/Sources/Methane/UserInterface/TextMesh.h b/Modules/UserInterface/Typography/Sources/Methane/UserInterface/TextMesh.h index 0bd7b6a63..9b392412b 100644 --- a/Modules/UserInterface/Typography/Sources/Methane/UserInterface/TextMesh.h +++ b/Modules/UserInterface/Typography/Sources/Methane/UserInterface/TextMesh.h @@ -45,9 +45,9 @@ class TextMesh Data::RawVector2F texcoord; }; - using Index = uint16_t; - using Indices = std::vector; - using Vertices = std::vector; + using Index = uint16_t; + using Indices = std::vector; + using Vertices = std::vector; struct CharPosition : gfx::FramePoint {