Skip to content

Commit cbcd163

Browse files
TheMostDiligentTheMostDiligent
committed
Renamed objects in VulkanUtilities
VulkanCommandBuffer -> CommandBuffer VulkanCommandBufferPool -> CommandBufferPool VulkanInstance -> Instance VulkanLogicalDevice -> LogicalDevice VulkanMemoryManager -> MemoryManager VulkanPhysicalDevice -> PhysicalDevice VulkanSyncObjectManager -> SyncObjectManager
1 parent 9395024 commit cbcd163

74 files changed

Lines changed: 732 additions & 736 deletions

File tree

Some content is hidden

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

‎Graphics/GraphicsEngineVulkan/CMakeLists.txt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ set(INCLUDE
4949

5050
set(VULKAN_UTILS_INCLUDE
5151
include/VulkanUtilities/RenderingInfoWrapper.hpp
52-
include/VulkanUtilities/VulkanCommandBuffer.hpp
53-
include/VulkanUtilities/VulkanCommandBufferPool.hpp
54-
include/VulkanUtilities/VulkanDebug.hpp
55-
include/VulkanUtilities/VulkanInstance.hpp
56-
include/VulkanUtilities/VulkanLogicalDevice.hpp
57-
include/VulkanUtilities/VulkanMemoryManager.hpp
58-
include/VulkanUtilities/VulkanObjectWrappers.hpp
59-
include/VulkanUtilities/VulkanPhysicalDevice.hpp
60-
include/VulkanUtilities/VulkanSyncObjectManager.hpp
52+
include/VulkanUtilities/CommandBuffer.hpp
53+
include/VulkanUtilities/CommandBufferPool.hpp
54+
include/VulkanUtilities/Debug.hpp
55+
include/VulkanUtilities/Instance.hpp
56+
include/VulkanUtilities/LogicalDevice.hpp
57+
include/VulkanUtilities/MemoryManager.hpp
58+
include/VulkanUtilities/ObjectWrappers.hpp
59+
include/VulkanUtilities/PhysicalDevice.hpp
60+
include/VulkanUtilities/SyncObjectManager.hpp
6161
include/VulkanUtilities/VulkanHeaders.h
6262
)
6363

@@ -130,14 +130,14 @@ set(SRC
130130

131131
set(VULKAN_UTILS_SRC
132132
src/VulkanUtilities/RenderingInfoWrapper.cpp
133-
src/VulkanUtilities/VulkanCommandBuffer.cpp
134-
src/VulkanUtilities/VulkanCommandBufferPool.cpp
135-
src/VulkanUtilities/VulkanDebug.cpp
136-
src/VulkanUtilities/VulkanInstance.cpp
137-
src/VulkanUtilities/VulkanLogicalDevice.cpp
138-
src/VulkanUtilities/VulkanMemoryManager.cpp
139-
src/VulkanUtilities/VulkanPhysicalDevice.cpp
140-
src/VulkanUtilities/VulkanSyncObjectManager.cpp
133+
src/VulkanUtilities/CommandBuffer.cpp
134+
src/VulkanUtilities/CommandBufferPool.cpp
135+
src/VulkanUtilities/Debug.cpp
136+
src/VulkanUtilities/Instance.cpp
137+
src/VulkanUtilities/LogicalDevice.cpp
138+
src/VulkanUtilities/MemoryManager.cpp
139+
src/VulkanUtilities/PhysicalDevice.cpp
140+
src/VulkanUtilities/SyncObjectManager.cpp
141141
)
142142

143143
set(DLL_SOURCE

‎Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2022 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,8 +32,8 @@
3232

3333
#include "EngineVkImplTraits.hpp"
3434
#include "BottomLevelASBase.hpp"
35-
#include "VulkanUtilities/VulkanObjectWrappers.hpp"
36-
#include "VulkanUtilities/VulkanMemoryManager.hpp"
35+
#include "VulkanUtilities/ObjectWrappers.hpp"
36+
#include "VulkanUtilities/MemoryManager.hpp"
3737

3838
namespace Diligent
3939
{

‎Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2022 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,7 +32,7 @@
3232

3333
#include "EngineVkImplTraits.hpp"
3434
#include "BufferViewBase.hpp"
35-
#include "VulkanUtilities/VulkanObjectWrappers.hpp"
35+
#include "VulkanUtilities/ObjectWrappers.hpp"
3636

3737
namespace Diligent
3838
{

‎Graphics/GraphicsEngineVulkan/include/BufferVkImpl.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
#include "BufferViewVkImpl.hpp" // Required by BufferBase
3636

3737
#include "VulkanDynamicHeap.hpp"
38-
#include "VulkanUtilities/VulkanObjectWrappers.hpp"
39-
#include "VulkanUtilities/VulkanMemoryManager.hpp"
38+
#include "VulkanUtilities/ObjectWrappers.hpp"
39+
#include "VulkanUtilities/MemoryManager.hpp"
4040
#include "STDAllocator.hpp"
4141

4242
namespace Diligent

‎Graphics/GraphicsEngineVulkan/include/CommandPoolManager.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2022 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,8 +31,8 @@
3131
#include <mutex>
3232
#include <atomic>
3333
#include "STDAllocator.hpp"
34-
#include "VulkanUtilities/VulkanObjectWrappers.hpp"
35-
#include "VulkanUtilities/VulkanLogicalDevice.hpp"
34+
#include "VulkanUtilities/ObjectWrappers.hpp"
35+
#include "VulkanUtilities/LogicalDevice.hpp"
3636

3737
namespace Diligent
3838
{
@@ -42,10 +42,10 @@ class CommandPoolManager
4242
public:
4343
struct CreateInfo
4444
{
45-
const VulkanUtilities::VulkanLogicalDevice& LogicalDevice;
46-
std::string Name;
47-
const HardwareQueueIndex queueFamilyIndex;
48-
const VkCommandPoolCreateFlags flags;
45+
const VulkanUtilities::LogicalDevice& LogicalDevice;
46+
std::string Name;
47+
const HardwareQueueIndex queueFamilyIndex;
48+
const VkCommandPoolCreateFlags flags;
4949
};
5050

5151
CommandPoolManager(const CreateInfo& CI) noexcept;
@@ -75,7 +75,7 @@ class CommandPoolManager
7575
void RecycleCommandPool(VulkanUtilities::CommandPoolWrapper&& CmdPool);
7676

7777
private:
78-
const VulkanUtilities::VulkanLogicalDevice& m_LogicalDevice;
78+
const VulkanUtilities::LogicalDevice& m_LogicalDevice;
7979

8080
std::string m_Name;
8181
const HardwareQueueIndex m_QueueFamilyIndex;

‎Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.hpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2022 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,8 +39,8 @@
3939
#include "FenceVkImpl.hpp"
4040

4141
#include "VulkanUtilities/VulkanHeaders.h"
42-
#include "VulkanUtilities/VulkanLogicalDevice.hpp"
43-
#include "VulkanUtilities/VulkanSyncObjectManager.hpp"
42+
#include "VulkanUtilities/LogicalDevice.hpp"
43+
#include "VulkanUtilities/SyncObjectManager.hpp"
4444

4545

4646
namespace Diligent
@@ -50,11 +50,11 @@ class SyncPointVk final : public std::enable_shared_from_this<SyncPointVk>
5050
{
5151
private:
5252
friend class CommandQueueVkImpl;
53-
SyncPointVk(SoftwareQueueIndex CommandQueueId,
54-
Uint32 NumContexts,
55-
VulkanUtilities::VulkanSyncObjectManager& SyncObjectMngr,
56-
VkDevice LogicalDevice,
57-
Uint64 dbgValue);
53+
SyncPointVk(SoftwareQueueIndex CommandQueueId,
54+
Uint32 NumContexts,
55+
VulkanUtilities::SyncObjectManager& SyncObjectMngr,
56+
VkDevice LogicalDevice,
57+
Uint64 dbgValue);
5858

5959
void GetSemaphores(std::vector<VkSemaphore>& Semaphores);
6060

@@ -99,12 +99,12 @@ class CommandQueueVkImpl final : public ObjectBase<ICommandQueueVk>
9999
public:
100100
using TBase = ObjectBase<ICommandQueueVk>;
101101

102-
CommandQueueVkImpl(IReferenceCounters* pRefCounters,
103-
std::shared_ptr<VulkanUtilities::VulkanLogicalDevice> LogicalDevice,
104-
SoftwareQueueIndex CommandQueueId,
105-
Uint32 NumCommandQueues,
106-
Uint32 vkQueueIndex,
107-
const ImmediateContextCreateInfo& CreateInfo);
102+
CommandQueueVkImpl(IReferenceCounters* pRefCounters,
103+
std::shared_ptr<VulkanUtilities::LogicalDevice> LogicalDevice,
104+
SoftwareQueueIndex CommandQueueId,
105+
Uint32 NumCommandQueues,
106+
Uint32 vkQueueIndex,
107+
const ImmediateContextCreateInfo& CreateInfo);
108108
~CommandQueueVkImpl();
109109

110110
IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_CommandQueueVk, TBase)
@@ -160,7 +160,7 @@ class CommandQueueVkImpl final : public ObjectBase<ICommandQueueVk>
160160

161161
void InternalSignalSemaphore(VkSemaphore vkTimelineSemaphore, Uint64 Value);
162162

163-
std::shared_ptr<VulkanUtilities::VulkanLogicalDevice> m_LogicalDevice;
163+
std::shared_ptr<VulkanUtilities::LogicalDevice> m_LogicalDevice;
164164

165165
const VkQueue m_VkQueue;
166166
const HardwareQueueIndex m_QueueFamilyIndex;
@@ -189,8 +189,8 @@ class CommandQueueVkImpl final : public ObjectBase<ICommandQueueVk>
189189
// Fence and semaphores which were signaled when the last submitted commands have been completed.
190190
SyncPointVkPtr m_LastSyncPoint;
191191

192-
std::shared_ptr<VulkanUtilities::VulkanSyncObjectManager> m_SyncObjectManager;
193-
FixedBlockMemoryAllocator m_SyncPointAllocator;
192+
std::shared_ptr<VulkanUtilities::SyncObjectManager> m_SyncObjectManager;
193+
FixedBlockMemoryAllocator m_SyncPointAllocator;
194194
};
195195

196196
} // namespace Diligent

‎Graphics/GraphicsEngineVulkan/include/DescriptorPoolManager.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2022 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +35,7 @@
3535
#include <mutex>
3636
#include <atomic>
3737

38-
#include "VulkanUtilities/VulkanObjectWrappers.hpp"
38+
#include "VulkanUtilities/ObjectWrappers.hpp"
3939

4040
namespace Diligent
4141
{

‎Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
#include "ShaderResourceBindingVkImpl.hpp"
5050

5151
#include "PipelineLayoutVk.hpp"
52-
#include "VulkanUtilities/VulkanCommandBufferPool.hpp"
53-
#include "VulkanUtilities/VulkanCommandBuffer.hpp"
54-
#include "VulkanUtilities/VulkanSyncObjectManager.hpp"
52+
#include "VulkanUtilities/CommandBufferPool.hpp"
53+
#include "VulkanUtilities/CommandBuffer.hpp"
54+
#include "VulkanUtilities/SyncObjectManager.hpp"
5555
#include "VulkanUtilities/RenderingInfoWrapper.hpp"
5656
#include "VulkanUploadHeap.hpp"
5757
#include "VulkanDynamicHeap.hpp"
@@ -378,7 +378,7 @@ class DeviceContextVkImpl final : public DeviceContextNextGenBase<EngineVkImplTr
378378

379379
size_t GetNumCommandsInCtx() const { return m_State.NumCommands; }
380380

381-
__forceinline VulkanUtilities::VulkanCommandBuffer& GetCommandBuffer()
381+
__forceinline VulkanUtilities::CommandBuffer& GetCommandBuffer()
382382
{
383383
EnsureVkCmdBuffer();
384384
m_CommandBuffer.FlushBarriers();
@@ -497,7 +497,7 @@ class DeviceContextVkImpl final : public DeviceContextNextGenBase<EngineVkImplTr
497497
void ChooseRenderPassAndFramebuffer();
498498

499499
private:
500-
VulkanUtilities::VulkanCommandBuffer m_CommandBuffer;
500+
VulkanUtilities::CommandBuffer m_CommandBuffer;
501501

502502
struct ContextState
503503
{
@@ -636,9 +636,9 @@ class DeviceContextVkImpl final : public DeviceContextNextGenBase<EngineVkImplTr
636636
std::vector<MappedBuffer> m_MappedBuffers;
637637

638638
// Command pools for every queue family
639-
std::unique_ptr<std::unique_ptr<VulkanUtilities::VulkanCommandBufferPool>[]> m_QueueFamilyCmdPools;
639+
std::unique_ptr<std::unique_ptr<VulkanUtilities::CommandBufferPool>[]> m_QueueFamilyCmdPools;
640640
// Command pool for the family for which we are recording commands
641-
VulkanUtilities::VulkanCommandBufferPool* m_CmdPool = nullptr;
641+
VulkanUtilities::CommandBufferPool* m_CmdPool = nullptr;
642642

643643
VulkanUploadHeap m_UploadHeap;
644644
VulkanDynamicHeap m_DynamicHeap;

‎Graphics/GraphicsEngineVulkan/include/DeviceMemoryVkImpl.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2022 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
3232
#include "EngineVkImplTraits.hpp"
3333
#include "DeviceMemoryBase.hpp"
3434

35-
#include "VulkanUtilities/VulkanObjectWrappers.hpp"
35+
#include "VulkanUtilities/ObjectWrappers.hpp"
3636

3737
namespace Diligent
3838
{

‎Graphics/GraphicsEngineVulkan/include/FenceVkImpl.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2022 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,8 +35,8 @@
3535

3636
#include "EngineVkImplTraits.hpp"
3737
#include "FenceBase.hpp"
38-
#include "VulkanUtilities/VulkanObjectWrappers.hpp"
39-
#include "VulkanUtilities/VulkanSyncObjectManager.hpp"
38+
#include "VulkanUtilities/ObjectWrappers.hpp"
39+
#include "VulkanUtilities/SyncObjectManager.hpp"
4040

4141
namespace Diligent
4242
{

0 commit comments

Comments
 (0)