mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-06 14:32:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d12: Enable debug layer

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5812>
This commit is contained in:
Seungha Yang 2023-12-15 19:45:44 +09:00
parent 7443cc00b5
commit a24a155279
1 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
subprojects/gst-plugins-bad/sys/d3d12/gstd3d12device.cpp
View file

@ -33,10 +33,7 @@
#include <locale> #include <locale>
#include <codecvt> #include <codecvt>
#include <algorithm> #include <algorithm>
#ifdef HAVE_D3D12_SDKLAYERS_H
#include <d3d12sdklayers.h> #include <d3d12sdklayers.h>
#endif
GST_DEBUG_CATEGORY_STATIC (gst_d3d12_device_debug); GST_DEBUG_CATEGORY_STATIC (gst_d3d12_device_debug);
GST_DEBUG_CATEGORY_STATIC (gst_d3d12_sdk_debug); GST_DEBUG_CATEGORY_STATIC (gst_d3d12_sdk_debug);
@ -172,9 +169,7 @@ struct _GstD3D12DevicePrivate
ComPtr<ID3D12CommandQueue> copy_queue; ComPtr<ID3D12CommandQueue> copy_queue;
#ifdef HAVE_D3D12_SDKLAYERS_H
ComPtr<ID3D12InfoQueue> info_queue; ComPtr<ID3D12InfoQueue> info_queue;
#endif
guint adapter_index = 0; guint adapter_index = 0;
guint device_id = 0; guint device_id = 0;
@ -184,7 +179,6 @@ struct _GstD3D12DevicePrivate
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */
#ifdef HAVE_D3D12_SDKLAYERS_H
static gboolean static gboolean
gst_d3d12_device_enable_debug (void) gst_d3d12_device_enable_debug (void)
{ {
@ -211,7 +205,6 @@ gst_d3d12_device_enable_debug (void)
GST_INFO ("D3D12 debug layer is enabled"); GST_INFO ("D3D12 debug layer is enabled");
#ifdef HAVE_D3D12DEBUG5
ComPtr < ID3D12Debug5 > d3d12_debug5; ComPtr < ID3D12Debug5 > d3d12_debug5;
hr = d3d12_debug.As (&d3d12_debug5); hr = d3d12_debug.As (&d3d12_debug5);
if (SUCCEEDED (hr)) if (SUCCEEDED (hr))
@ -232,13 +225,11 @@ gst_d3d12_device_enable_debug (void)
d3d12_debug1->SetEnableGPUBasedValidation (TRUE); d3d12_debug1->SetEnableGPUBasedValidation (TRUE);
GST_INFO ("Enabled GPU based validation"); GST_INFO ("Enabled GPU based validation");
#endif
} }
GST_D3D12_CALL_ONCE_END; GST_D3D12_CALL_ONCE_END;
return enabled; return enabled;
} }
#endif
#define gst_d3d12_device_parent_class parent_class #define gst_d3d12_device_parent_class parent_class
G_DEFINE_TYPE (GstD3D12Device, gst_d3d12_device, GST_TYPE_OBJECT); G_DEFINE_TYPE (GstD3D12Device, gst_d3d12_device, GST_TYPE_OBJECT);
@ -490,10 +481,8 @@ gst_d3d12_device_find_adapter (const GstD3D12DeviceConstructData * data,
HRESULT hr; HRESULT hr;
UINT factory_flags = 0; UINT factory_flags = 0;
#ifdef HAVE_D3D12_SDKLAYERS_H
if (gst_d3d12_device_enable_debug ()) if (gst_d3d12_device_enable_debug ())
factory_flags |= DXGI_CREATE_FACTORY_DEBUG; factory_flags |= DXGI_CREATE_FACTORY_DEBUG;
#endif
hr = CreateDXGIFactory2 (factory_flags, IID_PPV_ARGS (&factory)); hr = CreateDXGIFactory2 (factory_flags, IID_PPV_ARGS (&factory));
if (FAILED (hr)) { if (FAILED (hr)) {
@ -555,10 +544,8 @@ gst_d3d12_device_new_internal (const GstD3D12DeviceConstructData * data)
GST_DEBUG_CATEGORY_INIT (gst_d3d12_device_debug, GST_DEBUG_CATEGORY_INIT (gst_d3d12_device_debug,
"d3d12device", 0, "d3d12 device object"); "d3d12device", 0, "d3d12 device object");
#ifdef HAVE_D3D12_SDKLAYERS_H
if (gst_d3d12_device_enable_debug ()) if (gst_d3d12_device_enable_debug ())
factory_flags |= DXGI_CREATE_FACTORY_DEBUG; factory_flags |= DXGI_CREATE_FACTORY_DEBUG;
#endif
hr = CreateDXGIFactory2 (factory_flags, IID_PPV_ARGS (&factory)); hr = CreateDXGIFactory2 (factory_flags, IID_PPV_ARGS (&factory));
if (FAILED (hr)) { if (FAILED (hr)) {
@ -608,13 +595,11 @@ gst_d3d12_device_new_internal (const GstD3D12DeviceConstructData * data)
gst_d3d12_device_setup_format_table (self); gst_d3d12_device_setup_format_table (self);
#ifdef HAVE_D3D12_SDKLAYERS_H
if (gst_d3d12_device_enable_debug ()) { if (gst_d3d12_device_enable_debug ()) {
ComPtr < ID3D12InfoQueue > info_queue; ComPtr < ID3D12InfoQueue > info_queue;
device.As (&info_queue); device.As (&info_queue);
priv->info_queue = info_queue; priv->info_queue = info_queue;
} }
#endif
return self; return self;
} }
@ -786,7 +771,6 @@ d3d12_message_severity_to_gst (D3D12_MESSAGE_SEVERITY level)
return GST_LEVEL_LOG; return GST_LEVEL_LOG;
} }
#ifdef HAVE_D3D12_SDKLAYERS_H
void void
gst_d3d12_device_d3d12_debug (GstD3D12Device * device, const gchar * file, gst_d3d12_device_d3d12_debug (GstD3D12Device * device, const gchar * file,
const gchar * function, gint line) const gchar * function, gint line)
@ -836,10 +820,3 @@ gst_d3d12_device_d3d12_debug (GstD3D12Device * device, const gchar * file,
info_queue->ClearStoredMessages (); info_queue->ClearStoredMessages ();
} }
#else
void
gst_d3d12_device_d3d12_debug (GstD3D12Device * device, const gchar * file,
const gchar * function, gint line)
{
}
#endif