d3d12: Fix d3d12sdklayer setup and d3d12device debug category

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5345>
This commit is contained in:
Seungha Yang 2023-09-18 21:27:19 +09:00 committed by GStreamer Marge Bot
parent 60b93fd593
commit 68cfb64ae3
2 changed files with 4 additions and 3 deletions

View file

@ -184,8 +184,6 @@ gst_d3d12_device_enable_debug (void)
static gboolean enabled = FALSE; static gboolean enabled = FALSE;
GST_D3D12_CALL_ONCE_BEGIN { GST_D3D12_CALL_ONCE_BEGIN {
GST_DEBUG_CATEGORY_INIT (gst_d3d12_device_debug,
"d3d12device", 0, "d3d12 device object");
GST_DEBUG_CATEGORY_INIT (gst_d3d12_sdk_debug, GST_DEBUG_CATEGORY_INIT (gst_d3d12_sdk_debug,
"d3d12debuglayer", 0, "d3d12 SDK layer debug"); "d3d12debuglayer", 0, "d3d12 SDK layer debug");
@ -545,6 +543,9 @@ gst_d3d12_device_new_internal (const GstD3D12DeviceConstructData * data)
UINT factory_flags = 0; UINT factory_flags = 0;
guint index = 0; guint index = 0;
GST_DEBUG_CATEGORY_INIT (gst_d3d12_device_debug,
"d3d12device", 0, "d3d12 device object");
#ifdef HAVE_D3D12_SDKLAYERS_H #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;

View file

@ -52,7 +52,7 @@ if not have_d3d12_headers
endif endif
if cc.has_header('d3d12sdklayers.h') if cc.has_header('d3d12sdklayers.h')
extra_dep += ['-DHAVE_D3D12_SDKLAYERS_H'] extra_args += ['-DHAVE_D3D12_SDKLAYERS_H']
endif endif
# MinGW 32bits compiler seems to be complaining about redundant-decls # MinGW 32bits compiler seems to be complaining about redundant-decls