mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-31 20:48:56 +00:00
vulkanupload: use GstVulkanOperation
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5079>
This commit is contained in:
Víctor Manuel Jáquez Leal
GStreamer Marge Bot
parent
a2f875251f
commit
11c8c002a5
1 changed files with 164 additions and 257 deletions
|
|
@ -382,8 +382,7 @@ struct BufferToImageUpload
|
|||
GstBufferPool *pool;
|
||||
gboolean pool_active;
|
||||
|
||||
GstVulkanCommandPool *cmd_pool;
|
||||
GstVulkanTrashList *trash_list;
|
||||
GstVulkanOperation *exec;
|
||||
};
|
||||
|
||||
static gpointer
|
||||
|
|
@ -392,7 +391,6 @@ _buffer_to_image_new_impl (GstVulkanUpload * upload)
|
|||
struct BufferToImageUpload *raw = g_new0 (struct BufferToImageUpload, 1);
|
||||
|
||||
raw->upload = upload;
|
||||
raw->trash_list = gst_vulkan_trash_fence_list_new ();
|
||||
|
||||
return raw;
|
||||
}
|
||||
|
|
@ -444,20 +442,20 @@ _buffer_to_image_perform (gpointer impl, GstBuffer * inbuf, GstBuffer ** outbuf)
|
|||
struct BufferToImageUpload *raw = impl;
|
||||
GstFlowReturn ret;
|
||||
GError *error = NULL;
|
||||
VkResult err;
|
||||
GstVulkanCommandBuffer *cmd_buf;
|
||||
guint i, n_mems;
|
||||
guint i, n_mems, n_planes;
|
||||
GArray *barriers = NULL;
|
||||
VkImageLayout dst_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
|
||||
|
||||
if (!raw->cmd_pool) {
|
||||
if (!(raw->cmd_pool =
|
||||
gst_vulkan_queue_create_command_pool (raw->upload->queue,
|
||||
&error))) {
|
||||
if (!raw->exec) {
|
||||
GstVulkanCommandPool *cmd_pool =
|
||||
gst_vulkan_queue_create_command_pool (raw->upload->queue, &error);
|
||||
if (!cmd_pool)
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
|
||||
if (!(cmd_buf = gst_vulkan_command_pool_create (raw->cmd_pool, &error)))
|
||||
goto error;
|
||||
raw->exec = gst_vulkan_operation_new (cmd_pool);
|
||||
gst_object_unref (cmd_pool);
|
||||
}
|
||||
|
||||
if (!raw->pool) {
|
||||
GstStructure *config;
|
||||
|
|
@ -480,30 +478,62 @@ _buffer_to_image_perform (gpointer impl, GstBuffer * inbuf, GstBuffer ** outbuf)
|
|||
NULL)) != GST_FLOW_OK)
|
||||
goto out;
|
||||
|
||||
{
|
||||
/* *INDENT-OFF* */
|
||||
VkCommandBufferBeginInfo cmd_buf_info = {
|
||||
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
|
||||
.pNext = NULL,
|
||||
.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
|
||||
.pInheritanceInfo = NULL
|
||||
};
|
||||
/* *INDENT-ON* */
|
||||
if (!gst_vulkan_operation_add_dependency_frame (raw->exec, *outbuf,
|
||||
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT))
|
||||
goto error;
|
||||
|
||||
gst_vulkan_command_buffer_lock (cmd_buf);
|
||||
err = vkBeginCommandBuffer (cmd_buf->cmd, &cmd_buf_info);
|
||||
if (gst_vulkan_error_to_g_error (err, &error, "vkBeginCommandBuffer") < 0)
|
||||
goto unlock_error;
|
||||
if (!gst_vulkan_operation_begin (raw->exec, &error))
|
||||
goto error;
|
||||
|
||||
cmd_buf = raw->exec->cmd_buf;
|
||||
|
||||
if (!gst_vulkan_operation_add_frame_barrier (raw->exec, *outbuf,
|
||||
VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_TRANSFER_WRITE_BIT,
|
||||
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, NULL))
|
||||
goto unlock_error;
|
||||
|
||||
barriers = gst_vulkan_operation_retrieve_image_barriers (raw->exec);
|
||||
if (barriers->len == 0) {
|
||||
ret = GST_FLOW_ERROR;
|
||||
goto unlock_error;
|
||||
}
|
||||
|
||||
if (gst_vulkan_operation_use_sync2 (raw->exec)) {
|
||||
#if defined(VK_KHR_synchronization2)
|
||||
VkDependencyInfoKHR dependency_info = {
|
||||
.sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR,
|
||||
.pImageMemoryBarriers = (gpointer) barriers->data,
|
||||
.imageMemoryBarrierCount = barriers->len,
|
||||
};
|
||||
|
||||
gst_vulkan_operation_pipeline_barrier2 (raw->exec, &dependency_info);
|
||||
dst_layout =
|
||||
g_array_index (barriers, VkImageMemoryBarrier2KHR, 0).newLayout;
|
||||
#endif
|
||||
} else {
|
||||
gst_vulkan_command_buffer_lock (cmd_buf);
|
||||
vkCmdPipelineBarrier (cmd_buf->cmd, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
|
||||
VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 0, NULL,
|
||||
barriers->len, (gpointer) barriers->data);
|
||||
gst_vulkan_command_buffer_unlock (cmd_buf);
|
||||
|
||||
dst_layout = g_array_index (barriers, VkImageMemoryBarrier, 0).newLayout;
|
||||
}
|
||||
g_clear_pointer (&barriers, g_array_unref);
|
||||
|
||||
n_mems = gst_buffer_n_memory (*outbuf);
|
||||
for (i = 0; i < n_mems; i++) {
|
||||
n_planes = GST_VIDEO_INFO_N_PLANES (&raw->out_info);
|
||||
|
||||
for (i = 0; i < n_planes; i++) {
|
||||
VkBufferImageCopy region;
|
||||
GstMemory *in_mem, *out_mem;
|
||||
GstVulkanBufferMemory *buf_mem;
|
||||
GstVulkanImageMemory *img_mem;
|
||||
VkImageMemoryBarrier image_memory_barrier;
|
||||
VkBufferMemoryBarrier buffer_memory_barrier;
|
||||
const VkImageAspectFlags aspects[] = { VK_IMAGE_ASPECT_PLANE_0_BIT,
|
||||
VK_IMAGE_ASPECT_PLANE_1_BIT, VK_IMAGE_ASPECT_PLANE_2_BIT,
|
||||
};
|
||||
VkImageAspectFlags plane_aspect;
|
||||
guint idx;
|
||||
|
||||
in_mem = gst_buffer_peek_memory (inbuf, i);
|
||||
if (!gst_is_vulkan_buffer_memory (in_mem)) {
|
||||
|
|
@ -512,12 +542,10 @@ _buffer_to_image_perform (gpointer impl, GstBuffer * inbuf, GstBuffer ** outbuf)
|
|||
}
|
||||
buf_mem = (GstVulkanBufferMemory *) in_mem;
|
||||
|
||||
out_mem = gst_buffer_peek_memory (*outbuf, i);
|
||||
if (!gst_is_vulkan_image_memory (out_mem)) {
|
||||
GST_WARNING_OBJECT (raw->upload, "Output is not a GstVulkanImageMemory");
|
||||
goto unlock_error;
|
||||
}
|
||||
img_mem = (GstVulkanImageMemory *) out_mem;
|
||||
if (n_planes == n_mems)
|
||||
plane_aspect = VK_IMAGE_ASPECT_COLOR_BIT;
|
||||
else
|
||||
plane_aspect = aspects[i];
|
||||
|
||||
/* *INDENT-OFF* */
|
||||
region = (VkBufferImageCopy) {
|
||||
|
|
@ -525,7 +553,7 @@ _buffer_to_image_perform (gpointer impl, GstBuffer * inbuf, GstBuffer ** outbuf)
|
|||
.bufferRowLength = GST_VIDEO_INFO_COMP_WIDTH (&raw->in_info, i),
|
||||
.bufferImageHeight = GST_VIDEO_INFO_COMP_HEIGHT (&raw->in_info, i),
|
||||
.imageSubresource = {
|
||||
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
|
||||
.aspectMask = plane_aspect,
|
||||
.mipLevel = 0,
|
||||
.baseArrayLayer = 0,
|
||||
.layerCount = 1,
|
||||
|
|
@ -538,103 +566,31 @@ _buffer_to_image_perform (gpointer impl, GstBuffer * inbuf, GstBuffer ** outbuf)
|
|||
}
|
||||
};
|
||||
|
||||
image_memory_barrier = (VkImageMemoryBarrier) {
|
||||
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
|
||||
.pNext = NULL,
|
||||
.srcAccessMask = img_mem->barrier.parent.access_flags,
|
||||
.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
|
||||
.oldLayout = img_mem->barrier.image_layout,
|
||||
.newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
|
||||
/* FIXME: implement exclusive transfers */
|
||||
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
|
||||
.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
|
||||
.image = img_mem->image,
|
||||
.subresourceRange = img_mem->barrier.subresource_range
|
||||
};
|
||||
|
||||
buffer_memory_barrier = (VkBufferMemoryBarrier) {
|
||||
.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
|
||||
.pNext = NULL,
|
||||
.srcAccessMask = buf_mem->barrier.parent.access_flags,
|
||||
.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
|
||||
/* FIXME: implement exclusive transfers */
|
||||
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
|
||||
.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
|
||||
.buffer = buf_mem->buffer,
|
||||
.offset = region.bufferOffset,
|
||||
.size = region.bufferRowLength * region.bufferImageHeight
|
||||
};
|
||||
/* *INDENT-ON* */
|
||||
|
||||
vkCmdPipelineBarrier (cmd_buf->cmd,
|
||||
buf_mem->barrier.parent.pipeline_stages | img_mem->barrier.
|
||||
parent.pipeline_stages, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 1,
|
||||
&buffer_memory_barrier, 1, &image_memory_barrier);
|
||||
|
||||
buf_mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_TRANSFER_BIT;
|
||||
buf_mem->barrier.parent.access_flags = buffer_memory_barrier.dstAccessMask;
|
||||
|
||||
img_mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_TRANSFER_BIT;
|
||||
img_mem->barrier.parent.access_flags = image_memory_barrier.dstAccessMask;
|
||||
img_mem->barrier.image_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
|
||||
idx = MIN (i, n_mems - 1);
|
||||
out_mem = gst_buffer_peek_memory (*outbuf, idx);
|
||||
if (!gst_is_vulkan_image_memory (out_mem)) {
|
||||
GST_WARNING_OBJECT (raw->upload, "Output is not a GstVulkanImageMemory");
|
||||
goto unlock_error;
|
||||
}
|
||||
img_mem = (GstVulkanImageMemory *) out_mem;
|
||||
|
||||
gst_vulkan_command_buffer_lock (cmd_buf);
|
||||
vkCmdCopyBufferToImage (cmd_buf->cmd, buf_mem->buffer, img_mem->image,
|
||||
img_mem->barrier.image_layout, 1, ®ion);
|
||||
dst_layout, 1, ®ion);
|
||||
gst_vulkan_command_buffer_unlock (cmd_buf);
|
||||
}
|
||||
|
||||
err = vkEndCommandBuffer (cmd_buf->cmd);
|
||||
gst_vulkan_command_buffer_unlock (cmd_buf);
|
||||
if (gst_vulkan_error_to_g_error (err, &error, "vkEndCommandBuffer") < 0)
|
||||
if (!gst_vulkan_operation_end (raw->exec, &error))
|
||||
goto error;
|
||||
|
||||
{
|
||||
VkSubmitInfo submit_info = { 0, };
|
||||
VkPipelineStageFlags stages = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
|
||||
GstVulkanFence *fence;
|
||||
|
||||
/* *INDENT-OFF* */
|
||||
submit_info = (VkSubmitInfo) {
|
||||
.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
|
||||
.pNext = NULL,
|
||||
.waitSemaphoreCount = 0,
|
||||
.pWaitSemaphores = NULL,
|
||||
.pWaitDstStageMask = &stages,
|
||||
.commandBufferCount = 1,
|
||||
.pCommandBuffers = &cmd_buf->cmd,
|
||||
.signalSemaphoreCount = 0,
|
||||
.pSignalSemaphores = NULL
|
||||
};
|
||||
/* *INDENT-ON* */
|
||||
|
||||
fence = gst_vulkan_device_create_fence (raw->upload->device, &error);
|
||||
if (!fence)
|
||||
goto error;
|
||||
|
||||
err =
|
||||
vkQueueSubmit (raw->upload->queue->queue, 1, &submit_info,
|
||||
GST_VULKAN_FENCE_FENCE (fence));
|
||||
if (gst_vulkan_error_to_g_error (err, &error, "vkQueueSubmit") < 0)
|
||||
goto error;
|
||||
|
||||
gst_vulkan_trash_list_add (raw->trash_list,
|
||||
gst_vulkan_trash_list_acquire (raw->trash_list, fence,
|
||||
gst_vulkan_trash_mini_object_unref,
|
||||
GST_MINI_OBJECT_CAST (cmd_buf)));
|
||||
gst_vulkan_fence_unref (fence);
|
||||
}
|
||||
|
||||
gst_vulkan_trash_list_gc (raw->trash_list);
|
||||
|
||||
ret = GST_FLOW_OK;
|
||||
|
||||
out:
|
||||
return ret;
|
||||
|
||||
unlock_error:
|
||||
if (cmd_buf) {
|
||||
gst_vulkan_command_buffer_unlock (cmd_buf);
|
||||
gst_vulkan_command_buffer_unref (cmd_buf);
|
||||
}
|
||||
gst_vulkan_operation_reset (raw->exec);
|
||||
|
||||
error:
|
||||
if (error) {
|
||||
GST_WARNING_OBJECT (raw->upload, "Error: %s", error->message);
|
||||
|
|
@ -659,15 +615,14 @@ _buffer_to_image_free (gpointer impl)
|
|||
raw->pool = NULL;
|
||||
}
|
||||
|
||||
if (raw->cmd_pool)
|
||||
gst_object_unref (raw->cmd_pool);
|
||||
raw->cmd_pool = NULL;
|
||||
|
||||
if (!gst_vulkan_trash_list_wait (raw->trash_list, -1))
|
||||
GST_WARNING_OBJECT (raw->upload,
|
||||
"Failed to wait for all fences to complete " "before shutting down");
|
||||
gst_object_unref (raw->trash_list);
|
||||
raw->trash_list = NULL;
|
||||
if (raw->exec) {
|
||||
if (!gst_vulkan_operation_wait (raw->exec)) {
|
||||
GST_WARNING_OBJECT (raw->upload,
|
||||
"Failed to wait for all fences to complete before shutting down");
|
||||
}
|
||||
gst_object_unref (raw->exec);
|
||||
raw->exec = NULL;
|
||||
}
|
||||
|
||||
g_free (impl);
|
||||
}
|
||||
|
|
@ -702,8 +657,7 @@ struct RawToImageUpload
|
|||
GstBufferPool *in_pool;
|
||||
gboolean in_pool_active;
|
||||
|
||||
GstVulkanCommandPool *cmd_pool;
|
||||
GstVulkanTrashList *trash_list;
|
||||
GstVulkanOperation *exec;
|
||||
};
|
||||
|
||||
static gpointer
|
||||
|
|
@ -712,7 +666,6 @@ _raw_to_image_new_impl (GstVulkanUpload * upload)
|
|||
struct RawToImageUpload *raw = g_new0 (struct RawToImageUpload, 1);
|
||||
|
||||
raw->upload = upload;
|
||||
raw->trash_list = gst_vulkan_trash_fence_list_new ();
|
||||
|
||||
return raw;
|
||||
}
|
||||
|
|
@ -775,20 +728,18 @@ _raw_to_image_perform (gpointer impl, GstBuffer * inbuf, GstBuffer ** outbuf)
|
|||
GstBuffer *in_vk_copy = NULL;
|
||||
GstVulkanCommandBuffer *cmd_buf;
|
||||
GError *error = NULL;
|
||||
VkResult err;
|
||||
guint i, n_mems;
|
||||
GArray *barriers = NULL;
|
||||
guint i, n_mems, n_planes;
|
||||
VkImageLayout dst_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
|
||||
|
||||
if (!raw->cmd_pool) {
|
||||
if (!(raw->cmd_pool =
|
||||
gst_vulkan_queue_create_command_pool (raw->upload->queue,
|
||||
&error))) {
|
||||
goto error;
|
||||
}
|
||||
if (!raw->exec) {
|
||||
GstVulkanCommandPool *cmd_pool =
|
||||
gst_vulkan_queue_create_command_pool (raw->upload->queue, &error);
|
||||
|
||||
raw->exec = gst_vulkan_operation_new (cmd_pool);
|
||||
gst_object_unref (cmd_pool);
|
||||
}
|
||||
|
||||
if (!(cmd_buf = gst_vulkan_command_pool_create (raw->cmd_pool, &error)))
|
||||
goto error;
|
||||
|
||||
if (!raw->pool) {
|
||||
GstStructure *config;
|
||||
guint min = 0, max = 0;
|
||||
|
|
@ -810,30 +761,62 @@ _raw_to_image_perform (gpointer impl, GstBuffer * inbuf, GstBuffer ** outbuf)
|
|||
NULL)) != GST_FLOW_OK)
|
||||
goto out;
|
||||
|
||||
{
|
||||
/* *INDENT-OFF* */
|
||||
VkCommandBufferBeginInfo cmd_buf_info = {
|
||||
.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
|
||||
.pNext = NULL,
|
||||
.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
|
||||
.pInheritanceInfo = NULL
|
||||
};
|
||||
/* *INDENT-ON* */
|
||||
if (!gst_vulkan_operation_begin (raw->exec, &error))
|
||||
goto error;
|
||||
|
||||
gst_vulkan_command_buffer_lock (cmd_buf);
|
||||
err = vkBeginCommandBuffer (cmd_buf->cmd, &cmd_buf_info);
|
||||
if (gst_vulkan_error_to_g_error (err, &error, "vkBeginCommandBuffer") < 0)
|
||||
return FALSE;
|
||||
if (!gst_vulkan_operation_add_dependency_frame (raw->exec, *outbuf,
|
||||
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT))
|
||||
goto unlock_error;
|
||||
|
||||
cmd_buf = raw->exec->cmd_buf;
|
||||
|
||||
if (!gst_vulkan_operation_add_frame_barrier (raw->exec, *outbuf,
|
||||
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
|
||||
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, NULL))
|
||||
goto unlock_error;
|
||||
|
||||
barriers = gst_vulkan_operation_retrieve_image_barriers (raw->exec);
|
||||
if (barriers->len == 0) {
|
||||
ret = GST_FLOW_ERROR;
|
||||
goto unlock_error;
|
||||
}
|
||||
|
||||
if (gst_vulkan_operation_use_sync2 (raw->exec)) {
|
||||
#if defined(VK_KHR_synchronization2)
|
||||
VkDependencyInfoKHR dependency_info = {
|
||||
.sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR,
|
||||
.pImageMemoryBarriers = (gpointer) barriers->data,
|
||||
.imageMemoryBarrierCount = barriers->len,
|
||||
};
|
||||
|
||||
gst_vulkan_operation_pipeline_barrier2 (raw->exec, &dependency_info);
|
||||
dst_layout =
|
||||
g_array_index (barriers, VkImageMemoryBarrier2KHR, 0).newLayout;
|
||||
#endif
|
||||
} else {
|
||||
gst_vulkan_command_buffer_lock (cmd_buf);
|
||||
vkCmdPipelineBarrier (cmd_buf->cmd, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
|
||||
VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 0, NULL,
|
||||
barriers->len, (gpointer) barriers->data);
|
||||
gst_vulkan_command_buffer_unlock (cmd_buf);
|
||||
|
||||
dst_layout = g_array_index (barriers, VkImageMemoryBarrier, 0).newLayout;
|
||||
}
|
||||
g_clear_pointer (&barriers, g_array_unref);
|
||||
|
||||
n_mems = gst_buffer_n_memory (*outbuf);
|
||||
n_planes = GST_VIDEO_INFO_N_PLANES (&raw->out_info);
|
||||
|
||||
for (i = 0; i < n_mems; i++) {
|
||||
VkBufferImageCopy region;
|
||||
GstMemory *in_mem, *out_mem;
|
||||
GstVulkanBufferMemory *buf_mem;
|
||||
GstVulkanImageMemory *img_mem;
|
||||
VkImageMemoryBarrier image_memory_barrier;
|
||||
VkBufferMemoryBarrier buffer_memory_barrier;
|
||||
const VkImageAspectFlags aspects[] = { VK_IMAGE_ASPECT_PLANE_0_BIT,
|
||||
VK_IMAGE_ASPECT_PLANE_1_BIT, VK_IMAGE_ASPECT_PLANE_2_BIT,
|
||||
};
|
||||
VkImageAspectFlags plane_aspect;
|
||||
guint idx;
|
||||
|
||||
in_mem = gst_buffer_peek_memory (inbuf, i);
|
||||
if (gst_is_vulkan_buffer_memory (in_mem)) {
|
||||
|
|
@ -898,20 +881,26 @@ _raw_to_image_perform (gpointer impl, GstBuffer * inbuf, GstBuffer ** outbuf)
|
|||
buf_mem = (GstVulkanBufferMemory *) in_mem;
|
||||
}
|
||||
|
||||
out_mem = gst_buffer_peek_memory (*outbuf, i);
|
||||
idx = MIN (i, n_mems - 1);
|
||||
out_mem = gst_buffer_peek_memory (*outbuf, idx);
|
||||
if (!gst_is_vulkan_image_memory (out_mem)) {
|
||||
GST_WARNING_OBJECT (raw->upload, "Output is not a GstVulkanImageMemory");
|
||||
goto unlock_error;
|
||||
}
|
||||
img_mem = (GstVulkanImageMemory *) out_mem;
|
||||
|
||||
if (n_planes == n_mems)
|
||||
plane_aspect = VK_IMAGE_ASPECT_COLOR_BIT;
|
||||
else
|
||||
plane_aspect = aspects[i];
|
||||
|
||||
/* *INDENT-OFF* */
|
||||
region = (VkBufferImageCopy) {
|
||||
.bufferOffset = 0,
|
||||
.bufferRowLength = GST_VIDEO_INFO_COMP_WIDTH (&raw->in_info, i),
|
||||
.bufferImageHeight = GST_VIDEO_INFO_COMP_HEIGHT (&raw->in_info, i),
|
||||
.imageSubresource = {
|
||||
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
|
||||
.aspectMask = plane_aspect,
|
||||
.mipLevel = 0,
|
||||
.baseArrayLayer = 0,
|
||||
.layerCount = 1,
|
||||
|
|
@ -923,95 +912,16 @@ _raw_to_image_perform (gpointer impl, GstBuffer * inbuf, GstBuffer ** outbuf)
|
|||
.depth = 1,
|
||||
}
|
||||
};
|
||||
|
||||
buffer_memory_barrier = (VkBufferMemoryBarrier) {
|
||||
.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
|
||||
.pNext = NULL,
|
||||
.srcAccessMask = buf_mem->barrier.parent.access_flags,
|
||||
.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
|
||||
/* FIXME: implement exclusive transfers */
|
||||
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
|
||||
.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
|
||||
.buffer = buf_mem->buffer,
|
||||
.offset = region.bufferOffset,
|
||||
.size = region.bufferRowLength * region.bufferImageHeight,
|
||||
};
|
||||
|
||||
image_memory_barrier = (VkImageMemoryBarrier) {
|
||||
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
|
||||
.pNext = NULL,
|
||||
.srcAccessMask = img_mem->barrier.parent.access_flags,
|
||||
.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
|
||||
.oldLayout = img_mem->barrier.image_layout,
|
||||
.newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
|
||||
/* FIXME: implement exclusive transfers */
|
||||
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
|
||||
.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
|
||||
.image = img_mem->image,
|
||||
.subresourceRange = img_mem->barrier.subresource_range,
|
||||
};
|
||||
/* *INDENT-ON* */
|
||||
|
||||
vkCmdPipelineBarrier (cmd_buf->cmd,
|
||||
buf_mem->barrier.parent.pipeline_stages | img_mem->barrier.
|
||||
parent.pipeline_stages, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 1,
|
||||
&buffer_memory_barrier, 1, &image_memory_barrier);
|
||||
|
||||
buf_mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_TRANSFER_BIT;
|
||||
buf_mem->barrier.parent.access_flags = buffer_memory_barrier.dstAccessMask;
|
||||
|
||||
img_mem->barrier.parent.pipeline_stages = VK_PIPELINE_STAGE_TRANSFER_BIT;
|
||||
img_mem->barrier.parent.access_flags = image_memory_barrier.dstAccessMask;
|
||||
img_mem->barrier.image_layout = image_memory_barrier.newLayout;
|
||||
|
||||
gst_vulkan_command_buffer_lock (cmd_buf);
|
||||
vkCmdCopyBufferToImage (cmd_buf->cmd, buf_mem->buffer, img_mem->image,
|
||||
img_mem->barrier.image_layout, 1, ®ion);
|
||||
dst_layout, 1, ®ion);
|
||||
gst_vulkan_command_buffer_unlock (cmd_buf);
|
||||
}
|
||||
|
||||
err = vkEndCommandBuffer (cmd_buf->cmd);
|
||||
gst_vulkan_command_buffer_unlock (cmd_buf);
|
||||
if (gst_vulkan_error_to_g_error (err, &error, "vkEndCommandBuffer") < 0) {
|
||||
if (!gst_vulkan_operation_end (raw->exec, &error))
|
||||
goto error;
|
||||
}
|
||||
|
||||
{
|
||||
VkSubmitInfo submit_info = { 0, };
|
||||
GstVulkanFence *fence;
|
||||
|
||||
/* *INDENT-OFF* */
|
||||
submit_info = (VkSubmitInfo) {
|
||||
.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
|
||||
.pNext = NULL,
|
||||
.waitSemaphoreCount = 0,
|
||||
.pWaitSemaphores = NULL,
|
||||
.pWaitDstStageMask = NULL,
|
||||
.commandBufferCount = 1,
|
||||
.pCommandBuffers = &cmd_buf->cmd,
|
||||
.signalSemaphoreCount = 0,
|
||||
.pSignalSemaphores = NULL,
|
||||
};
|
||||
/* *INDENT-ON* */
|
||||
|
||||
fence = gst_vulkan_device_create_fence (raw->upload->device, &error);
|
||||
if (!fence)
|
||||
goto error;
|
||||
|
||||
gst_vulkan_queue_submit_lock (raw->upload->queue);
|
||||
err =
|
||||
vkQueueSubmit (raw->upload->queue->queue, 1, &submit_info,
|
||||
GST_VULKAN_FENCE_FENCE (fence));
|
||||
gst_vulkan_queue_submit_unlock (raw->upload->queue);
|
||||
if (gst_vulkan_error_to_g_error (err, &error, "vkQueueSubmit") < 0)
|
||||
goto error;
|
||||
|
||||
gst_vulkan_trash_list_add (raw->trash_list,
|
||||
gst_vulkan_trash_list_acquire (raw->trash_list, fence,
|
||||
gst_vulkan_trash_mini_object_unref,
|
||||
GST_MINI_OBJECT_CAST (cmd_buf)));
|
||||
gst_vulkan_fence_unref (fence);
|
||||
}
|
||||
|
||||
gst_vulkan_trash_list_gc (raw->trash_list);
|
||||
|
||||
ret = GST_FLOW_OK;
|
||||
|
||||
|
|
@ -1022,10 +932,8 @@ out:
|
|||
return ret;
|
||||
|
||||
unlock_error:
|
||||
if (cmd_buf) {
|
||||
gst_vulkan_command_buffer_lock (cmd_buf);
|
||||
gst_vulkan_command_buffer_unref (cmd_buf);
|
||||
}
|
||||
gst_vulkan_operation_reset (raw->exec);
|
||||
|
||||
error:
|
||||
if (error) {
|
||||
GST_WARNING_OBJECT (raw->upload, "Error: %s", error->message);
|
||||
|
|
@ -1059,15 +967,14 @@ _raw_to_image_free (gpointer impl)
|
|||
raw->in_pool = NULL;
|
||||
}
|
||||
|
||||
if (raw->cmd_pool)
|
||||
gst_object_unref (raw->cmd_pool);
|
||||
raw->cmd_pool = NULL;
|
||||
|
||||
if (!gst_vulkan_trash_list_wait (raw->trash_list, -1))
|
||||
GST_WARNING_OBJECT (raw->upload,
|
||||
"Failed to wait for all fences to complete " "before shutting down");
|
||||
gst_object_unref (raw->trash_list);
|
||||
raw->trash_list = NULL;
|
||||
if (raw->exec) {
|
||||
if (!gst_vulkan_operation_wait (raw->exec)) {
|
||||
GST_WARNING_OBJECT (raw->upload,
|
||||
"Failed to wait for all fences to complete before shutting down");
|
||||
}
|
||||
gst_object_unref (raw->exec);
|
||||
raw->exec = NULL;
|
||||
}
|
||||
|
||||
g_free (impl);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue