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

d3d12converter: Fix SRV descriptor heap size

Browse source 
Converter was allocating smaller size of descriptor heap
than required size when auto-mipgen is enabled

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8391>
This commit is contained in:
Seungha Yang 2025-01-31 22:06:53 +09:00 committed by GStreamer Marge Bot
parent a91275a71e
commit cc6941ed9a
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
subprojects/gst-plugins-bad/gst-libs/gst/d3d12/gstd3d12converter.cpp
View file

@ -436,6 +436,7 @@ struct _GstD3D12ConverterPrivate
D3D12_RESOURCE_DESC mipgen_desc = { };
GstBuffer *mipgen_buf = nullptr;
guint auto_mipgen_level = 1;
guint max_srv_desc = 0;
std::mutex prop_lock;
guint64 fence_val = 0;
@ -993,6 +994,13 @@ gst_d3d12_converter_setup_resource (GstD3D12Converter * self,
}
}
auto num_srv = ctx->pipeline_data[0].crs->GetNumSrv ();
if (have_lut)
num_srv += 2;
if (priv->max_srv_desc < num_srv)
priv->max_srv_desc = num_srv;
if (ctx->comm)
return ctx;
@ -1015,18 +1023,6 @@ gst_d3d12_converter_setup_resource (GstD3D12Converter * self,
comm->sampler_filter = sampler_filter;
if (!priv->srv_heap_pool) {
D3D12_DESCRIPTOR_HEAP_DESC srv_heap_desc = { };
srv_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
srv_heap_desc.NumDescriptors = ctx->pipeline_data[0].crs->GetNumSrv ();
if (comm->have_lut)
srv_heap_desc.NumDescriptors += 2;
srv_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
priv->srv_heap_pool = gst_d3d12_desc_heap_pool_new (device, &srv_heap_desc);
}
/* bottom left */
vertex_data[0].position.x = -1.0f;
vertex_data[0].position.y = -1.0f;
@ -2304,6 +2300,13 @@ gst_d3d12_converter_new (GstD3D12Device * device, GstD3D12CmdQueue * queue,
}
}
D3D12_DESCRIPTOR_HEAP_DESC srv_heap_desc = { };
srv_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
srv_heap_desc.NumDescriptors = priv->max_srv_desc;
srv_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
priv->srv_heap_pool = gst_d3d12_desc_heap_pool_new (device_handle,
&srv_heap_desc);
return self;
}