[vlc-devel] [PATCH 2/2] direct3d11: check the right flag combination

Jean-Baptiste Kempf jb at videolan.org
Thu May 28 17:55:08 CEST 2015


Applied.

On 27 May, Steve Lhomme wrote :
> ---
>  modules/video_output/msw/direct3d11.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/modules/video_output/msw/direct3d11.c
> b/modules/video_output/msw/direct3d11.c
> index a708cbb..898bc8d 100644
> --- a/modules/video_output/msw/direct3d11.c
> +++ b/modules/video_output/msw/direct3d11.c
> @@ -876,7 +876,7 @@ static int Direct3D11Open(vout_display_t *vd,
> video_format_t *fmt)
>              if( SUCCEEDED( ID3D11Device_CheckFormatSupport(sys->d3ddevice,
> 
> d3d_formats[i].formatTexture,
> 
> &i_formatSupport)) &&
> -                    ( i_formatSupport & i_quadSupportFlags ))
> +                    ( i_formatSupport & i_quadSupportFlags ) ==
> i_quadSupportFlags )
>              {
>                  msg_Dbg(vd, "Using pixel format %s", d3d_formats[i].name );
>                  sys->vlcFormat = d3d_formats[i].fourcc;
> @@ -896,7 +896,7 @@ static int Direct3D11Open(vout_display_t *vd,
> video_format_t *fmt)
>              if( SUCCEEDED( ID3D11Device_CheckFormatSupport(sys->d3ddevice,
> 
> d3d_formats[i].formatTexture,
> 
> &i_formatSupport)) &&
> -                    ( i_formatSupport & i_quadSupportFlags ))
> +                    ( i_formatSupport & i_quadSupportFlags ) ==
> i_quadSupportFlags )
>              {
>                  msg_Dbg(vd, "Using pixel format %s", d3d_formats[i].name );
>                  sys->vlcFormat = d3d_formats[i].fourcc;
> @@ -918,14 +918,14 @@ static int Direct3D11Open(vout_display_t *vd,
> video_format_t *fmt)
>      if( SUCCEEDED( ID3D11Device_CheckFormatSupport(sys->d3ddevice,
> 
> DXGI_FORMAT_R8G8B8A8_UNORM,
>                                                     &i_formatSupport)) &&
> -            ( i_formatSupport & i_quadSupportFlags )) {
> +            ( i_formatSupport & i_quadSupportFlags ) == i_quadSupportFlags)
> {
>          sys->d3dregion_format = DXGI_FORMAT_R8G8B8A8_UNORM;
>          sys->pSubpictureChromas[0] = VLC_CODEC_RGBA;
>          sys->pSubpictureChromas[1] = 0;
>      } else if( SUCCEEDED( ID3D11Device_CheckFormatSupport(sys->d3ddevice,
> 
> DXGI_FORMAT_B8G8R8A8_UNORM,
> 
> &i_formatSupport)) &&
> -                   ( i_formatSupport & i_quadSupportFlags )) {
> +                   ( i_formatSupport & i_quadSupportFlags ) ==
> i_quadSupportFlags) {
>          sys->d3dregion_format = DXGI_FORMAT_B8G8R8A8_UNORM;
>          sys->pSubpictureChromas[0] = VLC_CODEC_BGRA;
>          sys->pSubpictureChromas[1] = 0;
> -- 
> 1.9.5.msysgit.0
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel

-- 
With my kindest regards,

-- 
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device



More information about the vlc-devel mailing list