mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-07 23:12:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d12memory: Allow null allocator in alloc()

Browse source 
Update code as documented

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6940>
This commit is contained in:
Seungha Yang 2024-04-22 17:04:09 +09:00 committed by GStreamer Marge Bot
parent 859b1c8b63
commit ec11bb8253
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12memory.cpp
View file

@ -1387,6 +1387,11 @@ gst_d3d12_allocator_alloc_internal (GstD3D12Allocator * self,
HRESULT hr; HRESULT hr;
ComPtr < ID3D12Resource > resource; ComPtr < ID3D12Resource > resource;
if (!self) {
gst_d3d12_memory_init_once ();
self = _d3d12_memory_allocator;
}
device_handle = gst_d3d12_device_get_device_handle (device); device_handle = gst_d3d12_device_get_device_handle (device);
hr = device_handle->CreateCommittedResource (heap_props, heap_flags, hr = device_handle->CreateCommittedResource (heap_props, heap_flags,
desc, initial_state, optimized_clear_value, IID_PPV_ARGS (&resource)); desc, initial_state, optimized_clear_value, IID_PPV_ARGS (&resource));
@ -1427,7 +1432,6 @@ gst_d3d12_allocator_alloc_internal (GstD3D12Allocator * self,
* *
* Since: 1.26 * Since: 1.26
*/ */
GstMemory * GstMemory *
gst_d3d12_allocator_alloc (GstD3D12Allocator * allocator, gst_d3d12_allocator_alloc (GstD3D12Allocator * allocator,
GstD3D12Device * device, const D3D12_HEAP_PROPERTIES * heap_props, GstD3D12Device * device, const D3D12_HEAP_PROPERTIES * heap_props,
@ -1435,11 +1439,15 @@ gst_d3d12_allocator_alloc (GstD3D12Allocator * allocator,
D3D12_RESOURCE_STATES initial_state, D3D12_RESOURCE_STATES initial_state,
const D3D12_CLEAR_VALUE * optimized_clear_value) const D3D12_CLEAR_VALUE * optimized_clear_value)
{ {
g_return_val_if_fail (GST_IS_D3D12_ALLOCATOR (allocator), nullptr);
g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr); g_return_val_if_fail (GST_IS_D3D12_DEVICE (device), nullptr);
g_return_val_if_fail (heap_props != nullptr, nullptr); g_return_val_if_fail (heap_props != nullptr, nullptr);
g_return_val_if_fail (desc != nullptr, nullptr); g_return_val_if_fail (desc != nullptr, nullptr);
if (!allocator) {
gst_d3d12_memory_init_once ();
allocator = _d3d12_memory_allocator;
}
if (desc->DepthOrArraySize > 1) { if (desc->DepthOrArraySize > 1) {
GST_ERROR_OBJECT (allocator, "Array is not supported, use pool allocator"); GST_ERROR_OBJECT (allocator, "Array is not supported, use pool allocator");
return nullptr; return nullptr;