rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-19 05:52:11 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Create transfer queue command pool if available

Browse Source
This commit is contained in:
Philip Rebohle 2019-06-28 00:36:25 +02:00
parent d8163c4446
commit 545cd52020
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/dxvk/dxvk_cmdlist.cpp
View File

@ -8,6 +8,9 @@ namespace dxvk {
m_vkd (device->vkd()), m_vkd (device->vkd()),
m_cmdBuffersUsed(0), m_cmdBuffersUsed(0),
m_descriptorPoolTracker(device) { m_descriptorPoolTracker(device) {
const auto& graphicsQueue = m_device->queues().graphics;
const auto& transferQueue = m_device->queues().transfer;
VkFenceCreateInfo fenceInfo; VkFenceCreateInfo fenceInfo;
fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
fenceInfo.pNext = nullptr; fenceInfo.pNext = nullptr;
@ -20,15 +23,22 @@ namespace dxvk {
poolInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; poolInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
poolInfo.pNext = nullptr; poolInfo.pNext = nullptr;
poolInfo.flags = 0; poolInfo.flags = 0;
poolInfo.queueFamilyIndex = device->queues().graphics.queueFamily; poolInfo.queueFamilyIndex = graphicsQueue.queueFamily;
if (m_vkd->vkCreateCommandPool(m_vkd->device(), &poolInfo, nullptr, &m_pool) != VK_SUCCESS) if (m_vkd->vkCreateCommandPool(m_vkd->device(), &poolInfo, nullptr, &m_graphicsPool) != VK_SUCCESS)
throw DxvkError("DxvkCommandList: Failed to create command pool"); throw DxvkError("DxvkCommandList: Failed to create graphics command pool");
if (m_device->hasDedicatedTransferQueue()) {
poolInfo.queueFamilyIndex = transferQueue.queueFamily;
if (m_vkd->vkCreateCommandPool(m_vkd->device(), &poolInfo, nullptr, &m_transferPool) != VK_SUCCESS)
throw DxvkError("DxvkCommandList: Failed to create transfer command pool");
}
VkCommandBufferAllocateInfo cmdInfo; VkCommandBufferAllocateInfo cmdInfo;
cmdInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; cmdInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
cmdInfo.pNext = nullptr; cmdInfo.pNext = nullptr;
cmdInfo.commandPool = m_pool; cmdInfo.commandPool = m_graphicsPool;
cmdInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; cmdInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
cmdInfo.commandBufferCount = 1; cmdInfo.commandBufferCount = 1;
@ -41,8 +51,10 @@ namespace dxvk {
DxvkCommandList::~DxvkCommandList() { DxvkCommandList::~DxvkCommandList() {
this->reset(); this->reset();
m_vkd->vkDestroyCommandPool(m_vkd->device(), m_pool, nullptr); m_vkd->vkDestroyCommandPool(m_vkd->device(), m_graphicsPool, nullptr);
m_vkd->vkDestroyFence (m_vkd->device(), m_fence, nullptr); m_vkd->vkDestroyCommandPool(m_vkd->device(), m_transferPool, nullptr);
m_vkd->vkDestroyFence(m_vkd->device(), m_fence, nullptr);
} }
@ -97,7 +109,8 @@ namespace dxvk {
info.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT; info.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
info.pInheritanceInfo = nullptr; info.pInheritanceInfo = nullptr;
if (m_vkd->vkResetCommandPool(m_vkd->device(), m_pool, 0) != VK_SUCCESS) if ((m_graphicsPool && m_vkd->vkResetCommandPool(m_vkd->device(), m_graphicsPool, 0) != VK_SUCCESS)
|| (m_transferPool && m_vkd->vkResetCommandPool(m_vkd->device(), m_transferPool, 0) != VK_SUCCESS))
Logger::err("DxvkCommandList: Failed to reset command buffer"); Logger::err("DxvkCommandList: Failed to reset command buffer");
if (m_vkd->vkBeginCommandBuffer(m_execBuffer, &info) != VK_SUCCESS if (m_vkd->vkBeginCommandBuffer(m_execBuffer, &info) != VK_SUCCESS

8
src/dxvk/dxvk_cmdlist.h
View File

@ -726,9 +726,11 @@ namespace dxvk {
VkFence m_fence; VkFence m_fence;
VkCommandPool m_pool; VkCommandPool m_graphicsPool = VK_NULL_HANDLE;
VkCommandBuffer m_execBuffer; VkCommandPool m_transferPool = VK_NULL_HANDLE;
VkCommandBuffer m_initBuffer;
VkCommandBuffer m_execBuffer = VK_NULL_HANDLE;
VkCommandBuffer m_initBuffer = VK_NULL_HANDLE;
DxvkCmdBufferFlags m_cmdBuffersUsed; DxvkCmdBufferFlags m_cmdBuffersUsed;
DxvkLifetimeTracker m_resources; DxvkLifetimeTracker m_resources;