vlc | branch: master | Steve Lhomme <rob...@videolabs.io> | Mon Mar 23 16:18:59 2015 +0100| [e045b625af773c7f84e78a277f8c053447c1ff19] | committer: Jean-Baptiste Kempf
direct3d11: code cleaning and typos Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e045b625af773c7f84e78a277f8c053447c1ff19 --- modules/video_output/msw/direct3d11.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/video_output/msw/direct3d11.c b/modules/video_output/msw/direct3d11.c index 5c147a4..f8817e3 100644 --- a/modules/video_output/msw/direct3d11.c +++ b/modules/video_output/msw/direct3d11.c @@ -825,17 +825,17 @@ static int Direct3D11CreateResources(vout_display_t *vd, video_format_t *fmt) D3D11_SHADER_RESOURCE_VIEW_DESC resviewDesc; memset(&resviewDesc, 0, sizeof(resviewDesc)); - resviewDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - resviewDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; - resviewDesc.Texture2D.MipLevels = texDesc.MipLevels; - if (sys->vlcFormat == VLC_CODEC_NV12) resviewDesc.Format = DXGI_FORMAT_R8_UNORM; + else + resviewDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resviewDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; + resviewDesc.Texture2D.MipLevels = texDesc.MipLevels; hr = ID3D11Device_CreateShaderResourceView(sys->d3ddevice, (ID3D11Resource *)sys->d3dtexture, &resviewDesc, &sys->d3dresViewY); if (FAILED(hr)) { if(sys->d3dtexture) ID3D11Texture2D_Release(sys->d3dtexture); - msg_Err(vd, "Could not Create the Y D3d11 Texture ResoureView. (hr=0x%lX)", hr); + msg_Err(vd, "Could not Create the Y D3d11 Texture ResourceView. (hr=0x%lX)", hr); return VLC_EGENERIC; } @@ -844,7 +844,7 @@ static int Direct3D11CreateResources(vout_display_t *vd, video_format_t *fmt) hr = ID3D11Device_CreateShaderResourceView(sys->d3ddevice, (ID3D11Resource *)sys->d3dtexture, &resviewDesc, &sys->d3dresViewUV); if (FAILED(hr)) { if(sys->d3dtexture) ID3D11Texture2D_Release(sys->d3dtexture); - msg_Err(vd, "Could not Create the U D3d11 Texture ResoureView. (hr=0x%lX)", hr); + msg_Err(vd, "Could not Create the UV D3d11 Texture ResourceView. (hr=0x%lX)", hr); return VLC_EGENERIC; } } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
