Skip to content

V
vlc
Commit 49e1ba40 authored by Steve Lhomme's avatar Steve Lhomme Committed by Jean-Baptiste Kempf
Browse files
Options

direct3d11: check the right flag combination 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 3d5a30c5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/video_output/msw/direct3d11.c
View file @ 49e1ba40
...@@ -870,7 +870,7 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt) ...@@ -870,7 +870,7 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt)
if( SUCCEEDED( ID3D11Device_CheckFormatSupport(sys->d3ddevice, if( SUCCEEDED( ID3D11Device_CheckFormatSupport(sys->d3ddevice,
d3d_formats[i].formatTexture, d3d_formats[i].formatTexture,
&i_formatSupport)) && &i_formatSupport)) &&
( i_formatSupport & i_quadSupportFlags )) ( i_formatSupport & i_quadSupportFlags ) == i_quadSupportFlags )
{ {
msg_Dbg(vd, "Using pixel format %s", d3d_formats[i].name ); msg_Dbg(vd, "Using pixel format %s", d3d_formats[i].name );
sys->vlcFormat = d3d_formats[i].fourcc; sys->vlcFormat = d3d_formats[i].fourcc;
...@@ -890,7 +890,7 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt) ...@@ -890,7 +890,7 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt)
if( SUCCEEDED( ID3D11Device_CheckFormatSupport(sys->d3ddevice, if( SUCCEEDED( ID3D11Device_CheckFormatSupport(sys->d3ddevice,
d3d_formats[i].formatTexture, d3d_formats[i].formatTexture,
&i_formatSupport)) && &i_formatSupport)) &&
( i_formatSupport & i_quadSupportFlags )) ( i_formatSupport & i_quadSupportFlags ) == i_quadSupportFlags )
{ {
msg_Dbg(vd, "Using pixel format %s", d3d_formats[i].name ); msg_Dbg(vd, "Using pixel format %s", d3d_formats[i].name );
sys->vlcFormat = d3d_formats[i].fourcc; sys->vlcFormat = d3d_formats[i].fourcc;
...@@ -912,14 +912,14 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt) ...@@ -912,14 +912,14 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmt)
if( SUCCEEDED( ID3D11Device_CheckFormatSupport(sys->d3ddevice, if( SUCCEEDED( ID3D11Device_CheckFormatSupport(sys->d3ddevice,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
&i_formatSupport)) && &i_formatSupport)) &&
( i_formatSupport & i_quadSupportFlags )) { ( i_formatSupport & i_quadSupportFlags ) == i_quadSupportFlags) {
sys->d3dregion_format = DXGI_FORMAT_R8G8B8A8_UNORM; sys->d3dregion_format = DXGI_FORMAT_R8G8B8A8_UNORM;
sys->pSubpictureChromas[0] = VLC_CODEC_RGBA; sys->pSubpictureChromas[0] = VLC_CODEC_RGBA;
sys->pSubpictureChromas[1] = 0; sys->pSubpictureChromas[1] = 0;
} else if( SUCCEEDED( ID3D11Device_CheckFormatSupport(sys->d3ddevice, } else if( SUCCEEDED( ID3D11Device_CheckFormatSupport(sys->d3ddevice,
DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM,
&i_formatSupport)) && &i_formatSupport)) &&
( i_formatSupport & i_quadSupportFlags )) { ( i_formatSupport & i_quadSupportFlags ) == i_quadSupportFlags) {
sys->d3dregion_format = DXGI_FORMAT_B8G8R8A8_UNORM; sys->d3dregion_format = DXGI_FORMAT_B8G8R8A8_UNORM;
sys->pSubpictureChromas[0] = VLC_CODEC_BGRA; sys->pSubpictureChromas[0] = VLC_CODEC_BGRA;
sys->pSubpictureChromas[1] = 0; sys->pSubpictureChromas[1] = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment