diff options
| author | bunnei <bunneidev@gmail.com> | 2020-09-26 00:13:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-26 00:13:48 -0700 |
| commit | fbb5ca2633a95840a9a63351cdb131e701901d5c (patch) | |
| tree | 86c3d310d230ce60d3ad285fc6efab1a7d8c3a8f /src | |
| parent | 891090799c3256852f78b2fa2bcba36914875e6c (diff) | |
| parent | 940d85241bbd1f7fdbd65373e4c80b10025f8b1b (diff) | |
Merge pull request #4718 from lioncash/vk
vk_command_pool: Add missing header guard
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_command_pool.cpp | 5 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_command_pool.h | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/video_core/renderer_vulkan/vk_command_pool.cpp b/src/video_core/renderer_vulkan/vk_command_pool.cpp index f1abd4b1a8..6339f4fe09 100644 --- a/src/video_core/renderer_vulkan/vk_command_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_command_pool.cpp @@ -12,6 +12,11 @@ namespace Vulkan { constexpr size_t COMMAND_BUFFER_POOL_SIZE = 0x1000; +struct CommandPool::Pool { + vk::CommandPool handle; + vk::CommandBuffers cmdbufs; +}; + CommandPool::CommandPool(MasterSemaphore& master_semaphore, const VKDevice& device) : ResourcePool(master_semaphore, COMMAND_BUFFER_POOL_SIZE), device{device} {} diff --git a/src/video_core/renderer_vulkan/vk_command_pool.h b/src/video_core/renderer_vulkan/vk_command_pool.h index 3aee239b97..b9cb3fb5db 100644 --- a/src/video_core/renderer_vulkan/vk_command_pool.h +++ b/src/video_core/renderer_vulkan/vk_command_pool.h @@ -2,6 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#pragma once + #include <cstddef> #include <vector> @@ -16,17 +18,14 @@ class VKDevice; class CommandPool final : public ResourcePool { public: explicit CommandPool(MasterSemaphore& master_semaphore, const VKDevice& device); - virtual ~CommandPool(); + ~CommandPool() override; void Allocate(size_t begin, size_t end) override; VkCommandBuffer Commit(); private: - struct Pool { - vk::CommandPool handle; - vk::CommandBuffers cmdbufs; - }; + struct Pool; const VKDevice& device; std::vector<Pool> pools; |