vlc | branch: master | Steve Lhomme <[email protected]> | Thu Jan 19 11:10:37 
2017 +0100| [51c937dbcd7af3e084d7d8a2d5ae7a085cc3f4a8] | committer: 
Jean-Baptiste Kempf

direct3d11: the D3D11 debug should not depend on MSVC building

Just on the presence of the SDK on the running machine.

Signed-off-by: Jean-Baptiste Kempf <[email protected]>

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

 modules/video_output/win32/direct3d11.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/win32/direct3d11.c 
b/modules/video_output/win32/direct3d11.c
index 1834828..d5b926b 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1114,8 +1114,12 @@ static int Direct3D11Open(vout_display_t *vd, 
video_format_t *fmt)
     UINT creationFlags = 0;
     HRESULT hr = S_OK;
 
-# if !defined(NDEBUG) && defined(_MSC_VER)
-    creationFlags |= D3D11_CREATE_DEVICE_DEBUG;
+# if !defined(NDEBUG)
+    HINSTANCE sdklayer_dll = LoadLibrary(TEXT("d3d11_1sdklayers.dll"));
+    if (sdklayer_dll) {
+        creationFlags |= D3D11_CREATE_DEVICE_DEBUG;
+        FreeLibrary(sdklayer_dll);
+    }
 # endif
 
     DXGI_SWAP_CHAIN_DESC1 scd;

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to