vlc | branch: master | Steve Lhomme <[email protected]> | Thu Aug 2 09:41:14 2018 +0200| [03b4d28140c6a52eb05c61668fd80906f00dce86] | committer: Steve Lhomme
d3d11_quad: remove unused projection parameter from D3D11_SetupQuad() The projection type cannot change dynamically > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=03b4d28140c6a52eb05c61668fd80906f00dce86 --- modules/video_output/win32/d3d11_quad.c | 2 +- modules/video_output/win32/d3d11_quad.h | 4 ++-- modules/video_output/win32/direct3d11.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/video_output/win32/d3d11_quad.c b/modules/video_output/win32/d3d11_quad.c index 666d041b5d..b9a07275b8 100644 --- a/modules/video_output/win32/d3d11_quad.c +++ b/modules/video_output/win32/d3d11_quad.c @@ -691,7 +691,7 @@ error: int D3D11_SetupQuad(vlc_object_t *o, d3d11_device_t *d3d_dev, const video_format_t *fmt, d3d_quad_t *quad, const display_info_t *displayFormat, const RECT *output, ID3D11VertexShader *d3dvertexShader, ID3D11InputLayout *pVertexLayout, - video_projection_mode_t projection, video_orientation_t orientation) + video_orientation_t orientation) { const bool RGB_shader = IsRGBShader(quad->formatInfo); diff --git a/modules/video_output/win32/d3d11_quad.h b/modules/video_output/win32/d3d11_quad.h index 97d60152e9..72aa3a86d7 100644 --- a/modules/video_output/win32/d3d11_quad.h +++ b/modules/video_output/win32/d3d11_quad.h @@ -81,9 +81,9 @@ void D3D11_ReleaseQuad(d3d_quad_t *); int D3D11_SetupQuad(vlc_object_t *, d3d11_device_t *, const video_format_t *, d3d_quad_t *, const display_info_t *, const RECT *, - ID3D11VertexShader *, ID3D11InputLayout *, video_projection_mode_t, + ID3D11VertexShader *, ID3D11InputLayout *, video_orientation_t); -#define D3D11_SetupQuad(a,b,c,d,e,f,g,h,i,j) D3D11_SetupQuad(VLC_OBJECT(a),b,c,d,e,f,g,h,i,j) +#define D3D11_SetupQuad(a,b,c,d,e,f,g,h,i) D3D11_SetupQuad(VLC_OBJECT(a),b,c,d,e,f,g,h,i) bool D3D11_UpdateQuadPosition( vlc_object_t *, d3d11_device_t *, d3d_quad_t *, const RECT *output, video_orientation_t ); diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index ac3ad26a3c..e46a1f2ec0 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -364,7 +364,7 @@ static picture_pool_t *Pool(vout_display_t *vd, unsigned pool_size) if (D3D11_SetupQuad( vd, &sys->d3d_dev, &surface_fmt, &sys->picQuad, &sys->display, &sys->sys.rect_src_clipped, vd->fmt.projection_mode == PROJECTION_MODE_RECTANGULAR ? sys->flatVSShader : sys->projectionVSShader, sys->pVertexLayout, - surface_fmt.projection_mode, vd->fmt.orientation ) != VLC_SUCCESS) { + vd->fmt.orientation ) != VLC_SUCCESS) { msg_Err(vd, "Could not Create the main quad picture."); return NULL; } @@ -1737,7 +1737,7 @@ static int Direct3D11MapSubpicture(vout_display_t *vd, int *subpicture_region_co } err = D3D11_SetupQuad( vd, &sys->d3d_dev, &r->fmt, d3dquad, &sys->display, &output, - sys->flatVSShader, sys->pVertexLayout, PROJECTION_MODE_RECTANGULAR, ORIENT_NORMAL ); + sys->flatVSShader, sys->pVertexLayout, ORIENT_NORMAL ); if (err != VLC_SUCCESS) { msg_Err(vd, "Failed to setup %dx%d quad for OSD", r->fmt.i_visible_width, r->fmt.i_visible_height); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
