Skip to content

Commit 361cf7f

Browse files
committed
removed volk dependency from RenderPass and moved to platform/vulkan
1 parent f067216 commit 361cf7f

File tree

19 files changed

+604
-1060
lines changed

19 files changed

+604
-1060
lines changed

engine/render/renderer/Renderer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void Renderer::BeginSwapChainRenderPass()
181181

182182
auto swapExtent = swapchain.GetExtent();
183183

184-
swapchain.BeginRenderPass(commandBuffers, currentImageIndex, {{clearValue}, {{{1.f, 0.f}}}});
184+
swapchain.BeginRenderPass(commandBuffers, currentImageIndex, {0.96f, 0.96f, 0.96f, 1.f});
185185

186186
VkViewport viewport {};
187187
viewport.x = 0.0f;

engine/render/renderer/Renderer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
#include "lights/PointLight.h"
1616
#include "model/Model.h"
17-
#include "render/renderer/platform/vulkan/DescriptorPool.h"
1817
#include "render/renderer/platform/vulkan/CommandBuffer.h"
1918
#include "render/renderer/platform/vulkan/Context.h"
19+
#include "render/renderer/platform/vulkan/DescriptorPool.h"
2020
#include "renderer/Renderer2D.h"
2121
#include "renderer/Renderer3D.h"
2222

engine/render/renderer/buffer/Buffer.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@
1212

1313
#include "render/renderer/platform/vulkan/Context.h"
1414
#include "render/renderer/platform/vulkan/utils/Device.h"
15+
#include "render/renderer/platform/vulkan/utils/TypeAdaptor.h"
1516

1617
namespace Siege::Buffer
1718
{
1819
// TODO: Wrap this in a static class 'BufferAllocator' so that we
1920
// don't need to keep a static instance.
2021

21-
void CreateBuffer(VkDeviceSize size,
22-
VkBufferUsageFlags usage,
23-
VkMemoryPropertyFlags properties,
22+
void CreateBuffer(unsigned long size,
23+
unsigned int usage,
24+
unsigned int properties,
2425
VkBuffer& buffer,
2526
VkDeviceMemory& bufferMemory)
2627
{
@@ -54,7 +55,7 @@ void CreateBuffer(VkDeviceSize size,
5455
vkBindBufferMemory(device, buffer, bufferMemory, 0);
5556
};
5657

57-
void CopyData(Buffer& dstBuffer, VkDeviceSize size, const void* bufferData, VkDeviceSize offset)
58+
void CopyData(Buffer& dstBuffer, unsigned long size, const void* bufferData, unsigned long offset)
5859
{
5960
auto device = Vulkan::Context::GetVkLogicalDevice();
6061

@@ -64,7 +65,7 @@ void CopyData(Buffer& dstBuffer, VkDeviceSize size, const void* bufferData, VkDe
6465
vkUnmapMemory(device, dstBuffer.bufferMemory);
6566
}
6667

67-
void AppendData(Buffer& dstBuffer, VkDeviceSize size, const void* bufferData)
68+
void AppendData(Buffer& dstBuffer, unsigned long size, const void* bufferData)
6869
{
6970
auto device = Vulkan::Context::GetVkLogicalDevice();
7071

@@ -76,7 +77,7 @@ void AppendData(Buffer& dstBuffer, VkDeviceSize size, const void* bufferData)
7677
dstBuffer.size = dstBuffer.size + size;
7778
}
7879

79-
void CopyBuffer(VkBuffer& srcBuffer, VkBuffer& dstBuffer, VkDeviceSize size)
80+
void CopyBuffer(VkBuffer& srcBuffer, VkBuffer& dstBuffer, unsigned long size)
8081
{
8182
Vulkan::Context::GetCurrentDevice()->CopyBuffer(srcBuffer, dstBuffer, size);
8283
}

engine/render/renderer/pass/RenderPass.cpp

Lines changed: 0 additions & 119 deletions
This file was deleted.

0 commit comments

Comments
 (0)