vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Tue Dec 19 10:31:59 2017 +0100| [96a1755af14cd33b5e0b1b689d9e70fbe3216f69] | committer: Jean-Baptiste Kempf
direct3d11: provide 2 sampler states One with linear interpolation, one with point (none) interpolation. Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit f26d5d8734554cae4f3cddc4e8c30c4ac0d0ab8d) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=96a1755af14cd33b5e0b1b689d9e70fbe3216f69 --- modules/video_output/win32/direct3d11.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index 51c424adad..b4bc308835 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -313,7 +313,7 @@ static const char* globPixelShaderDefault = "\ float4x4 Colorspace;\ };\ Texture2D%s shaderTexture[" STRINGIZE(D3D11_MAX_SHADER_VIEW) "];\ - SamplerState SampleType;\ + SamplerState SamplerStates[2];\ \ struct PS_INPUT\ {\ @@ -2201,15 +2201,24 @@ static int Direct3D11CreateGenericResources(vout_display_t *vd) sampDesc.MinLOD = 0; sampDesc.MaxLOD = D3D11_FLOAT32_MAX; - ID3D11SamplerState *d3dsampState; - hr = ID3D11Device_CreateSamplerState(sys->d3d_dev.d3ddevice, &sampDesc, &d3dsampState); + ID3D11SamplerState *d3dsampState[2]; + hr = ID3D11Device_CreateSamplerState(sys->d3d_dev.d3ddevice, &sampDesc, &d3dsampState[0]); + if (FAILED(hr)) { + msg_Err(vd, "Could not Create the D3d11 Sampler State. (hr=0x%lX)", hr); + return VLC_EGENERIC; + } + sampDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + hr = ID3D11Device_CreateSamplerState(sys->d3d_dev.d3ddevice, &sampDesc, &d3dsampState[1]); if (FAILED(hr)) { msg_Err(vd, "Could not Create the D3d11 Sampler State. (hr=0x%lX)", hr); + ID3D11SamplerState_Release(d3dsampState[0]); return VLC_EGENERIC; } - ID3D11DeviceContext_PSSetSamplers(sys->d3d_dev.d3dcontext, 0, 1, &d3dsampState); - ID3D11SamplerState_Release(d3dsampState); + + ID3D11DeviceContext_PSSetSamplers(sys->d3d_dev.d3dcontext, 0, 2, d3dsampState); + ID3D11SamplerState_Release(d3dsampState[0]); + ID3D11SamplerState_Release(d3dsampState[1]); msg_Dbg(vd, "Direct3D11 resources created"); return VLC_SUCCESS; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
