mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 23:48:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11: Fix debug build on UWP

Browse source 
GstDXGIGetDebugInterface() is unused when targeting UWP. We directly
call DXGIGetDebugInterface1() in that case.

Fixes build failure:

../gst-libs/gst/d3d11/gstd3d11device.cpp(271): error C2440: '=': cannot convert from 'HRESULT (__cdecl *)(UINT,const IID &,void **)' to 'DXGIGetDebugInterface_t'
../gst-libs/gst/d3d11/gstd3d11device.cpp(271): note: This conversion requires a reinterpret_cast, a C-style cast or function-style cast

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3118>
This commit is contained in:
Nirbheek Chauhan 2022-10-05 05:38:54 +05:30 committed by GStreamer Marge Bot
parent 94c2cd9ddd
commit a5ef7cb041
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
subprojects/gst-plugins-bad/gst-libs/gst/d3d11/gstd3d11device.cpp
View file

@ -258,22 +258,21 @@ gst_d3d11_device_d3d11_debug (GstD3D11Device * device,
static gboolean static gboolean
gst_d3d11_device_enable_dxgi_debug (void) gst_d3d11_device_enable_dxgi_debug (void)
{ {
#if (!GST_D3D11_WINAPI_ONLY_APP)
static GModule *dxgi_debug_module = nullptr; static GModule *dxgi_debug_module = nullptr;
GST_D3D11_CALL_ONCE_BEGIN { GST_D3D11_CALL_ONCE_BEGIN {
#if (!GST_D3D11_WINAPI_ONLY_APP)
dxgi_debug_module = g_module_open ("dxgidebug.dll", G_MODULE_BIND_LAZY); dxgi_debug_module = g_module_open ("dxgidebug.dll", G_MODULE_BIND_LAZY);
if (dxgi_debug_module) if (dxgi_debug_module)
g_module_symbol (dxgi_debug_module, g_module_symbol (dxgi_debug_module,
"DXGIGetDebugInterface", (gpointer *) & GstDXGIGetDebugInterface); "DXGIGetDebugInterface", (gpointer *) & GstDXGIGetDebugInterface);
#else }
GstDXGIGetDebugInterface = DXGIGetDebugInterface1; GST_D3D11_CALL_ONCE_END;
#endif
} GST_D3D11_CALL_ONCE_END;
if (!GstDXGIGetDebugInterface) if (!GstDXGIGetDebugInterface)
return FALSE; return FALSE;
#endif
return TRUE; return TRUE;
} }