yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-19 16:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use vkResetCommandPool for vk_stagingCommandPool

Browse source
This commit is contained in:
Denis Pauk 2020-09-13 10:55:42 +03:00 committed by Yamagi
parent e6e2a45e87
commit 7be20ac1cd
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/client/refresh/vk/header/qvk.h
View file

@ -201,6 +201,7 @@ typedef enum
// Vulkan constants: command and dynamic buffer count // Vulkan constants: command and dynamic buffer count
#define NUM_CMDBUFFERS 2 #define NUM_CMDBUFFERS 2
#define NUM_DYNBUFFERS 2
// Vulkan instance // Vulkan instance
extern VkInstance vk_instance; extern VkInstance vk_instance;

2
src/client/refresh/vk/vk_cmd.c
View file

@ -68,7 +68,7 @@ VkResult QVk_CreateCommandPool(VkCommandPool *commandPool, uint32_t queueFamilyI
.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO,
.pNext = NULL, .pNext = NULL,
// allow the command pool to be explicitly reset without reallocating it manually during recording each frame // allow the command pool to be explicitly reset without reallocating it manually during recording each frame
.flags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT | VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, .flags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT,
.queueFamilyIndex = queueFamilyIndex .queueFamilyIndex = queueFamilyIndex
}; };

27
src/client/refresh/vk/vk_common.c
View file

