franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4718 from lioncash/vk 

vk_command_pool: Add missing header guard
This commit is contained in:
bunnei 2020-09-26 00:13:48 -07:00 committed by GitHub
parent 891090799c 940d85241b
commit fbb5ca2633
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_core/renderer_vulkan/vk_command_pool.cpp
View File

@ -12,6 +12,11 @@ namespace Vulkan {
constexpr size_t COMMAND_BUFFER_POOL_SIZE = 0x1000; 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) CommandPool::CommandPool(MasterSemaphore& master_semaphore, const VKDevice& device)
: ResourcePool(master_semaphore, COMMAND_BUFFER_POOL_SIZE), device{device} {} : ResourcePool(master_semaphore, COMMAND_BUFFER_POOL_SIZE), device{device} {}

9
src/video_core/renderer_vulkan/vk_command_pool.h
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#pragma once
#include <cstddef> #include <cstddef>
#include <vector> #include <vector>
@ -16,17 +18,14 @@ class VKDevice;
class CommandPool final : public ResourcePool { class CommandPool final : public ResourcePool {
public: public:
explicit CommandPool(MasterSemaphore& master_semaphore, const VKDevice& device); explicit CommandPool(MasterSemaphore& master_semaphore, const VKDevice& device);
virtual ~CommandPool(); ~CommandPool() override;
void Allocate(size_t begin, size_t end) override; void Allocate(size_t begin, size_t end) override;
VkCommandBuffer Commit(); VkCommandBuffer Commit();
private: private:
struct Pool { struct Pool;
vk::CommandPool handle;
vk::CommandBuffers cmdbufs;
};
const VKDevice& device; const VKDevice& device;
std::vector<Pool> pools; std::vector<Pool> pools;