Skip to content

Commit 074bb1f

Browse files
IAmNotHanniIAmNotHanni
committed
[*] Move wrapper code for fence and semaphore into subfolder
1 parent 7e3af17 commit 074bb1f

File tree

8 files changed

+36
-19
lines changed

8 files changed

+36
-19
lines changed

‎include/inexor/vulkan-renderer/wrapper/commands/command_buffer.hpp‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "inexor/vulkan-renderer/wrapper/fence.hpp"
43
#include "inexor/vulkan-renderer/wrapper/gpu_memory_buffer.hpp"
4+
#include "inexor/vulkan-renderer/wrapper/synchronization/fence.hpp"
55

66
#include <cassert>
77
#include <memory>
@@ -10,14 +10,19 @@
1010

1111
namespace inexor::vulkan_renderer::wrapper {
1212
// Forward declaration
13-
class wrapper::Device;
13+
class Device;
1414
} // namespace inexor::vulkan_renderer::wrapper
1515

16+
namespace inexor::vulkan_renderer::wrapper::synchronization {
17+
// Forward declaration
18+
class Fence;
19+
} // namespace inexor::vulkan_renderer::wrapper::synchronization
20+
1621
namespace inexor::vulkan_renderer::wrapper::commands {
1722

1823
// Using declarations
1924
using wrapper::Device;
20-
using wrapper::Fence;
25+
using wrapper::synchronization::Fence;
2126

2227
/// @brief RAII wrapper class for VkCommandBuffer.
2328
/// @todo Make trivially copyable (this class doesn't really "own" the command buffer, more just an OOP wrapper).

‎include/inexor/vulkan-renderer/wrapper/swapchain.hpp‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
#pragma once
22

3-
#include "inexor/vulkan-renderer/wrapper/semaphore.hpp"
3+
#include "inexor/vulkan-renderer/wrapper/synchronization/semaphore.hpp"
44

55
#include <cstdint>
66
#include <limits>
77
#include <memory>
88
#include <optional>
99
#include <vector>
1010

11+
namespace inexor::vulkan_renderer::wrapper::synchronization {
12+
// Forward declaration
13+
class Semaphore;
14+
} // namespace inexor::vulkan_renderer::wrapper::synchronization
15+
1116
namespace inexor::vulkan_renderer::wrapper {
1217

13-
// Forward declarations
18+
// Forward declaration
1419
class Device;
15-
class Semaphore;
20+
21+
// Using declaration
22+
using synchronization::Semaphore;
1623

1724
/// RAII wrapper class for swapchains
1825
class Swapchain {

include/inexor/vulkan-renderer/wrapper/fence.hpp renamed to include/inexor/vulkan-renderer/wrapper/synchronization/fence.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
#include <string>
88

99
namespace inexor::vulkan_renderer::wrapper {
10-
1110
// Forward declaration
1211
class Device;
12+
} // namespace inexor::vulkan_renderer::wrapper
13+
14+
namespace inexor::vulkan_renderer::wrapper::synchronization {
1315

1416
/// @brief A RAII wrapper for VkFences.
1517
class Fence {
@@ -49,4 +51,4 @@ class Fence {
4951
[[nodiscard]] VkResult status() const;
5052
};
5153

52-
} // namespace inexor::vulkan_renderer::wrapper
54+
} // namespace inexor::vulkan_renderer::wrapper::synchronization

include/inexor/vulkan-renderer/wrapper/semaphore.hpp renamed to include/inexor/vulkan-renderer/wrapper/synchronization/semaphore.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
#include <string>
66

77
namespace inexor::vulkan_renderer::wrapper {
8-
98
// Forward declaration
109
class Device;
10+
} // namespace inexor::vulkan_renderer::wrapper
11+
12+
namespace inexor::vulkan_renderer::wrapper::synchronization {
1113

1214
/// RAII wrapper class for VkSemaphore
1315
class Semaphore {
@@ -32,4 +34,4 @@ class Semaphore {
3234
}
3335
};
3436

35-
} // namespace inexor::vulkan_renderer::wrapper
37+
} // namespace inexor::vulkan_renderer::wrapper::synchronization

‎src/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ set(INEXOR_SOURCE_FILES
2525
vulkan-renderer/wrapper/descriptor.cpp
2626
vulkan-renderer/wrapper/descriptor_builder.cpp
2727
vulkan-renderer/wrapper/device.cpp
28-
vulkan-renderer/wrapper/fence.cpp
2928
vulkan-renderer/wrapper/framebuffer.cpp
3029
vulkan-renderer/wrapper/gpu_memory_buffer.cpp
3130
vulkan-renderer/wrapper/gpu_texture.cpp
3231
vulkan-renderer/wrapper/image.cpp
3332
vulkan-renderer/wrapper/instance.cpp
3433
vulkan-renderer/wrapper/make_info.cpp
35-
vulkan-renderer/wrapper/semaphore.cpp
3634
vulkan-renderer/wrapper/shader.cpp
3735
vulkan-renderer/wrapper/swapchain.cpp
3836
vulkan-renderer/wrapper/uniform_buffer.cpp
@@ -43,6 +41,9 @@ set(INEXOR_SOURCE_FILES
4341
vulkan-renderer/wrapper/window/window.cpp
4442
vulkan-renderer/wrapper/window/surface.cpp
4543

44+
vulkan-renderer/wrapper/synchronization/fence.cpp
45+
vulkan-renderer/wrapper/synchronization/semaphore.cpp
46+
4647
vulkan-renderer/world/collision.cpp
4748
vulkan-renderer/world/collision_query.cpp
4849
vulkan-renderer/world/cube.cpp

‎src/vulkan-renderer/wrapper/swapchain.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "inexor/vulkan-renderer/tools/representation.hpp"
66
#include "inexor/vulkan-renderer/wrapper/device.hpp"
77
#include "inexor/vulkan-renderer/wrapper/make_info.hpp"
8-
#include "inexor/vulkan-renderer/wrapper/semaphore.hpp"
8+
#include "inexor/vulkan-renderer/wrapper/synchronization/semaphore.hpp"
99

1010
#include <spdlog/spdlog.h>
1111

src/vulkan-renderer/wrapper/fence.cpp renamed to src/vulkan-renderer/wrapper/synchronization/fence.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "inexor/vulkan-renderer/wrapper/fence.hpp"
1+
#include "inexor/vulkan-renderer/wrapper/synchronization/fence.hpp"
22

33
#include "inexor/vulkan-renderer/wrapper/device.hpp"
44
#include "inexor/vulkan-renderer/wrapper/make_info.hpp"
@@ -7,7 +7,7 @@
77
#include <stdexcept>
88
#include <utility>
99

10-
namespace inexor::vulkan_renderer::wrapper {
10+
namespace inexor::vulkan_renderer::wrapper::synchronization {
1111

1212
Fence::Fence(const Device &device, const std::string &name, const bool in_signaled_state)
1313
: m_device(device), m_name(name) {
@@ -42,4 +42,4 @@ VkResult Fence::status() const {
4242
return vkGetFenceStatus(m_device.device(), m_fence);
4343
}
4444

45-
} // namespace inexor::vulkan_renderer::wrapper
45+
} // namespace inexor::vulkan_renderer::wrapper::synchronization

src/vulkan-renderer/wrapper/semaphore.cpp renamed to src/vulkan-renderer/wrapper/synchronization/semaphore.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#include "inexor/vulkan-renderer/wrapper/semaphore.hpp"
1+
#include "inexor/vulkan-renderer/wrapper/synchronization/semaphore.hpp"
22

33
#include "inexor/vulkan-renderer/wrapper/device.hpp"
44
#include "inexor/vulkan-renderer/wrapper/make_info.hpp"
55

66
#include <cassert>
77
#include <utility>
88

9-
namespace inexor::vulkan_renderer::wrapper {
9+
namespace inexor::vulkan_renderer::wrapper::synchronization {
1010

1111
Semaphore::Semaphore(const Device &device, const std::string &name) : m_device(device), m_name(name) {
1212
assert(!name.empty());
@@ -22,4 +22,4 @@ Semaphore::~Semaphore() {
2222
vkDestroySemaphore(m_device.device(), m_semaphore, nullptr);
2323
}
2424

25-
} // namespace inexor::vulkan_renderer::wrapper
25+
} // namespace inexor::vulkan_renderer::wrapper::synchronization

0 commit comments

Comments
 (0)