vlc | branch: master | Steve Lhomme <[email protected]> | Fri Jun 16 12:01:40 2017 +0200| [3e263d31cb9c289e70292ac4ee34192a39add553] | committer: Jean-Baptiste Kempf
direct3d11: remove dead code Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e263d31cb9c289e70292ac4ee34192a39add553 --- modules/video_output/win32/direct3d11.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index 303c98fd1e..77682321dc 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -1146,8 +1146,6 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic } else { - /* copy pixels from the context texture to the picture_sys texture */ - assert(pic_ctx!=NULL); D3D11_TEXTURE2D_DESC texDesc; ID3D11Texture2D_GetDesc(p_sys->texture[0], &texDesc); if (texDesc.BindFlags & D3D11_BIND_SHADER_RESOURCE) @@ -1156,21 +1154,6 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic * display, do it preferrably when creating the texture */ assert(p_sys->resourceView[0]!=NULL); } - else - { - D3D11_BOX box = { - .top = picture->format.i_y_offset, - .bottom = picture->format.i_y_offset + texDesc.Height, - .left = picture->format.i_x_offset, - .right = picture->format.i_x_offset + texDesc.Width, - .back = 1, - }; - ID3D11DeviceContext_CopySubresourceRegion(sys->d3dcontext, - p_sys->resource[KNOWN_DXGI_INDEX], - p_sys->slice_index, 0, 0, 0, - pic_ctx->picsys.resource[KNOWN_DXGI_INDEX], - pic_ctx->picsys.slice_index, &box); - } } if (subpicture) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
