mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3d11: Fix build with GST_DISABLE_GST_DEBUG

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5585>
This commit is contained in:
Seungha Yang 2023-11-02 00:21:17 +09:00 committed by GStreamer Marge Bot
parent 5e147ed3b8
commit bf05cfea45
4 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -615,8 +615,10 @@ gst_d3d11_device_setup_format_table (GstD3D11Device * self)
for (guint j = 0; j < GST_VIDEO_MAX_PLANES; j++) for (guint j = 0; j < GST_VIDEO_MAX_PLANES; j++)
format.format_support[j] = support[j]; format.format_support[j] = support[j];
#ifndef GST_DISABLE_GST_DEBUG
if (gst_debug_category_get_threshold (GST_CAT_DEFAULT) >= GST_LEVEL_LOG) if (gst_debug_category_get_threshold (GST_CAT_DEFAULT) >= GST_LEVEL_LOG)
dump_format (self, &format); dump_format (self, &format);
#endif
priv->format_table[format.format] = format; priv->format_table[format.format] = format;
} }

2
subprojects/gst-plugins-bad/gst-libs/gst/d3d11/gstd3d11utils.cpp
View file

@ -550,6 +550,7 @@ gst_d3d11_luid_to_int64 (const LUID * luid)
return val.QuadPart; return val.QuadPart;
} }
#ifndef GST_DISABLE_GST_DEBUG
static void static void
gst_d3d11_log_gpu_remove_reason (HRESULT hr, GstD3D11Device * device, gst_d3d11_log_gpu_remove_reason (HRESULT hr, GstD3D11Device * device,
GstDebugCategory * cat, const gchar * file, const gchar * function, GstDebugCategory * cat, const gchar * file, const gchar * function,
@ -564,6 +565,7 @@ gst_d3d11_log_gpu_remove_reason (HRESULT hr, GstD3D11Device * device,
gst_d3d11_device_log_live_objects (device, file, function, line); gst_d3d11_device_log_live_objects (device, file, function, line);
} }
#endif
/** /**
* _gst_d3d11_result: * _gst_d3d11_result:

5
subprojects/gst-plugins-bad/gst-libs/gst/d3d11/gstd3d11utils.h
View file

@ -76,8 +76,13 @@ gboolean _gst_d3d11_result (HRESULT hr,
* *
* Since: 1.22 * Since: 1.22
*/ */
#ifndef GST_DISABLE_GST_DEBUG
#define gst_d3d11_result(result,device) \ #define gst_d3d11_result(result,device) \
_gst_d3d11_result (result, device, GST_CAT_DEFAULT, __FILE__, GST_FUNCTION, __LINE__) _gst_d3d11_result (result, device, GST_CAT_DEFAULT, __FILE__, GST_FUNCTION, __LINE__)
#else
#define gst_d3d11_result(result,device) \
_gst_d3d11_result (result, device, NULL, __FILE__, GST_FUNCTION, __LINE__)
#endif /* GST_DISABLE_GST_DEBUG */
G_END_DECLS G_END_DECLS

2
subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
View file

@ -118,7 +118,7 @@ d3d11_conf.set10('GST_D3D11_WINAPI_APP', d3d11_winapi_app)
# is mentioning that DXGIGetDebugInterface1 is desktop app only. # is mentioning that DXGIGetDebugInterface1 is desktop app only.
# #
# PLEASE LET US KNOW A CORRECT WAY TO OBTAIN IDXGIDebug1 ON UWP, MICROSOFT # PLEASE LET US KNOW A CORRECT WAY TO OBTAIN IDXGIDebug1 ON UWP, MICROSOFT
if get_option('debug') and not (d3d11_winapi_only_app and get_option('b_vscrt') == 'md') if not gst_debug_disabled and get_option('debug') and not (d3d11_winapi_only_app and get_option('b_vscrt') == 'md')
d3d11_debug_libs = [ d3d11_debug_libs = [
['d3d11sdklayers.h', 'ID3D11Debug', 'ID3D11InfoQueue', 'have_d3d11sdk_h'], ['d3d11sdklayers.h', 'ID3D11Debug', 'ID3D11InfoQueue', 'have_d3d11sdk_h'],
['dxgidebug.h', 'IDXGIDebug', 'IDXGIInfoQueue', 'have_dxgidebug_h'], ['dxgidebug.h', 'IDXGIDebug', 'IDXGIInfoQueue', 'have_dxgidebug_h'],