Skip to content

Commit 36a5657

Browse files
egorodetegorodet
committed
Fix code alignment
1 parent 07f7439 commit 36a5657

File tree

24 files changed

+60
-59
lines changed

24 files changed

+60
-59
lines changed

‎Modules/Graphics/Primitives/Sources/Methane/Graphics/SkyBox.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ struct SkyBoxVertex
7272
class SkyBox::Impl
7373
{
7474
private:
75-
using Uniforms = SkyBoxUniforms;
76-
using Vertex = SkyBoxVertex;
75+
using Uniforms = SkyBoxUniforms;
76+
using Vertex = SkyBoxVertex;
7777
using TexMeshBuffers = TexturedMeshBuffers<hlslpp::SkyBoxUniforms>;
7878

7979
Settings m_settings;

‎Modules/Graphics/RHI/Base/Include/Methane/Graphics/Base/CommandKit.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ class CommandKit final
5555
[[nodiscard]] Rhi::IFence& GetFence(Rhi::CommandListId fence_id) const override;
5656

5757
private:
58-
using CommandListIndex = uint32_t;
59-
using CommandListSetId = std::pair<Opt<Data::Index>, uint32_t>;
58+
using CommandListIndex = uint32_t;
59+
using CommandListSetId = std::pair<Opt<Data::Index>, uint32_t>;
6060
using CommandListIndexById = std::map<Rhi::CommandListId, uint32_t>;
61-
using CommandListSetById = std::map<CommandListSetId, Ptr<Rhi::ICommandListSet>>;
61+
using CommandListSetById = std::map<CommandListSetId, Ptr<Rhi::ICommandListSet>>;
6262

6363
CommandListIndex GetCommandListIndexById(Rhi::CommandListId cmd_list_id) const noexcept;
6464
CommandListSetId GetCommandListSetId(const std::vector<Rhi::CommandListId>& cmd_list_ids, Opt<Data::Index> frame_index_opt) const;

‎Modules/Graphics/RHI/Base/Sources/Methane/Graphics/Base/RenderCommandList.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ bool RenderCommandList::SetIndexBuffer(Rhi::IBuffer& index_buffer, bool set_reso
201201
}
202202

203203
void RenderCommandList::DrawIndexed(Primitive primitive_type, uint32_t index_count, uint32_t start_index, uint32_t start_vertex,
204-
uint32_t instance_count, uint32_t start_instance)
204+
uint32_t instance_count, uint32_t start_instance)
205205
{
206206
META_FUNCTION_TASK();
207207
VerifyEncodingState();
@@ -230,7 +230,7 @@ void RenderCommandList::DrawIndexed(Primitive primitive_type, uint32_t index_cou
230230
}
231231

232232
void RenderCommandList::Draw(Primitive primitive_type, uint32_t vertex_count, uint32_t start_vertex,
233-
uint32_t instance_count, uint32_t start_instance)
233+
uint32_t instance_count, uint32_t start_instance)
234234
{
235235
META_FUNCTION_TASK();
236236
VerifyEncodingState();

‎Modules/Graphics/RHI/DirectX/Include/Methane/Graphics/DirectX/ProgramArgumentBinding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class ProgramArgumentBinding final // NOSONAR - custom destructor is required
6060
: public Base::ProgramArgumentBinding
6161
{
6262
public:
63-
using Type = ProgramArgumentBindingType;
63+
using Type = ProgramArgumentBindingType;
6464
using Settings = ProgramArgumentBindingSettings;
6565

6666
struct DescriptorRange

‎Modules/Graphics/RHI/DirectX/Sources/Methane/Graphics/DirectX/RenderCommandList.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ bool RenderCommandList::SetIndexBuffer(Rhi::IBuffer& index_buffer, bool set_reso
181181
}
182182

183183
void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, uint32_t start_index, uint32_t start_vertex,
184-
uint32_t instance_count, uint32_t start_instance)
184+
uint32_t instance_count, uint32_t start_instance)
185185
{
186186
META_FUNCTION_TASK();
187187

@@ -205,7 +205,7 @@ void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, u
205205
}
206206

