From c3cef6e923feb923a61add07482e87c758db6d0c Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Thu, 2 Nov 2023 00:24:35 +0900 Subject: [PATCH] d3d12: Fix build with GST_DISABLE_GST_DEBUG Part-of: --- subprojects/gst-plugins-bad/sys/d3d12/gstd3d12utils.h | 5 +++++ subprojects/gst-plugins-bad/sys/d3d12/meson.build | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12utils.h b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12utils.h index a229404781..a71618a32e 100644 --- a/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12utils.h +++ b/subprojects/gst-plugins-bad/sys/d3d12/gstd3d12utils.h @@ -66,8 +66,13 @@ gboolean _gst_d3d12_result (HRESULT hr, * * Returns: %TRUE if D3D12 API call result is SUCCESS */ +#ifndef GST_DISABLE_GST_DEBUG #define gst_d3d12_result(result,device) \ _gst_d3d12_result (result, device, GST_CAT_DEFAULT, __FILE__, GST_FUNCTION, __LINE__, GST_LEVEL_ERROR) +#else +#define gst_d3d12_result(result,device) \ + _gst_d3d12_result (result, device, NULL, __FILE__, GST_FUNCTION, __LINE__, GST_LEVEL_ERROR) +#endif guint gst_d3d12_calculate_subresource (guint mip_slice, guint array_slice, diff --git a/subprojects/gst-plugins-bad/sys/d3d12/meson.build b/subprojects/gst-plugins-bad/sys/d3d12/meson.build index a3a7a15a85..37ab306f24 100644 --- a/subprojects/gst-plugins-bad/sys/d3d12/meson.build +++ b/subprojects/gst-plugins-bad/sys/d3d12/meson.build @@ -54,7 +54,7 @@ if not have_d3d12_headers subdir_done() endif -if cc.has_header('d3d12sdklayers.h') +if not gst_debug_disabled and cc.has_header('d3d12sdklayers.h') extra_args += ['-DHAVE_D3D12_SDKLAYERS_H'] if cc.has_header_symbol('d3d12sdklayers.h', 'ID3D12Debug5') extra_args += ['-DHAVE_D3D12DEBUG5']