Skip to content

Commit 7bdc597

Browse files
RaelrRaelr
committed
Ran formatter
1 parent 16826ac commit 7bdc597

File tree

20 files changed

+87
-47
lines changed

20 files changed

+87
-47
lines changed

‎engine/render/renderer/Renderer.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
#include "platform/vulkan/Font.h"
1212
#include "platform/vulkan/utils/Types.h"
13-
#include "statics/Statics.h"
1413
#include "platform/vulkan/utils/Viewport.h"
14+
#include "statics/Statics.h"
1515

1616
namespace Siege
1717
{
@@ -191,7 +191,9 @@ void Renderer::BeginSwapChainRenderPass()
191191

192192
using namespace Vulkan::Utils;
193193

194-
SetViewport(commandBuffers.GetActiveCommandBuffer(), static_cast<float>(swapExtent.width), static_cast<float>(swapExtent.height));
194+
SetViewport(commandBuffers.GetActiveCommandBuffer(),
195+
static_cast<float>(swapExtent.width),
196+
static_cast<float>(swapExtent.height));
195197
SetScissor(commandBuffers.GetActiveCommandBuffer(), swapExtent.width, swapExtent.height);
196198
}
197199

‎engine/render/renderer/Renderer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include "render/renderer/platform/vulkan/CommandBuffer.h"
1818
#include "render/renderer/platform/vulkan/Context.h"
1919
#include "render/renderer/platform/vulkan/DescriptorPool.h"
20+
#include "renderer/Common.h"
2021
#include "renderer/Renderer2D.h"
2122
#include "renderer/Renderer3D.h"
22-
#include "renderer/Common.h"
2323

