Просмотр исходного кода

Merge pull request #4718 from lioncash/vk

vk_command_pool: Add missing header guard
bunnei 5 лет назад
Родитель
Сommit
fbb5ca2633

+ 5 - 0
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} {}
 

+ 4 - 5
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;