[vlc-commits] d3d11_fmt: avoid forcing COBJMACROS on files including the header

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Feb 12 16:09:56 2020 +0100| [65048467c5f394fcc5c577e69a732bdfd1f1dd70] | committer: Steve Lhomme

d3d11_fmt: avoid forcing COBJMACROS on files including the header

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=65048467c5f394fcc5c577e69a732bdfd1f1dd70
---

 modules/video_chroma/d3d11_fmt.c |  9 +++++++++
 modules/video_chroma/d3d11_fmt.h | 11 +----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/video_chroma/d3d11_fmt.c b/modules/video_chroma/d3d11_fmt.c
index 523cf2c827..f00c9a4a23 100644
--- a/modules/video_chroma/d3d11_fmt.c
+++ b/modules/video_chroma/d3d11_fmt.c
@@ -525,6 +525,15 @@ done:
     return result;
 }
 
+bool DeviceSupportsFormat(ID3D11Device *d3ddevice, DXGI_FORMAT format, UINT supportFlags)
+{
+    UINT i_formatSupport;
+    return SUCCEEDED( ID3D11Device_CheckFormatSupport(d3ddevice, format,
+                                                      &i_formatSupport) )
+            && ( i_formatSupport & supportFlags ) == supportFlags;
+}
+
+
 const d3d_format_t *(FindD3D11Format)(vlc_object_t *o,
                                     d3d11_device_t *d3d_dev,
                                     vlc_fourcc_t i_src_chroma,
diff --git a/modules/video_chroma/d3d11_fmt.h b/modules/video_chroma/d3d11_fmt.h
index e969ba04dd..6244418dac 100644
--- a/modules/video_chroma/d3d11_fmt.h
+++ b/modules/video_chroma/d3d11_fmt.h
@@ -29,8 +29,6 @@
 
 #include "dxgi_fmt.h"
 
-#include <vlc_picture.h>
-
 DEFINE_GUID(GUID_CONTEXT_MUTEX, 0x472e8835, 0x3f8e, 0x4f93, 0xa0, 0xcb, 0x25, 0x79, 0x77, 0x6c, 0xed, 0x86);
 
 /* see https://msdn.microsoft.com/windows/hardware/commercialize/design/compatibility/device-graphics
@@ -170,14 +168,7 @@ IDXGIAdapter *D3D11DeviceAdapter(ID3D11Device *d3ddev);
 int D3D11CheckDriverVersion(const d3d11_device_t *, UINT vendorId,
                             const struct wddm_version *min_ver);
 
-static inline bool DeviceSupportsFormat(ID3D11Device *d3ddevice,
-                                        DXGI_FORMAT format, UINT supportFlags)
-{
-    UINT i_formatSupport;
-    return SUCCEEDED( ID3D11Device_CheckFormatSupport(d3ddevice, format,
-                                                      &i_formatSupport) )
-            && ( i_formatSupport & supportFlags ) == supportFlags;
-}
+bool DeviceSupportsFormat(ID3D11Device *d3ddevice, DXGI_FORMAT format, UINT supportFlags);
 
 #define D3D11_RGB_FORMAT  1
 #define D3D11_YUV_FORMAT  2