mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 17:35:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d12videosink: Use converter config for initial MSAA setup

Browse source 
Avoid redundant pso creation

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7550>
This commit is contained in:
Seungha Yang 2024-09-19 00:21:21 +09:00 committed by GStreamer Marge Bot
parent 7cf27c456b
commit ce5321be68
3 changed files with 72 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12pluginutils.cpp
View file

@ -140,3 +140,48 @@ gst_d3d12_is_windows_10_or_greater (void)
return ret; return ret;
} }
void
gst_d3d12_calculate_sample_desc_for_msaa (GstD3D12Device * device,
DXGI_FORMAT format, GstD3D12MSAAMode msaa_mode, DXGI_SAMPLE_DESC * desc)
{
desc->Count = 1;
desc->Quality = 0;
auto device_handle = gst_d3d12_device_get_device_handle (device);
UINT sample_count = 1;
switch (msaa_mode) {
case GST_D3D12_MSAA_2X:
sample_count = 2;
break;
case GST_D3D12_MSAA_4X:
sample_count = 4;
break;
case GST_D3D12_MSAA_8X:
sample_count = 8;
break;
default:
break;
}
D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS feature_data = { };
feature_data.Format = format;
feature_data.SampleCount = sample_count;
while (feature_data.SampleCount > 1) {
auto hr =
device_handle->CheckFeatureSupport
(D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS,
&feature_data, sizeof (feature_data));
if (SUCCEEDED (hr) && feature_data.NumQualityLevels > 0)
break;
feature_data.SampleCount /= 2;
}
if (feature_data.SampleCount > 1 && feature_data.NumQualityLevels > 0) {
desc->Count = feature_data.SampleCount;
desc->Quality = feature_data.NumQualityLevels - 1;
}
}

5
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12pluginutils.h
View file

@ -57,4 +57,9 @@ gboolean gst_d3d12_need_transform (gfloat rotation_x,
gboolean gst_d3d12_is_windows_10_or_greater (void); gboolean gst_d3d12_is_windows_10_or_greater (void);
void gst_d3d12_calculate_sample_desc_for_msaa (GstD3D12Device * device,
DXGI_FORMAT format,
GstD3D12MSAAMode msaa_mode,
DXGI_SAMPLE_DESC * desc);
G_END_DECLS G_END_DECLS

55
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12window-swapchain.cpp
View file

@ -321,9 +321,24 @@ SwapChain::setup_swapchain (GstD3D12Window * window, GstD3D12Device * device,
gst_structure_free (converter_config_); gst_structure_free (converter_config_);
converter_config_ = gst_structure_copy (conv_config); converter_config_ = gst_structure_copy (conv_config);
GstD3D12MSAAMode msaa_mode;
DXGI_SAMPLE_DESC sample_desc = { };
gst_d3d12_window_get_msaa (window, msaa_mode);
gst_d3d12_calculate_sample_desc_for_msaa (device,
format, msaa_mode, &sample_desc);
if (sample_desc.Count > 1) {
gst_structure_set (converter_config_,
GST_D3D12_CONVERTER_OPT_PSO_SAMPLE_DESC_COUNT, G_TYPE_UINT,
sample_desc.Count,
GST_D3D12_CONVERTER_OPT_PSO_SAMPLE_DESC_QUALITY, G_TYPE_UINT,
sample_desc.Quality, nullptr);
}
if (!resource_->conv) { if (!resource_->conv) {
resource_->conv = gst_d3d12_converter_new (resource_->device, nullptr, resource_->conv = gst_d3d12_converter_new (resource_->device, nullptr,
in_info, out_info, nullptr, nullptr, gst_structure_copy (conv_config)); in_info, out_info, nullptr, nullptr,
gst_structure_copy (converter_config_));
if (!resource_->conv) { if (!resource_->conv) {
GST_ERROR ("Couldn't create converter"); GST_ERROR ("Couldn't create converter");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
@ -420,47 +435,21 @@ SwapChain::resize_buffer (GstD3D12Window * window)
auto buffer_desc = resource_->buffer_desc; auto buffer_desc = resource_->buffer_desc;
GstD3D12MSAAMode msaa_mode; GstD3D12MSAAMode msaa_mode;
DXGI_SAMPLE_DESC sample_desc = { };
gst_d3d12_window_get_msaa (window, msaa_mode); gst_d3d12_window_get_msaa (window, msaa_mode);
gst_d3d12_calculate_sample_desc_for_msaa (device, buffer_desc.Format,
UINT sample_count = 1; msaa_mode, &sample_desc);
switch (msaa_mode) {
case GST_D3D12_MSAA_2X:
sample_count = 2;
break;
case GST_D3D12_MSAA_4X:
sample_count = 4;
break;
case GST_D3D12_MSAA_8X:
sample_count = 8;
break;
default:
break;
}
auto device_handle = gst_d3d12_device_get_device_handle (device); auto device_handle = gst_d3d12_device_get_device_handle (device);
D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS feature_data = { }; if (sample_desc.Count > 1) {
feature_data.Format = buffer_desc.Format;
feature_data.SampleCount = sample_count;
while (feature_data.SampleCount > 1) {
hr = device_handle->CheckFeatureSupport (
D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS,
&feature_data, sizeof (feature_data));
if (SUCCEEDED (hr) && feature_data.NumQualityLevels > 0)
break;
feature_data.SampleCount /= 2;
}
if (feature_data.SampleCount > 1 && feature_data.NumQualityLevels > 0) {
GST_DEBUG_OBJECT (device, "Enable MSAA x%d with quality level %d", GST_DEBUG_OBJECT (device, "Enable MSAA x%d with quality level %d",
feature_data.SampleCount, feature_data.NumQualityLevels - 1); sample_desc.Count, sample_desc.Quality);
D3D12_HEAP_PROPERTIES heap_prop = D3D12_HEAP_PROPERTIES heap_prop =
CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT); CD3DX12_HEAP_PROPERTIES (D3D12_HEAP_TYPE_DEFAULT);
D3D12_RESOURCE_DESC resource_desc = D3D12_RESOURCE_DESC resource_desc =
CD3DX12_RESOURCE_DESC::Tex2D (buffer_desc.Format, CD3DX12_RESOURCE_DESC::Tex2D (buffer_desc.Format,
buffer_desc.Width, buffer_desc.Height, buffer_desc.Width, buffer_desc.Height,
1, 1, feature_data.SampleCount, feature_data.NumQualityLevels - 1, 1, 1, sample_desc.Count, sample_desc.Quality,
D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET); D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET);
D3D12_CLEAR_VALUE clear_value = { }; D3D12_CLEAR_VALUE clear_value = { };
clear_value.Format = buffer_desc.Format; clear_value.Format = buffer_desc.Format;