[vlc-commits] D3D11

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jun 25 11:00:29 2015 +0200| [ecd216e7178b570f962b791c51f5c8f750dd076d] | committer: Jean-Baptiste Kempf

D3D11

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

 modules/video_output/msw/direct3d11.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/msw/direct3d11.c b/modules/video_output/msw/direct3d11.c
index f5d33bb..8218e70 100644
--- a/modules/video_output/msw/direct3d11.c
+++ b/modules/video_output/msw/direct3d11.c
@@ -406,12 +406,14 @@ static int Open(vlc_object_t *object)
     IDXGISwapChain1* dxgiswapChain  = var_InheritInteger(vd, "winrt-swapchain");
     if (!dxgiswapChain)
         return VLC_EGENERIC;
-    ID3D11Device* d3ddevice         = var_InheritInteger(vd, "winrt-d3ddevice");
-    if (!d3ddevice)
-        return VLC_EGENERIC;
     ID3D11DeviceContext* d3dcontext = var_InheritInteger(vd, "winrt-d3dcontext");
     if (!d3dcontext)
         return VLC_EGENERIC;
+
+    ID3D11Device* d3ddevice;
+    ID3D11DeviceContext1_GetDevice( d3dcontext, &d3ddevice );
+    if (!d3ddevice)
+        return VLC_EGENERIC;
 #endif
 
     vout_display_sys_t *sys = vd->sys = calloc(1, sizeof(vout_display_sys_t));