@ -84,7 +84,7 @@ qvkrenderpass_t vk_renderpasses[RP_COUNT] = {
VkCommandPool vk_commandPool[NUM_CMDBUFFERS] = { VK_NULL_HANDLE, VK_NULL_HANDLE }; VkCommandPool vk_commandPool[NUM_CMDBUFFERS] = { VK_NULL_HANDLE, VK_NULL_HANDLE };
VkCommandPool vk_transferCommandPool = VK_NULL_HANDLE; VkCommandPool vk_transferCommandPool = VK_NULL_HANDLE;
VkDescriptorPool vk_descriptorPool = VK_NULL_HANDLE; VkDescriptorPool vk_descriptorPool = VK_NULL_HANDLE;
static VkCommandPool vk_stagingCommandPool = VK_NULL_HANDLE; static VkCommandPool vk_stagingCommandPool[NUM_DYNBUFFERS] = { VK_NULL_HANDLE, VK_NULL_HANDLE };
// Vulkan image views // Vulkan image views
VkImageView *vk_imageviews = NULL; VkImageView *vk_imageviews = NULL;
// Vulkan framebuffers // Vulkan framebuffers
@ -211,7 +211,6 @@ qvkbuffer_t vk_colorRectVbo;
qvkbuffer_t vk_rectIbo; qvkbuffer_t vk_rectIbo;
// global dynamic buffers (double buffered) // global dynamic buffers (double buffered)
#define NUM_DYNBUFFERS 2
static qvkbuffer_t vk_dynVertexBuffers[NUM_DYNBUFFERS]; static qvkbuffer_t vk_dynVertexBuffers[NUM_DYNBUFFERS];
static qvkbuffer_t vk_dynIndexBuffers[NUM_DYNBUFFERS]; static qvkbuffer_t vk_dynIndexBuffers[NUM_DYNBUFFERS];
static qvkbuffer_t vk_dynUniformBuffers[NUM_DYNBUFFERS]; static qvkbuffer_t vk_dynUniformBuffers[NUM_DYNBUFFERS];
@ -1083,7 +1082,7 @@ static void CreateStagingBuffer(VkDeviceSize size, qvkstagingbuffer_t *dstBuffer
VK_VERIFY(vkCreateFence(vk_device.logical, &fCreateInfo, VK_VERIFY(vkCreateFence(vk_device.logical, &fCreateInfo,
NULL, &dstBuffer->fence)); NULL, &dstBuffer->fence));
dstBuffer->cmdBuffer = QVk_CreateCommandBuffer(&vk_stagingCommandPool, dstBuffer->cmdBuffer = QVk_CreateCommandBuffer(&vk_stagingCommandPool[i],
VK_COMMAND_BUFFER_LEVEL_PRIMARY); VK_COMMAND_BUFFER_LEVEL_PRIMARY);
VK_VERIFY(QVk_BeginCommand(&dstBuffer->cmdBuffer)); VK_VERIFY(QVk_BeginCommand(&dstBuffer->cmdBuffer));
@ -1100,13 +1099,13 @@ static void CreateStagingBuffer(VkDeviceSize size, qvkstagingbuffer_t *dstBuffer
// internal helper // internal helper
static void CreateStagingBuffers() static void CreateStagingBuffers()
{ {
VK_VERIFY(QVk_CreateCommandPool(&vk_stagingCommandPool,
vk_device.gfxFamilyIndex));
QVk_DebugSetObjectName((uint64_t)vk_stagingCommandPool,
VK_OBJECT_TYPE_COMMAND_POOL, "Command Pool: Staging Buffers");
for (int i = 0; i < NUM_DYNBUFFERS; ++i) for (int i = 0; i < NUM_DYNBUFFERS; ++i)
{ {
VK_VERIFY(QVk_CreateCommandPool(&vk_stagingCommandPool[i],
vk_device.gfxFamilyIndex));
QVk_DebugSetObjectName((uint64_t)vk_stagingCommandPool[i],
VK_OBJECT_TYPE_COMMAND_POOL, va("Command Pool #%d: Staging", i));
CreateStagingBuffer(STAGING_BUFFER_MAXSIZE, &vk_stagingBuffers[i], i); CreateStagingBuffer(STAGING_BUFFER_MAXSIZE, &vk_stagingBuffers[i], i);
} }
} }
@ -1495,6 +1494,11 @@ void QVk_Shutdown( void )
QVk_FreeBuffer(&vk_dynVertexBuffers[i]); QVk_FreeBuffer(&vk_dynVertexBuffers[i]);
} }
DestroyStagingBuffer(&vk_stagingBuffers[i]); DestroyStagingBuffer(&vk_stagingBuffers[i]);
if (vk_stagingCommandPool[i] != VK_NULL_HANDLE)
{
vkDestroyCommandPool(vk_device.logical, vk_stagingCommandPool[i], NULL);
vk_stagingCommandPool[i] = VK_NULL_HANDLE;
}
} }
if (vk_descriptorPool != VK_NULL_HANDLE) if (vk_descriptorPool != VK_NULL_HANDLE)
vkDestroyDescriptorPool(vk_device.logical, vk_descriptorPool, NULL); vkDestroyDescriptorPool(vk_device.logical, vk_descriptorPool, NULL);
@ -1527,8 +1531,6 @@ void QVk_Shutdown( void )
} }
if (vk_transferCommandPool != VK_NULL_HANDLE) if (vk_transferCommandPool != VK_NULL_HANDLE)
vkDestroyCommandPool(vk_device.logical, vk_transferCommandPool, NULL); vkDestroyCommandPool(vk_device.logical, vk_transferCommandPool, NULL);
if (vk_stagingCommandPool != VK_NULL_HANDLE)
vkDestroyCommandPool(vk_device.logical, vk_stagingCommandPool, NULL);
DestroySamplers(); DestroySamplers();
DestroyFramebuffers(); DestroyFramebuffers();
DestroyImageViews(); DestroyImageViews();
@ -1564,7 +1566,6 @@ void QVk_Shutdown( void )
vk_samplerDescSetLayout = VK_NULL_HANDLE; vk_samplerDescSetLayout = VK_NULL_HANDLE;
vk_samplerLightmapDescSetLayout = VK_NULL_HANDLE; vk_samplerLightmapDescSetLayout = VK_NULL_HANDLE;
vk_transferCommandPool = VK_NULL_HANDLE; vk_transferCommandPool = VK_NULL_HANDLE;
vk_stagingCommandPool = VK_NULL_HANDLE;
vk_activeBufferIdx = 0; vk_activeBufferIdx = 0;
vk_imageIndex = 0; vk_imageIndex = 0;
} }
@ -2299,6 +2300,10 @@ uint8_t *QVk_GetStagingBuffer(VkDeviceSize size, int alignment, VkCommandBuffer
.pInheritanceInfo = NULL .pInheritanceInfo = NULL
}; };
// Command buffers are implicitly reset by vkBeginCommandBuffer if VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT is set - this is expensive.
// It's more efficient to reset entire pool instead and it also fixes the VK_VALIDATION_FEATURE_ENABLE_BEST_PRACTICES_EXT performance warning.
// see also: https://github.com/KhronosGroup/Vulkan-Samples/blob/master/samples/performance/command_buffer_usage/command_buffer_usage_tutorial.md
vkResetCommandPool(vk_device.logical, vk_stagingCommandPool[vk_activeStagingBuffer], 0);
VK_VERIFY(vkBeginCommandBuffer(stagingBuffer->cmdBuffer, &beginInfo)); VK_VERIFY(vkBeginCommandBuffer(stagingBuffer->cmdBuffer, &beginInfo));
} }
} }