207207
void RenderCommandList::Draw(Primitive primitive, uint32_t vertex_count, uint32_t start_vertex,
208-
uint32_t instance_count, uint32_t start_instance)
208+
uint32_t instance_count, uint32_t start_instance)
209209
{
210210
META_FUNCTION_TASK();
211211
Base::RenderCommandList::Draw(primitive, vertex_count, start_vertex, instance_count, start_instance);

‎Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/ParallelRenderCommandList.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class ParallelRenderCommandList // NOSONAR - class has more than 35 methods, con
7777
META_PIMPL_API void Reset(const DebugGroup* debug_group_ptr = nullptr) const;
7878
META_PIMPL_API void ResetOnce(const DebugGroup* debug_group_ptr = nullptr) const;
7979
META_PIMPL_API void SetProgramBindings(IProgramBindings& program_bindings,
80-
ProgramBindingsApplyBehaviorMask apply_behavior = ProgramBindingsApplyBehaviorMask(~0U)) const;
80+
ProgramBindingsApplyBehaviorMask apply_behavior = ProgramBindingsApplyBehaviorMask(~0U)) const;
8181
META_PIMPL_API void SetResourceBarriers(const ResourceBarriers& resource_barriers) const;
8282
META_PIMPL_API void Commit() const;
8383
META_PIMPL_API void WaitUntilCompleted(uint32_t timeout_ms = 0U) const;

‎Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/RenderCommandList.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class RenderCommandList // NOSONAR - class has more than 35 methods, constructor
7979
META_PIMPL_API void Reset(const DebugGroup* debug_group_ptr = nullptr) const;
8080
META_PIMPL_API void ResetOnce(const DebugGroup* debug_group_ptr = nullptr) const;
8181
META_PIMPL_API void SetProgramBindings(const ProgramBindings& program_bindings,
82-
ProgramBindingsApplyBehaviorMask apply_behavior = ProgramBindingsApplyBehaviorMask(~0U)) const;
82+
ProgramBindingsApplyBehaviorMask apply_behavior = ProgramBindingsApplyBehaviorMask(~0U)) const;
8383
META_PIMPL_API void SetResourceBarriers(const ResourceBarriers& resource_barriers) const;
8484
META_PIMPL_API void Commit() const;
8585
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
102102
META_PIMPL_API bool SetVertexBuffers(const BufferSet& vertex_buffers, bool set_resource_barriers = true) const;
103103
META_PIMPL_API bool SetIndexBuffer(const Buffer& index_buffer, bool set_resource_barriers = true) const;
104104
META_PIMPL_API void DrawIndexed(Primitive primitive, uint32_t index_count = 0U, uint32_t start_index = 0U, uint32_t start_vertex = 0U,
105-
uint32_t instance_count = 1U, uint32_t start_instance = 0U) const;
105+
uint32_t instance_count = 1U, uint32_t start_instance = 0U) const;
106106
META_PIMPL_API void Draw(Primitive primitive, uint32_t vertex_count, uint32_t start_vertex = 0U,
107-
uint32_t instance_count = 1U, uint32_t start_instance = 0U) const;
107+
uint32_t instance_count = 1U, uint32_t start_instance = 0U) const;
108108

109109
private:
110110
using Impl = Methane::Graphics::META_GFX_NAME::RenderCommandList;

‎Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/ResourceBarriers.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ class ResourceBarriers // NOSONAR - constructors and assignment operators are re
5454
META_PIMPL_API explicit ResourceBarriers(IResourceBarriers& interface_ref);
5555
META_PIMPL_API explicit ResourceBarriers(const Set& barriers);
5656
META_PIMPL_API ResourceBarriers(const Refs<IResource>& resources,
57-
const Opt<Barrier::StateChange>& state_change,
58-
const Opt<Barrier::OwnerChange>& owner_change);
57+
const Opt<Barrier::StateChange>& state_change,
58+
const Opt<Barrier::OwnerChange>& owner_change);
5959

6060
META_PIMPL_API bool IsInitialized() const META_PIMPL_NOEXCEPT;
6161
META_PIMPL_API IResourceBarriers& GetInterface() const META_PIMPL_NOEXCEPT;

