Skip to content

Commit 64ed155

Browse files
Shell4026Shell4026
committed
refact: Change Vulkan namespace impl to vk, VulkanSurface -> VulkanSwapChain
1 parent 5ab98f5 commit 64ed155

46 files changed

Lines changed: 361 additions & 338 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎include/External/imgui/backends/imgui_impl_vulkan.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
#define IMGUI_IMPL_VULKAN_HAS_DYNAMIC_RENDERING
6464
#endif
6565

66-
namespace sh::render::impl
66+
namespace sh::render::vk
6767
{
6868
class VulkanDescriptorPool;
6969
}
@@ -79,7 +79,7 @@ struct ImGui_ImplVulkan_InitInfo
7979
VkDevice Device;
8080
uint32_t QueueFamily;
8181
VkQueue Queue;
82-
sh::render::impl::VulkanDescriptorPool* DescriptorPool;
82+
sh::render::vk::VulkanDescriptorPool* DescriptorPool;
8383
// VkDescriptorPool DescriptorPool; // See requirements in note above
8484
VkRenderPass RenderPass; // Ignored if using dynamic rendering
8585
uint32_t MinImageCount; // >= 2

‎include/Game/ImGUImpl.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace sh::game
2323
{
2424
private:
2525
window::Window& window;
26-
render::VulkanRenderer& renderer;
26+
render::vk::VulkanRenderer& renderer;
2727

2828
ImDrawData drawData;
2929

@@ -33,7 +33,7 @@ namespace sh::game
3333
void WindowInit();
3434
public:
3535
//TODO: 다른 렌더러 구현
36-
SH_GAME_API ImGUImpl(window::Window& window, render::VulkanRenderer& renderer);
36+
SH_GAME_API ImGUImpl(window::Window& window, render::vk::VulkanRenderer& renderer);
3737
SH_GAME_API ~ImGUImpl();
3838
SH_GAME_API void Clean();
3939

‎include/Game/VulkanShaderBuilder.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <vector>
88

9-
namespace sh::render
9+
namespace sh::render::vk
1010
{
1111
class VulkanRenderer;
1212
}
@@ -15,9 +15,9 @@ namespace sh::game
1515
class VulkanShaderBuilder : public ShaderBuilder
1616
{
1717
private:
18-
render::VulkanRenderer& renderer;
18+
render::vk::VulkanRenderer& renderer;
1919
public:
20-
SH_GAME_API VulkanShaderBuilder(render::VulkanRenderer& renderer);
20+
SH_GAME_API VulkanShaderBuilder(render::vk::VulkanRenderer& renderer);
2121
SH_GAME_API ~VulkanShaderBuilder();
2222

2323
SH_GAME_API auto Build()->render::Shader* override;

‎include/Render/BufferFactory.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@ namespace sh::render
1010
class IBuffer;
1111
class IUniformBuffer;
1212
class Renderer;
13-
class VulkanRenderer;
13+
namespace vk
14+
{
15+
class VulkanRenderer;
16+
}
1417

1518
class BufferFactory
1619
{
1720
private:
18-
static auto CreateVkUniformBuffer(const VulkanRenderer& renderer, std::size_t size, bool bTransferDst) -> std::unique_ptr<IBuffer>;
21+
static auto CreateVkUniformBuffer(const vk::VulkanRenderer& renderer, std::size_t size, bool bTransferDst) -> std::unique_ptr<IBuffer>;
1922
public:
2023
SH_RENDER_API static auto Create(const Renderer& renderer, std::size_t size, bool bTransferDst = false) -> std::unique_ptr<IBuffer>;
2124
SH_RENDER_API static auto CreateUniformBuffer(const Renderer& renderer, const Shader& shader, Shader::UniformType type) -> std::unique_ptr<IUniformBuffer>;

‎include/Render/ITextureBuffer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77

88
namespace sh::render
99
{
10-
class VulkanRenderer;
10+
class Renderer;
1111
class Framebuffer;
1212

1313
class ITextureBuffer
1414
{
1515
public:
1616
SH_RENDER_API virtual ~ITextureBuffer() = default;
17-
SH_RENDER_API virtual void Create(const VulkanRenderer& renderer, const void* data, uint32_t width, uint32_t height, Texture::TextureFormat format) = 0;
17+
SH_RENDER_API virtual void Create(const Renderer& renderer, const void* data, uint32_t width, uint32_t height, Texture::TextureFormat format) = 0;
1818
SH_RENDER_API virtual void Create(const Framebuffer& framebuffer) = 0;
1919
SH_RENDER_API virtual void Clean() = 0;
2020
};

‎include/Render/VulkanImpl/VulkanBuffer.h‎

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,42 @@
55

66
#include "Render/Export.h"
77

8-
namespace sh::render
8+
namespace sh::render::vk
99
{
10-
namespace impl
10+
class VulkanBuffer : public IBuffer
1111
{
12-
class VulkanBuffer : public IBuffer
13-
{
14-
private:
15-
VkDevice device;
16-
VkPhysicalDevice gpu;
17-
VmaAllocator allocator;
18-
19-
VkBuffer buffer;
20-
VmaAllocation bufferMem;
21-
VkBufferCreateInfo bufferInfo;
22-
VkMemoryPropertyFlags memProperty;
23-
24-
size_t size;
25-
26-
void* data;
27-
bool persistentMapping; // 즉시 맵핑
28-
private:
29-
auto FindMemoryType(uint32_t typeFilter, VkMemoryPropertyFlags properties) -> uint32_t;
30-
public:
31-
SH_RENDER_API VulkanBuffer(VkDevice device, VkPhysicalDevice gpu, VmaAllocator allocator);
32-
SH_RENDER_API VulkanBuffer(const VulkanBuffer& other);
33-
SH_RENDER_API VulkanBuffer(VulkanBuffer&& other) noexcept;
34-
SH_RENDER_API ~VulkanBuffer();
35-
36-
SH_RENDER_API auto operator=(const VulkanBuffer& other) -> VulkanBuffer&;
37-
SH_RENDER_API auto operator=(VulkanBuffer&& other) noexcept -> VulkanBuffer&;
38-
39-
SH_RENDER_API auto Create(size_t size, VkBufferUsageFlags usageBits, VkSharingMode sharing, VkMemoryPropertyFlags memPropFlagBits, bool persistentMapping = false) -> VkResult;
40-
SH_RENDER_API void Clean();
41-
SH_RENDER_API void SetData(const void* data);
42-
SH_RENDER_API auto GetData() const -> void* override;
43-
SH_RENDER_API auto GetBuffer() const -> VkBuffer;
44-
SH_RENDER_API auto GetBufferInfo() const -> const VkBufferCreateInfo&;
45-
SH_RENDER_API auto GetBufferMemory() const -> VmaAllocation;
46-
SH_RENDER_API auto GetSize() const -> size_t;
47-
};
48-
}
12+
private:
13+
VkDevice device;
14+
VkPhysicalDevice gpu;
15+
VmaAllocator allocator;
16+
17+
VkBuffer buffer;
18+
VmaAllocation bufferMem;
19+
VkBufferCreateInfo bufferInfo;
20+
VkMemoryPropertyFlags memProperty;
21+
22+
size_t size;
23+
24+
void* data;
25+
bool persistentMapping; // 즉시 맵핑
26+
private:
27+
auto FindMemoryType(uint32_t typeFilter, VkMemoryPropertyFlags properties) -> uint32_t;
28+
public:
29+
SH_RENDER_API VulkanBuffer(VkDevice device, VkPhysicalDevice gpu, VmaAllocator allocator);
30+
SH_RENDER_API VulkanBuffer(const VulkanBuffer& other);
31+
SH_RENDER_API VulkanBuffer(VulkanBuffer&& other) noexcept;
32+
SH_RENDER_API ~VulkanBuffer();
33+
34+
SH_RENDER_API auto operator=(const VulkanBuffer& other)->VulkanBuffer&;
35+
SH_RENDER_API auto operator=(VulkanBuffer&& other) noexcept -> VulkanBuffer&;
36+
37+
SH_RENDER_API auto Create(size_t size, VkBufferUsageFlags usageBits, VkSharingMode sharing, VkMemoryPropertyFlags memPropFlagBits, bool persistentMapping = false) -> VkResult;
38+
SH_RENDER_API void Clean();
39+
SH_RENDER_API void SetData(const void* data);
40+
SH_RENDER_API auto GetData() const -> void* override;
41+
SH_RENDER_API auto GetBuffer() const->VkBuffer;
42+
SH_RENDER_API auto GetBufferInfo() const -> const VkBufferCreateInfo&;
43+
SH_RENDER_API auto GetBufferMemory() const->VmaAllocation;
44+
SH_RENDER_API auto GetSize() const->size_t;
45+
};
4946
}

‎include/Render/VulkanImpl/VulkanCommandBuffer.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
#include <functional>
99
#include <initializer_list>
1010

11-
namespace sh::render::impl {
11+
namespace sh::render::vk
12+
{
1213
class VulkanCommandBuffer : public core::INonCopyable
1314
{
1415
private:

‎include/Render/VulkanImpl/VulkanDescriptorPool.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <stack>
1010
#include <unordered_map>
1111

12-
namespace sh::render::impl
12+
namespace sh::render::vk
1313
{
1414
class VulkanDescriptorPool : core::INonCopyable
1515
{

‎include/Render/VulkanImpl/VulkanDrawable.h‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ namespace sh::render
1818
{
1919
class Framebuffer;
2020
class Shader;
21-
21+
}
22+
namespace sh::render::vk
23+
{
2224
class VulkanDrawable : public IDrawable
2325
{
2426
SCLASS(VulkanDrawable)
@@ -31,12 +33,12 @@ namespace sh::render
3133
Camera* camera;
3234

3335
//동기화 필요 목록
34-
core::SyncArray<impl::VulkanPipeline*> pipeline;
35-
core::SyncArray<core::SMap<uint32_t, std::unique_ptr<impl::VulkanBuffer>>> localVertBuffer;
36-
core::SyncArray<core::SMap<uint32_t, std::unique_ptr<impl::VulkanBuffer>>> localFragBuffer;
37-
core::SyncArray<std::unique_ptr<impl::VulkanUniformBuffer>> localDescSet;
36+
core::SyncArray<VulkanPipeline*> pipeline;
37+
core::SyncArray<core::SMap<uint32_t, std::unique_ptr<VulkanBuffer>>> localVertBuffer;
38+
core::SyncArray<core::SMap<uint32_t, std::unique_ptr<VulkanBuffer>>> localFragBuffer;
39+
core::SyncArray<std::unique_ptr<VulkanUniformBuffer>> localDescSet;
3840

39-
impl::VulkanPipeline::Topology topology = impl::VulkanPipeline::Topology::Triangle;
41+
VulkanPipeline::Topology topology = VulkanPipeline::Topology::Triangle;
4042

4143
bool bInit, bDirty, bBufferDirty, bPipelineDirty;
4244
protected:
@@ -61,9 +63,9 @@ namespace sh::render
6163
SH_RENDER_API auto GetMesh() const-> const Mesh* override;
6264
SH_RENDER_API auto GetCamera() const-> Camera* override;
6365

64-
SH_RENDER_API auto GetPipeline(core::ThreadType thr) const -> impl::VulkanPipeline*;
66+
SH_RENDER_API auto GetPipeline(core::ThreadType thr) const -> VulkanPipeline*;
6567

66-
SH_RENDER_API auto GetLocalUniformBuffer(core::ThreadType thr) const -> impl::VulkanUniformBuffer*;
68+
SH_RENDER_API auto GetLocalUniformBuffer(core::ThreadType thr) const -> VulkanUniformBuffer*;
6769
SH_RENDER_API auto GetDescriptorSet(core::ThreadType thr) const -> VkDescriptorSet;
6870

6971
SH_RENDER_API void SetDirty() override;

‎include/Render/VulkanImpl/VulkanFramebuffer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <vector>
1212
#include <memory>
1313

14-
namespace sh::render::impl
14+
namespace sh::render::vk
1515
{
1616
class VulkanFramebuffer : public Framebuffer
1717
{

0 commit comments

Comments
 (0)