Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Vulkan: Fix some inefficient command pool usage, might also fix a race condition

Browse source
This commit is contained in:
Henrik Rydgård 2017-08-18 17:09:35 +02:00
parent b9b2656e93
commit 750c124c33
2 changed files with 34 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
Common/Vulkan/VulkanContext.cpp
View file

@ -70,7 +70,6 @@ VulkanContext::VulkanContext(const char *app_name, int app_ver, uint32_t flags)
swapchain_format(VK_FORMAT_UNDEFINED),
swapchainImageCount(0),
swap_chain_(VK_NULL_HANDLE),
cmd_pool_(VK_NULL_HANDLE),
queue_count(0) {
if (!VulkanLoad()) {
init_error_ = "Failed to load Vulkan driver library";
@ -230,8 +229,14 @@ VkCommandBuffer VulkanContext::BeginFrame() {
// Process pending deletes.
frame->deleteList.PerformDeletes(device_);
// Reset both command buffers in one fell swoop.
// Note that on the first frame, there might already be commands so don't reset in that case.
if (!frame->hasInitCommands) {
vkResetCommandPool(device_, frame->cmdPool, 0);
}
VkCommandBufferBeginInfo begin = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
begin.flags = 0;
begin.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
begin.pInheritanceInfo = nullptr;
res = vkBeginCommandBuffer(frame->cmdBuf, &begin);
@ -341,29 +346,34 @@ void VulkanBeginCommandBuffer(VkCommandBuffer cmd) {
VkResult U_ASSERT_ONLY res;
VkCommandBufferBeginInfo cmd_buf_info = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
cmd_buf_info.pInheritanceInfo = nullptr;
cmd_buf_info.flags = 0;
cmd_buf_info.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
res = vkBeginCommandBuffer(cmd, &cmd_buf_info);
assert(res == VK_SUCCESS);
}
bool VulkanContext::InitObjects(bool depthPresent) {
InitQueue();
InitCommandPool();
// Create frame data
VkCommandBufferAllocateInfo cmd_alloc = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO };
cmd_alloc.commandPool = cmd_pool_;
cmd_alloc.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
cmd_alloc.commandBufferCount = MAX_INFLIGHT_FRAMES * 2;
VkCommandBuffer cmdBuf[MAX_INFLIGHT_FRAMES * 2];
VkResult res = vkAllocateCommandBuffers(device_, &cmd_alloc, cmdBuf);
assert(res == VK_SUCCESS);
for (int i = 0; i < MAX_INFLIGHT_FRAMES; i++) {
frame_[i].cmdBuf = cmdBuf[i * 2];
frame_[i].cmdInit = cmdBuf[i * 2 + 1];
VkResult U_ASSERT_ONLY res;
VkCommandPoolCreateInfo cmd_pool_info = { VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO };
cmd_pool_info.queueFamilyIndex = graphics_queue_family_index_;
cmd_pool_info.flags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT;
res = vkCreateCommandPool(device_, &cmd_pool_info, NULL, &frame_[i].cmdPool);
assert(res == VK_SUCCESS);
VkCommandBufferAllocateInfo cmd_alloc = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO };
cmd_alloc.commandPool = frame_[i].cmdPool;
cmd_alloc.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
cmd_alloc.commandBufferCount = 2;
VkCommandBuffer cmdBuf[2];
res = vkAllocateCommandBuffers(device_, &cmd_alloc, cmdBuf);
assert(res == VK_SUCCESS);
frame_[i].cmdBuf = cmdBuf[0];
frame_[i].cmdInit = cmdBuf[1];
frame_[i].fence = CreateFence(true); // So it can be instantly waited on
}
@ -382,13 +392,13 @@ bool VulkanContext::InitObjects(bool depthPresent) {
}
void VulkanContext::DestroyObjects() {
VkCommandBuffer *cmdBuf = new VkCommandBuffer[MAX_INFLIGHT_FRAMES * 2];
for (int i = 0; i < MAX_INFLIGHT_FRAMES; i++) {
cmdBuf[i * 2] = frame_[i].cmdBuf;
cmdBuf[i * 2 + 1] = frame_[i].cmdInit;
VkCommandBuffer cmdBuf[2];
cmdBuf[0] = frame_[i].cmdBuf;
cmdBuf[1] = frame_[i].cmdInit;
vkFreeCommandBuffers(device_, frame_[i].cmdPool, 2, cmdBuf);
vkDestroyCommandPool(device_, frame_[i].cmdPool, nullptr);
}
vkFreeCommandBuffers(device_, cmd_pool_, MAX_INFLIGHT_FRAMES * 2, cmdBuf);
delete[] cmdBuf;
for (int i = 0; i < MAX_INFLIGHT_FRAMES; i++) {
vkDestroyFence(device_, frame_[i].fence, nullptr);
}
@ -397,7 +407,6 @@ void VulkanContext::DestroyObjects() {
DestroySurfaceRenderPass();
DestroyDepthStencilBuffer();
DestroySwapChain();
DestroyCommandPool();
// If there happen to be any pending deletes, now is a good time.
for (int i = 0; i < ARRAY_SIZE(frame_); i++) {
@ -1201,17 +1210,6 @@ void VulkanContext::InitFramebuffers(bool include_depth) {
}
}
void VulkanContext::InitCommandPool() {
VkResult U_ASSERT_ONLY res;
VkCommandPoolCreateInfo cmd_pool_info = { VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO };
cmd_pool_info.queueFamilyIndex = graphics_queue_family_index_;
cmd_pool_info.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT | VK_COMMAND_POOL_CREATE_TRANSIENT_BIT;
res = vkCreateCommandPool(device_, &cmd_pool_info, NULL, &cmd_pool_);
assert(res == VK_SUCCESS);
}
VkFence VulkanContext::CreateFence(bool presignalled) {
VkFence fence;
VkFenceCreateInfo fenceInfo = { VK_STRUCTURE_TYPE_FENCE_CREATE_INFO };
@ -1225,12 +1223,6 @@ void VulkanContext::WaitAndResetFence(VkFence fence) {
vkResetFences(device_, 1, &fence);
}
void VulkanContext::DestroyCommandPool() {
if (cmd_pool_ != VK_NULL_HANDLE)
vkDestroyCommandPool(device_, cmd_pool_, NULL);
cmd_pool_ = VK_NULL_HANDLE;
}
void VulkanContext::DestroyDepthStencilBuffer() {
if (depth.view != VK_NULL_HANDLE)
vkDestroyImageView(device_, depth.view, NULL);

8
Common/Vulkan/VulkanContext.h
View file

@ -233,7 +233,6 @@ public:
void InitSurfaceRenderPass(bool include_depth, bool clear);
void InitFramebuffers(bool include_depth);
void InitDepthStencilBuffer(VkCommandBuffer cmd);
void InitCommandPool();
// Also destroys the surface.
void DestroyObjects();
@ -242,7 +241,6 @@ public:
void DestroyFramebuffers();
void DestroySwapChain();
void DestroyDepthStencilBuffer();
void DestroyCommandPool();
void DestroyDevice();
void WaitUntilQueueIdle();
@ -333,9 +331,6 @@ private:
ANativeWindow *native_window;
#endif // _WIN32
// TODO: Move to frame data
VkCommandPool cmd_pool_;
VkInstance instance_;
VkDevice device_;
VkQueue gfx_queue_;
@ -385,6 +380,9 @@ private:
VkFence fence;
bool hasInitCommands;
// TODO: Move to frame data
VkCommandPool cmdPool;
VkCommandBuffer cmdInit;
VkCommandBuffer cmdBuf;