mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-29 13:11:06 +00:00
vkmemory: don't map memory more than once
vkMapMemory may not be called on a memory object that is already host-mapped. If the gstreamer memory object is mapped more than once then reuse the existing Vulkan mapping. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5917>
This commit is contained in:
parent
2c61fd92e2
commit
2388932767
3 changed files with 47 additions and 13 deletions
|
@ -4353,6 +4353,10 @@ It can be called from any thread.</doc>
|
||||||
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkmemory.h">number of times this memory is mapped</doc>
|
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkmemory.h">number of times this memory is mapped</doc>
|
||||||
<type name="guint" c:type="guint"/>
|
<type name="guint" c:type="guint"/>
|
||||||
</field>
|
</field>
|
||||||
|
<field name="mapping" version="1.24" writable="1">
|
||||||
|
<doc xml:space="preserve" filename="../subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkmemory.h">internal pointer to already mapped memory</doc>
|
||||||
|
<type name="gpointer" c:type="gpointer"/>
|
||||||
|
</field>
|
||||||
<field name="notify" readable="0" private="1">
|
<field name="notify" readable="0" private="1">
|
||||||
<type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
|
<type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
|
||||||
</field>
|
</field>
|
||||||
|
|
|
@ -77,6 +77,8 @@ _vk_mem_init (GstVulkanMemory * mem, GstAllocator * allocator,
|
||||||
mem->notify = notify;
|
mem->notify = notify;
|
||||||
mem->user_data = user_data;
|
mem->user_data = user_data;
|
||||||
mem->vk_offset = 0;
|
mem->vk_offset = 0;
|
||||||
|
mem->map_count = 0;
|
||||||
|
mem->mapping = NULL;
|
||||||
|
|
||||||
g_mutex_init (&mem->lock);
|
g_mutex_init (&mem->lock);
|
||||||
|
|
||||||
|
@ -122,19 +124,29 @@ _vk_mem_map_full (GstVulkanMemory * mem, GstMapInfo * info, gsize size)
|
||||||
VkResult err;
|
VkResult err;
|
||||||
GError *error = NULL;
|
GError *error = NULL;
|
||||||
|
|
||||||
|
g_mutex_lock (&mem->lock);
|
||||||
|
|
||||||
|
if (mem->map_count == 0) {
|
||||||
if ((mem->properties & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) {
|
if ((mem->properties & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) {
|
||||||
GST_CAT_ERROR (GST_CAT_VULKAN_MEMORY, "Cannot map host-invisible memory");
|
GST_CAT_ERROR (GST_CAT_VULKAN_MEMORY, "Cannot map host-invisible memory");
|
||||||
|
g_mutex_unlock (&mem->lock);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = vkMapMemory (mem->device->device, mem->mem_ptr, mem->vk_offset,
|
err = vkMapMemory (mem->device->device, mem->mem_ptr, mem->vk_offset,
|
||||||
size, 0, &data);
|
size, 0, &mem->mapping);
|
||||||
if (gst_vulkan_error_to_g_error (err, &error, "vkMapMemory") < 0) {
|
if (gst_vulkan_error_to_g_error (err, &error, "vkMapMemory") < 0) {
|
||||||
GST_CAT_ERROR (GST_CAT_VULKAN_MEMORY, "Failed to map device memory %s",
|
GST_CAT_ERROR (GST_CAT_VULKAN_MEMORY, "Failed to map device memory %s",
|
||||||
error->message);
|
error->message);
|
||||||
g_clear_error (&error);
|
g_clear_error (&error);
|
||||||
|
g_mutex_unlock (&mem->lock);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mem->map_count++;
|
||||||
|
data = mem->mapping;
|
||||||
|
g_mutex_unlock (&mem->lock);
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
@ -163,7 +175,16 @@ _vk_mem_unmap_full (GstVulkanMemory * mem, GstMapInfo * info)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
g_mutex_lock (&mem->lock);
|
||||||
|
|
||||||
|
g_assert (mem->map_count != 0);
|
||||||
|
mem->map_count--;
|
||||||
|
if (mem->map_count == 0) {
|
||||||
vkUnmapMemory (mem->device->device, mem->mem_ptr);
|
vkUnmapMemory (mem->device->device, mem->mem_ptr);
|
||||||
|
mem->mapping = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
g_mutex_unlock (&mem->lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
static GstMemory *
|
static GstMemory *
|
||||||
|
|
|
@ -53,12 +53,13 @@ GType gst_vulkan_memory_allocator_get_type(void);
|
||||||
#define GST_VULKAN_MEMORY_ALLOCATOR_NAME "Vulkan"
|
#define GST_VULKAN_MEMORY_ALLOCATOR_NAME "Vulkan"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GstVulkanMemory
|
* GstVulkanMemory:
|
||||||
* @mem: the parent #GstMemory
|
* @mem: the parent #GstMemory
|
||||||
* @device: the #GstVulkanDevice this memory is allocated from
|
* @device: the #GstVulkanDevice this memory is allocated from
|
||||||
* @mem_ptr: the vulkan memory handle
|
* @mem_ptr: the vulkan memory handle
|
||||||
* @lock: lock for accessing/changing memory informat
|
* @lock: lock for accessing/changing memory informat
|
||||||
* @map_count: number of times this memory is mapped
|
* @map_count: number of times this memory is mapped
|
||||||
|
* @mapping: internal pointer to already mapped memory
|
||||||
*
|
*
|
||||||
* Since: 1.18
|
* Since: 1.18
|
||||||
*/
|
*/
|
||||||
|
@ -73,6 +74,14 @@ struct _GstVulkanMemory
|
||||||
/* <protected> */
|
/* <protected> */
|
||||||
GMutex lock;
|
GMutex lock;
|
||||||
guint map_count;
|
guint map_count;
|
||||||
|
/**
|
||||||
|
* GstVulkanMemory.mapping:
|
||||||
|
*
|
||||||
|
* internal pointer to already mapped memory
|
||||||
|
*
|
||||||
|
* Since: 1.24
|
||||||
|
*/
|
||||||
|
gpointer mapping;
|
||||||
|
|
||||||
/* <private> */
|
/* <private> */
|
||||||
GDestroyNotify notify;
|
GDestroyNotify notify;
|
||||||
|
|
Loading…
Reference in a new issue