vlc | branch: master | Steve Lhomme <[email protected]> | Tue Nov 22 13:23:19 2016 +0100| [23569106994500c753fda466188182263e17bb13] | committer: Jean-Baptiste Kempf
direct3d11: deduce the ID3D11Device from ID3D11DeviceContext on winstore builds Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=23569106994500c753fda466188182263e17bb13 --- modules/video_output/win32/direct3d11.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index 1aa7128..a8601fa 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -79,7 +79,6 @@ vlc_module_begin () add_bool("direct3d11-hw-blending", true, HW_BLENDING_TEXT, HW_BLENDING_LONGTEXT, true) #if VLC_WINSTORE_APP - add_integer("winrt-d3ddevice", 0x0, NULL, NULL, true); /* ID3D11Device* */ add_integer("winrt-d3dcontext", 0x0, NULL, NULL, true); /* ID3D11DeviceContext* */ add_integer("winrt-swapchain", 0x0, NULL, NULL, true); /* IDXGISwapChain1* */ #endif @@ -531,12 +530,13 @@ static int OpenCoreW(vout_display_t *vd) 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 = NULL; + ID3D11DeviceContext_GetDevice(d3dcontext, &d3ddevice); + if (!d3ddevice) + return VLC_EGENERIC; vout_display_sys_t *sys = vd->sys = calloc(1, sizeof(vout_display_sys_t)); if (!sys) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
