mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 23:48:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d12commandqueue: Add execute_wait_and_command_lists() method

Browse source 
... so that GPU-side waiting and executing can be scheduled at once

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6749>
This commit is contained in:
Seungha Yang 2024-04-27 17:44:36 +09:00 committed by GStreamer Marge Bot
parent ebb64dfd0d
commit d8aa2eea83
2 changed files with 78 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12commandqueue.cpp
View file

@ -224,6 +224,40 @@ gst_d3d12_command_queue_get_fence_handle (GstD3D12CommandQueue * queue)
return queue->priv->fence.Get (); return queue->priv->fence.Get ();
} }
static HRESULT
gst_d3d12_command_queue_execute_command_lists_unlocked (GstD3D12CommandQueue *
queue, guint num_command_lists, ID3D12CommandList ** command_lists,
guint64 * fence_value)
{
auto priv = queue->priv;
priv->fence_val++;
if (num_command_lists)
priv->cq->ExecuteCommandLists (num_command_lists, command_lists);
auto hr = priv->cq->Signal (priv->fence.Get (), priv->fence_val);
if (FAILED (hr)) {
GST_ERROR_OBJECT (queue, "Signal failed");
priv->fence_val--;
} else if (fence_value) {
*fence_value = priv->fence_val;
}
if (priv->queue_size > 0) {
auto completed = priv->fence->GetCompletedValue ();
if (completed + priv->queue_size < priv->fence_val) {
hr = priv->fence->SetEventOnCompletion (priv->fence_val -
priv->queue_size, priv->event_handle);
if (FAILED (hr)) {
GST_ERROR_OBJECT (queue, "SetEventOnCompletion failed");
return hr;
}
WaitForSingleObjectEx (priv->event_handle, INFINITE, FALSE);
}
}
return hr;
}
/** /**
* gst_d3d12_command_queue_execute_command_lists: * gst_d3d12_command_queue_execute_command_lists:
* @queue: a #GstD3D12CommandQueue * @queue: a #GstD3D12CommandQueue
@ -246,34 +280,46 @@ gst_d3d12_command_queue_execute_command_lists (GstD3D12CommandQueue * queue,
g_return_val_if_fail (GST_IS_D3D12_COMMAND_QUEUE (queue), E_INVALIDARG); g_return_val_if_fail (GST_IS_D3D12_COMMAND_QUEUE (queue), E_INVALIDARG);
auto priv = queue->priv; auto priv = queue->priv;
HRESULT hr;
std::lock_guard < std::mutex > lk (priv->execute_lock); std::lock_guard < std::mutex > lk (priv->execute_lock);
priv->fence_val++; return gst_d3d12_command_queue_execute_command_lists_unlocked (queue,
if (num_command_lists) num_command_lists, command_lists, fence_value);
priv->cq->ExecuteCommandLists (num_command_lists, command_lists);
hr = priv->cq->Signal (priv->fence.Get (), priv->fence_val);
if (FAILED (hr)) {
GST_ERROR_OBJECT (queue, "Signal failed");
priv->fence_val--;
} else if (fence_value) {
*fence_value = priv->fence_val;
} }
if (priv->queue_size > 0) { /**
auto completed = priv->fence->GetCompletedValue (); * gst_d3d12_command_queue_execute_wait_and_command_lists:
if (completed + priv->queue_size < priv->fence_val) { * @queue: a #GstD3D12CommandQueue
hr = priv->fence->SetEventOnCompletion (priv->fence_val - * @fence_to_wait: (allow-none): a ID3D11Fence
priv->queue_size, priv->event_handle); * @fence_value_to_wait: fence value to wait
if (FAILED (hr)) { * @num_command_lists: command list size
GST_ERROR_OBJECT (queue, "SetEventOnCompletion failed"); * @command_lists: array of ID3D12CommandList
* @fence_value: (out) (optional): fence value of submitted command
*
* Executes wait if @fence_to_wait is passed, and executes command list.
*
* Return: HRESULT code
*
* Since: 1.26
*/
HRESULT
gst_d3d12_command_queue_execute_wait_and_command_lists (GstD3D12CommandQueue *
queue, ID3D12Fence * fence_to_wait, guint64 fence_value_to_wait,
guint num_command_lists, ID3D12CommandList ** command_lists,
guint64 * fence_value)
{
g_return_val_if_fail (GST_IS_D3D12_COMMAND_QUEUE (queue), E_INVALIDARG);
auto priv = queue->priv;
std::lock_guard < std::mutex > lk (priv->execute_lock);
if (fence_to_wait) {
auto hr = priv->cq->Wait (fence_to_wait, fence_value_to_wait);
if (FAILED (hr))
return hr; return hr;
} }
WaitForSingleObjectEx (priv->event_handle, INFINITE, FALSE);
}
}
return hr; return gst_d3d12_command_queue_execute_command_lists_unlocked (queue,
num_command_lists, command_lists, fence_value);
} }
/** /**

8
subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12commandqueue.h
View file

@ -85,6 +85,14 @@ HRESULT gst_d3d12_command_queue_execute_command_lists (GstD3D12Co
ID3D12CommandList ** command_lists, ID3D12CommandList ** command_lists,
guint64 * fence_value); guint64 * fence_value);
GST_D3D12_API
HRESULT gst_d3d12_command_queue_execute_wait_and_command_lists (GstD3D12CommandQueue * queue,
ID3D12Fence * fence_to_wait,
guint64 fence_value_to_wait,
guint num_command_lists,
ID3D12CommandList ** command_lists,
guint64 * fence_value);
GST_D3D12_API GST_D3D12_API
HRESULT gst_d3d12_command_queue_execute_wait (GstD3D12CommandQueue * queue, HRESULT gst_d3d12_command_queue_execute_wait (GstD3D12CommandQueue * queue,
ID3D12Fence * fence, ID3D12Fence * fence,