vlc | branch: master | Steve Lhomme <[email protected]> | Fri Jun 23 09:32:05 2017 +0200| [3726d28e449d0d9b6eb4398ba156683bb873a27f] | committer: Jean-Baptiste Kempf
direct3d11: remove dead code The pool configuration is done later for all use cases. Ref CID #1402665 Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3726d28e449d0d9b6eb4398ba156683bb873a27f --- modules/video_output/win32/direct3d11.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index 77682321dc..d1628e6086 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -686,19 +686,7 @@ static picture_pool_t *Pool(vout_display_t *vd, unsigned pool_size) true, false)) goto error; - if (vd->info.is_slow) { - picture_resource_t resource = { - .p_sys = &sys->picQuad.picSys, - .pf_destroy = DestroyDisplayPoolPicture, - }; - - picture = picture_NewFromResource(&surface_fmt, &resource); - if (likely(picture != NULL)) { - pool_cfg.picture = &picture; - pool_cfg.lock = Direct3D11MapPoolTexture; - //pool_cfg.unlock = Direct3D11UnmapPoolTexture; - } - } else { + if (!vd->info.is_slow) { HRESULT hr; ID3D10Multithread *pMultithread; hr = ID3D11Device_QueryInterface( sys->d3ddevice, &IID_ID3D10Multithread, (void **)&pMultithread); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