‎Modules/Graphics/RHI/Impl/Include/Methane/Graphics/RHI/System.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class System // NOSONAR - constructors and assignment operators are required to
5353
META_PIMPL_API void CheckForChanges() const;
5454
META_PIMPL_API const Devices& UpdateGpuDevices(const DeviceCaps& required_device_caps = {}) const;
5555
META_PIMPL_API const Devices& UpdateGpuDevices(const Platform::AppEnvironment& app_env,
56-
const DeviceCaps& required_device_caps = {}) const;
56+
const DeviceCaps& required_device_caps = {}) const;
5757
[[nodiscard]] META_PIMPL_API const Devices& GetGpuDevices() const META_PIMPL_NOEXCEPT;
5858
[[nodiscard]] META_PIMPL_API Device GetNextGpuDevice(const Device& device) const META_PIMPL_NOEXCEPT;
5959
[[nodiscard]] META_PIMPL_API Device GetSoftwareGpuDevice() const META_PIMPL_NOEXCEPT;

‎Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IBuffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ struct BufferSettings
6666
struct IBuffer
6767
: virtual IResource // NOSONAR
6868
{
69-
using Type = BufferType;
69+
using Type = BufferType;
7070
using StorageMode = BufferStorageMode;
71-
using Settings = BufferSettings;
71+
using Settings = BufferSettings;
7272

7373
// Create IBuffer instance
7474
[[nodiscard]] static Ptr<IBuffer> Create(const IContext& context, const Settings& settings);

‎Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IProgram.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,14 @@ struct IProgramBindings;
150150
struct IProgram
151151
: virtual IObject // NOSONAR
152152
{
153-
using Shaders = ProgramShaders;
154-
using Settings = ProgramSettings;
155-
using InputBufferLayout = ProgramInputBufferLayout;
156-
using InputBufferLayouts = ProgramInputBufferLayouts;
157-
using Argument = ProgramArgument;
158-
using Arguments = ProgramArguments;
159-
using ArgumentAccessor = ProgramArgumentAccessor;
160-
using ArgumentAccessors = ProgramArgumentAccessors;
153+
using Shaders = ProgramShaders;
154+
using Settings = ProgramSettings;
155+
using InputBufferLayout = ProgramInputBufferLayout;
156+
using InputBufferLayouts = ProgramInputBufferLayouts;
157+
using Argument = ProgramArgument;
158+
using Arguments = ProgramArguments;
159+
using ArgumentAccessor = ProgramArgumentAccessor;
160+
using ArgumentAccessors = ProgramArgumentAccessors;
161161
using ResourceViewsByArgument = std::unordered_map<Argument, ResourceViews, Argument::Hash>;
162162

163163
static ArgumentAccessors::const_iterator FindArgumentAccessor(const ArgumentAccessors& argument_accessors, const Argument& argument);

‎Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IProgramBindings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ struct ProgramArgumentBindingSettings
6363
struct IProgramArgumentBinding
6464
: virtual Data::IEmitter<IProgramArgumentBindingCallback> // NOSONAR
6565
{
66-
using ICallback = IProgramArgumentBindingCallback;
66+
using ICallback = IProgramArgumentBindingCallback;
6767
using ConstantModificationException = ProgramArgumentConstantModificationException;
68-
using Settings = ProgramArgumentBindingSettings;
68+
using Settings = ProgramArgumentBindingSettings;
6969

7070
// IProgramArgumentBinding interface
7171
[[nodiscard]] virtual const Settings& GetSettings() const noexcept = 0;

‎Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IResourceBarriers.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@ class ResourceBarrier
165165

166166
struct IResourceBarriers
167167
{
168-
using State = ResourceState;
168+
using State = ResourceState;
169169
using Barrier = ResourceBarrier;
170-
using Set = std::set<ResourceBarrier>;
171-
using Map = std::map<ResourceBarrier::Id, ResourceBarrier>;
170+
using Set = std::set<ResourceBarrier>;
171+
using Map = std::map<ResourceBarrier::Id, ResourceBarrier>;
172172

173173
enum class AddResult
174174
{

‎Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/ISampler.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ struct SamplerLevelOfDetail
8181
{
8282
SamplerLevelOfDetail(float bias = 0.F, float min = 0.F, float max = std::numeric_limits<float>::max());
8383

84-
float min = 0.F;
85-
float max = std::numeric_limits<float>::max();
86-
float bias = 0.F;
84+
float min = 0.F;
85+
float max = std::numeric_limits<float>::max();
86+
float bias = 0.F;
8787
};
8888

8989
enum class SamplerBorderColor : uint32_t
@@ -115,11 +115,11 @@ struct IContext;
115115
struct ISampler
116116
: virtual IResource // NOSONAR
117117
{
118-
using Filter = SamplerFilter;
119-
using Address = SamplerAddress;
118+
using Filter = SamplerFilter;
119+
using Address = SamplerAddress;
120120
using LevelOfDetail = SamplerLevelOfDetail;
121-
using BorderColor = SamplerBorderColor;
122-
using Settings = SamplerSettings;
121+
using BorderColor = SamplerBorderColor;
122+
using Settings = SamplerSettings;
123123

124124
// Create ISampler instance
125125
[[nodiscard]] static Ptr<ISampler> Create(const IContext& context, const Settings& settings);

‎Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/IShader.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ struct IContext;
8585

8686
struct IShader
8787
{
88-
using Type = ShaderType;
89-
using Types = ShaderTypes;
90-
using MacroDefinition = ShaderMacroDefinition;
88+
using Type = ShaderType;
89+
using Types = ShaderTypes;
90+
using MacroDefinition = ShaderMacroDefinition;
9191
using MacroDefinitions = ShaderMacroDefinitions;
92-
using EntryFunction = ShaderEntryFunction;
93-
using Settings = ShaderSettings;
92+
using EntryFunction = ShaderEntryFunction;
93+
using Settings = ShaderSettings;
9494

9595
// Create IShader instance
9696
[[nodiscard]] static Ptr<IShader> Create(Type type, const IContext& context, const Settings& settings);

‎Modules/Graphics/RHI/Interface/Include/Methane/Graphics/RHI/Interfaces.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Methane graphics RHI interfaces: all headers under one umbrella.
3838
#include "IBufferSet.h"
3939
#include "ITexture.h"
4040
#include "ISampler.h"
41+
#include "IQueryPool.h"
4142
#include "ICommandKit.h"
4243
#include "ICommandListSet.h"
4344
#include "ICommandListDebugGroup.h"

‎Modules/Graphics/RHI/Metal/Sources/Methane/Graphics/Metal/RenderCommandList.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static bool GetDeviceSupportOfGpuFamilyApple3(CommandQueue& command_queue)
135135
}
136136

137137
void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, uint32_t start_index, uint32_t start_vertex,
138-
uint32_t instance_count, uint32_t start_instance)
138+
uint32_t instance_count, uint32_t start_instance)
139139
{
140140
META_FUNCTION_TASK();
141141

@@ -184,7 +184,7 @@ static bool GetDeviceSupportOfGpuFamilyApple3(CommandQueue& command_queue)
184184
}
185185

186186
void RenderCommandList::Draw(Primitive primitive, uint32_t vertex_count, uint32_t start_vertex,
187-
uint32_t instance_count, uint32_t start_instance)
187+
uint32_t instance_count, uint32_t start_instance)
188188
{
189189
META_FUNCTION_TASK();
190190
Base::RenderCommandList::Draw(primitive, vertex_count, start_vertex, instance_count, start_instance);

‎Modules/Graphics/RHI/Null/Sources/Methane/Graphics/Null/RenderCommandList.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ bool RenderCommandList::SetIndexBuffer(Rhi::IBuffer& index_buffer, bool set_reso
8989
}
9090

9191
void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, uint32_t start_index, uint32_t start_vertex,
92-
uint32_t instance_count, uint32_t start_instance)
92+
uint32_t instance_count, uint32_t start_instance)
9393
{
9494
META_FUNCTION_TASK();
9595
if (const DrawingState& drawing_state = GetDrawingState();
@@ -102,7 +102,7 @@ void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, u
102102
}
103103

104104
void RenderCommandList::Draw(Primitive primitive, uint32_t vertex_count, uint32_t start_vertex,
105-
uint32_t instance_count, uint32_t start_instance)
105+
uint32_t instance_count, uint32_t start_instance)
106106
{
107107
META_FUNCTION_TASK();
108108
Base::RenderCommandList::Draw(primitive, vertex_count, start_vertex, instance_count, start_instance);

‎Modules/Graphics/RHI/Vulkan/Include/Methane/Graphics/Vulkan/ProgramArgumentBinding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class ProgramArgumentBinding final
5252
: public Base::ProgramArgumentBinding
5353
{
5454
public:
55-
using Settings = ProgramArgumentBindingSettings;
55+
using Settings = ProgramArgumentBindingSettings;
5656
using ByteCodeMap = ProgramArgumentBindingSettings::ByteCodeMap;
5757

5858
ProgramArgumentBinding(const Base::Context& context, const Settings& settings);

‎Modules/Graphics/RHI/Vulkan/Include/Methane/Graphics/Vulkan/QueryPool.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ class QueryPool : public Base::QueryPool
6565
{
6666
public:
6767
QueryPool(CommandQueue& command_queue, Type type,
68-
Data::Size max_query_count, Rhi::IQuery::Count slots_count_per_query,
69-
Data::Size buffer_size, Data::Size query_size);
68+
Data::Size max_query_count, Rhi::IQuery::Count slots_count_per_query,
69+
Data::Size buffer_size, Data::Size query_size);
7070

7171
CommandQueue& GetVulkanCommandQueue() noexcept;
7272
const IContext& GetVulkanContext() const noexcept { return m_context_vk; }

‎Modules/Graphics/RHI/Vulkan/Sources/Methane/Graphics/Vulkan/RenderCommandList.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ bool RenderCommandList::SetIndexBuffer(Rhi::IBuffer& index_buffer, bool set_reso
154154
}
155155

156156
void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, uint32_t start_index, uint32_t start_vertex,
157-
uint32_t instance_count, uint32_t start_instance)
157+
uint32_t instance_count, uint32_t start_instance)
158158
{
159159
META_FUNCTION_TASK();
160160
if (const DrawingState& drawing_state = GetDrawingState();
@@ -170,7 +170,7 @@ void RenderCommandList::DrawIndexed(Primitive primitive, uint32_t index_count, u
170170
}
171171

172172
void RenderCommandList::Draw(Primitive primitive, uint32_t vertex_count, uint32_t start_vertex,
173-
uint32_t instance_count, uint32_t start_instance)
173+
uint32_t instance_count, uint32_t start_instance)
174174
{
175175
META_FUNCTION_TASK();
176176
Base::RenderCommandList::Draw(primitive, vertex_count, start_vertex, instance_count, start_instance);

‎Modules/Platform/App/Include/Methane/Platform/IApp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ struct IApp
7575
{
7676
public:
7777
using Settings = AppSettings;
78-
using RunArgs = AppRunArgs;
79-
using Message = AppMessage;
78+
using RunArgs = AppRunArgs;
79+
using Message = AppMessage;
8080

8181
// IApp interface
8282
virtual int Run(const RunArgs& args) = 0;

‎Modules/UserInterface/Typography/Sources/Methane/UserInterface/Text.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ class Text::Impl // NOSONAR - class destructor is required
282282
, public Data::Receiver<IFontCallback>
283283
{
284284
private:
285-
using FrameResources = TextFrameResources;
285+
using FrameResources = TextFrameResources;
286286
using PerFrameResources = std::vector<TextFrameResources>;
287287

288288
Context& m_ui_context;

‎Modules/UserInterface/Typography/Sources/Methane/UserInterface/TextMesh.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ class TextMesh
4545
Data::RawVector2F texcoord;
4646
};
4747

48-
using Index = uint16_t;
49-
using Indices = std::vector<Index>;
50-
using Vertices = std::vector<Vertex>;
48+
using Index = uint16_t;
49+
using Indices = std::vector<Index>;
50+
using Vertices = std::vector<Vertex>;
5151

5252
struct CharPosition : gfx::FramePoint
5353
{

0 commit comments

Comments
 (0)