=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: vkd3d: Use dedicated allocation for committed resources.
Alexandre Julliard
julliard at winehq.org
Thu Mar 28 18:33:18 CDT 2019
Module: vkd3d
Branch: master
Commit: ee673a9db5a239dcbd17b46313bb27c5acaea73d
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ee673a9db5a239dcbd17b46313bb27c5acaea73d
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Thu Mar 28 17:07:25 2019 +0100
vkd3d: Use dedicated allocation for committed resources.
Dedicated allocations may improve the performance.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d/device.c | 2 ++
libs/vkd3d/resource.c | 90 +++++++++++++++++++++++++++++++++++++++++-----
libs/vkd3d/vkd3d_private.h | 9 +++--
libs/vkd3d/vulkan_procs.h | 14 ++++++--
4 files changed, 102 insertions(+), 13 deletions(-)
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index bc5f370..8676434 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -126,6 +126,8 @@ static const char * const required_device_extensions[] =
static const struct vkd3d_optional_extension_info optional_device_extensions[] =
{
+ {VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_dedicated_allocation)},
+ {VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_get_memory_requirements2)},
{VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)},
{VK_EXT_DEBUG_MARKER_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_debug_marker)},
{VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME,
diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 1cfc9b3..8e16a85 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -74,7 +74,9 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32
static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device,
const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,
- const VkMemoryRequirements *memory_requirements, VkDeviceMemory *vk_memory, uint32_t *vk_memory_type)
+ const VkMemoryRequirements *memory_requirements,
+ const VkMemoryDedicatedAllocateInfo *dedicated_allocate_info,
+ VkDeviceMemory *vk_memory, uint32_t *vk_memory_type)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
VkMemoryAllocateInfo allocate_info;
@@ -84,7 +86,7 @@ static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device,
memory_requirements->size, memory_requirements->alignment);
allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
- allocate_info.pNext = NULL;
+ allocate_info.pNext = dedicated_allocate_info;
allocate_info.allocationSize = memory_requirements->size;
allocate_info.memoryTypeIndex = vkd3d_select_memory_type(device,
memory_requirements->memoryTypeBits, heap_properties, heap_flags);
@@ -404,7 +406,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap,
}
if (FAILED(hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties,
- heap->desc.Flags, &memory_requirements, &heap->vk_memory, &heap->vk_memory_type)))
+ heap->desc.Flags, &memory_requirements, NULL, &heap->vk_memory, &heap->vk_memory_type)))
{
vkd3d_private_store_destroy(&heap->private_store);
pthread_mutex_destroy(&heap->mutex);
@@ -673,13 +675,48 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu
VkDeviceMemory *vk_memory)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
- VkMemoryRequirements memory_requirements;
+ VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL;
+ VkMemoryDedicatedRequirements dedicated_requirements;
+ VkMemoryDedicatedAllocateInfo dedicated_info;
+ VkMemoryRequirements2 memory_requirements2;
+ VkMemoryRequirements *memory_requirements;
+ VkBufferMemoryRequirementsInfo2 info;
VkResult vr;
HRESULT hr;
- VK_CALL(vkGetBufferMemoryRequirements(device->vk_device, vk_buffer, &memory_requirements));
+ memory_requirements = &memory_requirements2.memoryRequirements;
+
+ if (device->vk_info.KHR_dedicated_allocation)
+ {
+ info.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2;
+ info.pNext = NULL;
+ info.buffer = vk_buffer;
+
+ dedicated_requirements.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS;
+ dedicated_requirements.pNext = NULL;
+
+ memory_requirements2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2;
+ memory_requirements2.pNext = &dedicated_requirements;
+
+ VK_CALL(vkGetBufferMemoryRequirements2KHR(device->vk_device, &info, &memory_requirements2));
+
+ if (dedicated_requirements.prefersDedicatedAllocation)
+ {
+ dedicated_allocation = &dedicated_info;
+
+ dedicated_info.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO;
+ dedicated_info.pNext = NULL;
+ dedicated_info.image = VK_NULL_HANDLE;
+ dedicated_info.buffer = vk_buffer;
+ }
+ }
+ else
+ {
+ VK_CALL(vkGetBufferMemoryRequirements(device->vk_device, vk_buffer, memory_requirements));
+ }
+
if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags,
- &memory_requirements, vk_memory, NULL)))
+ memory_requirements, dedicated_allocation, vk_memory, NULL)))
return hr;
if ((vr = VK_CALL(vkBindBufferMemory(device->vk_device, vk_buffer, *vk_memory, 0))) < 0)
@@ -697,13 +734,48 @@ static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage
VkDeviceMemory *vk_memory)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
- VkMemoryRequirements memory_requirements;
+ VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL;
+ VkMemoryDedicatedRequirements dedicated_requirements;
+ VkMemoryDedicatedAllocateInfo dedicated_info;
+ VkMemoryRequirements2 memory_requirements2;
+ VkMemoryRequirements *memory_requirements;
+ VkImageMemoryRequirementsInfo2 info;
VkResult vr;
HRESULT hr;
- VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, &memory_requirements));
+ memory_requirements = &memory_requirements2.memoryRequirements;
+
+ if (device->vk_info.KHR_dedicated_allocation)
+ {
+ info.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2;
+ info.pNext = NULL;
+ info.image = vk_image;
+
+ dedicated_requirements.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS;
+ dedicated_requirements.pNext = NULL;
+
+ memory_requirements2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2;
+ memory_requirements2.pNext = &dedicated_requirements;
+
+ VK_CALL(vkGetImageMemoryRequirements2KHR(device->vk_device, &info, &memory_requirements2));
+
+ if (dedicated_requirements.prefersDedicatedAllocation)
+ {
+ dedicated_allocation = &dedicated_info;
+
+ dedicated_info.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO;
+ dedicated_info.pNext = NULL;
+ dedicated_info.image = vk_image;
+ dedicated_info.buffer = VK_NULL_HANDLE;
+ }
+ }
+ else
+ {
+ VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, memory_requirements));
+ }
+
if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags,
- &memory_requirements, vk_memory, NULL)))
+ memory_requirements, dedicated_allocation, vk_memory, NULL)))
return hr;
if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, vk_image, *vk_memory, 0))) < 0)
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index ab66291..babe5db 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -83,11 +83,16 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN;
struct vkd3d_vulkan_info
{
- /* instance extensions */
+ /* KHR instance extensions */
bool KHR_get_physical_device_properties2;
+ /* EXT instance extensions */
bool EXT_debug_report;
- /* device extensions */
+
+ /* KHR device extensions */
+ bool KHR_dedicated_allocation;
+ bool KHR_get_memory_requirements2;
bool KHR_push_descriptor;
+ /* EXT device extensions */
bool EXT_debug_marker;
bool EXT_transform_feedback;
bool EXT_vertex_attribute_divisor;
diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h
index b62af4e..d176f24 100644
--- a/libs/vkd3d/vulkan_procs.h
+++ b/libs/vkd3d/vulkan_procs.h
@@ -46,9 +46,11 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties)
VK_INSTANCE_PFN(vkGetPhysicalDeviceProperties)
VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties)
VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties)
+
/* VK_KHR_get_physical_device_properties2 */
VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceFeatures2KHR)
VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceProperties2KHR)
+
/* VK_EXT_debug_report */
VK_INSTANCE_EXT_PFN(vkCreateDebugReportCallbackEXT)
VK_INSTANCE_EXT_PFN(vkDestroyDebugReportCallbackEXT)
@@ -174,10 +176,18 @@ VK_DEVICE_PFN(vkSetEvent)
VK_DEVICE_PFN(vkUnmapMemory)
VK_DEVICE_PFN(vkUpdateDescriptorSets)
VK_DEVICE_PFN(vkWaitForFences)
-/* VK_EXT_debug_marker */
-VK_DEVICE_EXT_PFN(vkDebugMarkerSetObjectNameEXT)
+
+/* VK_KHR_get_memory_requirements2 */
+VK_DEVICE_EXT_PFN(vkGetBufferMemoryRequirements2KHR)
+VK_DEVICE_EXT_PFN(vkGetImageMemoryRequirements2KHR)
+VK_DEVICE_EXT_PFN(vkGetImageSparseMemoryRequirements2KHR)
+
/* VK_KHR_push_descriptor */
VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR)
+
+/* VK_EXT_debug_marker */
+VK_DEVICE_EXT_PFN(vkDebugMarkerSetObjectNameEXT)
+
/* VK_EXT_transform_feedback */
VK_DEVICE_EXT_PFN(vkCmdBeginQueryIndexedEXT)
VK_DEVICE_EXT_PFN(vkCmdBeginTransformFeedbackEXT)
More information about the wine-cvs
mailing list