2424
namespace Siege
2525
{

‎engine/render/renderer/model/Model.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
#include "Model.h"
10+
1011
#include "render/renderer/platform/vulkan/utils/Draw.h"
1112

1213
#define TINYOBJLOADER_IMPLEMENTATION

‎engine/render/renderer/model/Model.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
#include <utils/Hash.h>
1414
#include <utils/math/mat/Mat4.h>
1515

16+
#include <unordered_map>
17+
1618
#include "../buffer/Buffer.h"
1719
#include "render/renderer/platform/vulkan/Material.h"
1820
#include "render/renderer/platform/vulkan/Mesh.h"
1921

20-
#include <unordered_map>
21-
2222
namespace Siege
2323
{
2424
/**

‎engine/render/renderer/platform/vulkan/Context.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void Context::Init(Window& window)
3232

3333
vulkanInstance = Instance(window.GetRequiredExtensions());
3434

35-
surface = (VkSurfaceKHR)Siege::Window::GetWindowSurface(window, vulkanInstance.GetInstance());
35+
surface = (VkSurfaceKHR) Siege::Window::GetWindowSurface(window, vulkanInstance.GetInstance());
3636

3737
CC_ASSERT(surface != VK_NULL_HANDLE, "Unable to create surface!")
3838

‎engine/render/renderer/platform/vulkan/Fence.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88

99
#include "Fence.h"
1010

11-
#include "utils/TypeAdaptor.h"
12-
1311
#include <utils/Logging.h>
1412

1513
#include "Context.h"
14+
#include "utils/TypeAdaptor.h"
1615

1716
namespace Siege::Vulkan
1817
{

‎engine/render/renderer/platform/vulkan/Material.cpp‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Material::Material(Shader vertShader, Shader fragShader, bool isWritingDepth) :
3939
bufferUpdates = MHArray<MHArray<UniformBufferUpdate>>(framesCount);
4040
imageUpdates = MHArray<MHArray<UniformImageUpdate>>(framesCount);
4141

42-
for(size_t i = 0; i < framesCount; i++)
42+
for (size_t i = 0; i < framesCount; i++)
4343
{
4444
bufferUpdates.Append(MHArray<UniformBufferUpdate>(10));
4545
imageUpdates.Append(MHArray<UniformImageUpdate>(MAX_TEXTURES));
@@ -96,7 +96,7 @@ Material::Material(Shader vertShader, Shader fragShader, bool isWritingDepth) :
9696
WriteSet(slotIt.GetIndex(), slot);
9797
}
9898

99-
for(size_t i = 0; i < framesCount; i++) UpdateUniforms(bufferUpdates[i], imageUpdates[i]);
99+
for (size_t i = 0; i < framesCount; i++) UpdateUniforms(bufferUpdates[i], imageUpdates[i]);
100100

101101
// Create Pipeline
102102
Recreate();
@@ -294,7 +294,7 @@ void Material::Update()
294294

295295
using Vulkan::Context;
296296

297-
// Write(targetSets);
297+
// Write(targetSets);
298298
UpdateUniforms(targetBuffers, targetImages);
299299

300300
targetBuffers.Clear();
@@ -310,7 +310,7 @@ void Material::Update(Hash::StringId id)
310310

311311
auto& buffersToWrite = bufferUpdates[Renderer::GetCurrentFrameIndex()];
312312
auto& imagesToWrite = imageUpdates[Renderer::GetCurrentFrameIndex()];
313-
// Write(setsToWrite);
313+
// Write(setsToWrite);
314314
UpdateUniforms(buffersToWrite, imagesToWrite);
315315

316316
buffersToWrite.Clear();
@@ -331,7 +331,6 @@ void Material::WriteSet(uint32_t set, PropertiesSlot& slot)
331331

332332
for (auto setIt = perFrameDescriptorSets.CreateFIterator(); setIt; ++setIt)
333333
{
334-
335334
auto sets = *setIt;
336335
if (IsTexture2D(prop.type))
337336
QueueImageUpdate(imageUpdates[setIt.GetIndex()], sets[set], propIt.GetIndex());
@@ -346,36 +345,48 @@ void Material::WriteSet(uint32_t set, PropertiesSlot& slot)
346345
}
347346
}
348347

349-
void Material::UpdateUniforms(MHArray<UniformBufferUpdate>& buffers, MHArray<UniformImageUpdate>& images)
348+
void Material::UpdateUniforms(MHArray<UniformBufferUpdate>& buffers,
349+
MHArray<UniformImageUpdate>& images)
350350
{
351351
using namespace Vulkan::Utils::Descriptor;
352352

353353
MSArray<VkWriteDescriptorSet, 10> writeSets;
354354
MSArray<VkDescriptorBufferInfo, MAX_UNIFORM_SETS * 10> bufferInfs;
355355
MSArray<VkDescriptorImageInfo, MAX_TEXTURES> imageInfos;
356356

357-
for(auto it = buffers.CreateIterator(); it; ++it)
357+
for (auto it = buffers.CreateIterator(); it; ++it)
358358
{
359359
auto& update = it->update;
360360
auto& bufferInfo = it->bufferUpdate;
361361

362362
bufferInfs.Append({bufferInfo.buffer, bufferInfo.offset, bufferInfo.range});
363-
writeSets.Append(CreateWriteSet(update.dstBinding, update.set, update.descriptors, Utils::ToVkDescriptorType(update.type), &bufferInfs.Back()));
363+
writeSets.Append(CreateWriteSet(update.dstBinding,
364+
update.set,
365+
update.descriptors,
366+
Utils::ToVkDescriptorType(update.type),
367+
&bufferInfs.Back()));
364368
}
365369

366-
for(auto it = textureInfos.CreateIterator(); it; ++it)
370+
for (auto it = textureInfos.CreateIterator(); it; ++it)
367371
{
368372
imageInfos.Append({it->sampler, it->view, Utils::ToVkImageLayout(it->layout)});
369373
}
370374

371-
for(auto it = images.CreateIterator(); it; ++it)
375+
for (auto it = images.CreateIterator(); it; ++it)
372376
{
373377
auto& update = it->update;
374378

375-
writeSets.Append(WriteDescriptorImage(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, update.set, imageInfos.Data(), update.dstBinding, update.descriptors, update.dstIndex));
379+
writeSets.Append(WriteDescriptorImage(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
380+
update.set,
381+
imageInfos.Data(),
382+
update.dstBinding,
383+
update.descriptors,
384+
update.dstIndex));
376385
}
377386

378-
Utils::Descriptor::WriteSets(Context::GetVkLogicalDevice(), writeSets.Data(), writeSets.Count());
387+
Utils::Descriptor::WriteSets(Context::GetVkLogicalDevice(),
388+
writeSets.Data(),
389+
writeSets.Count());
379390
buffers.Clear();
380391
images.Clear();
381392
}

‎engine/render/renderer/platform/vulkan/Semaphore.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <utils/Logging.h>
1212

1313
#include "Context.h"
14-
1514
#include "utils/TypeAdaptor.h"
1615

1716
namespace Siege::Vulkan

‎engine/render/renderer/platform/vulkan/utils/Descriptor.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,5 +169,4 @@ VkSamplerCreateInfo SamplerCreateInfo(VkFilter filters, VkSamplerAddressMode sam
169169
return info;
170170
}
171171

172-
173172
} // namespace Siege::Vulkan::Utils::Descriptor

‎engine/render/renderer/platform/vulkan/utils/Draw.h‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,24 @@
1313

1414
namespace Siege::Vulkan::Utils
1515
{
16-
inline void Draw(VkCommandBuffer buffer, unsigned int vertexCount, unsigned int instances, unsigned int firstVertex, unsigned int firstInstance)
17-
{
18-
vkCmdDraw(buffer, vertexCount, instances, firstVertex, firstInstance);
19-
}
16+
inline void Draw(VkCommandBuffer buffer,
17+
unsigned int vertexCount,
18+
unsigned int instances,
19+
unsigned int firstVertex,
20+
unsigned int firstInstance)
21+
{
22+
vkCmdDraw(buffer, vertexCount, instances, firstVertex, firstInstance);
23+
}
2024

21-
inline void DrawIndexed(VkCommandBuffer buffer, unsigned int indexCount, unsigned int instances, unsigned int firstIndex, unsigned int vertexOffset, unsigned int firstInstance)
22-
{
23-
vkCmdDrawIndexed(buffer, indexCount, instances, firstIndex, vertexOffset, firstInstance);
24-
}
25+
inline void DrawIndexed(VkCommandBuffer buffer,
26+
unsigned int indexCount,
27+
unsigned int instances,
28+
unsigned int firstIndex,
29+
unsigned int vertexOffset,
30+
unsigned int firstInstance)
31+
{
32+
vkCmdDrawIndexed(buffer, indexCount, instances, firstIndex, vertexOffset, firstInstance);
2533
}
34+
} // namespace Siege::Vulkan::Utils
2635

2736
#endif // SIEGE_ENGINE_VULKAN_DRAW_H

0 commit comments

Comments
 (0)