From 6e4113a00f18a6f24aea01e5cfbeb951f89a9799 Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Mon, 24 Sep 2018 21:51:53 +0300 Subject: Revert "VideoPlayer: WinRenderer - add smooth motion" --- .../VideoPlayer/VideoRenderers/WinRenderer.cpp | 35 ++-------------------- .../cores/VideoPlayer/VideoRenderers/WinRenderer.h | 1 - 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.cpp index 64ce244e1e..72ac0aa759 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.cpp @@ -276,10 +276,7 @@ void CWinRenderer::Update() void CWinRenderer::RenderUpdate(int index, int index2, bool clear, unsigned int flags, unsigned int alpha) { - if (index2 >= 0) - m_iYV12RenderBuffer = index2; - else - m_iYV12RenderBuffer = index; + m_iYV12RenderBuffer = index; if (clear) CServiceBroker::GetWinSystem()->GetGfxContext().Clear(DX::Windowing()->UseLimitedColor() ? 0x101010 : 0); @@ -290,35 +287,7 @@ void CWinRenderer::RenderUpdate(int index, int index2, bool clear, unsigned int DX::Windowing()->SetAlphaBlendEnable(alpha < 255); ManageTextures(); ManageRenderArea(); - - CD3DTexture* backBuffer = DX::Windowing()->GetBackBuffer(); - - Render(flags, backBuffer); - - if (index2 > 0 && backBuffer) - { - m_iYV12RenderBuffer = index; - - if (!m_smoothTarget.Get() || m_smoothTarget.GetWidth() != backBuffer->GetWidth() || - m_smoothTarget.GetHeight() != backBuffer->GetHeight()) - { - m_smoothTarget.Release(); - m_smoothTarget.Create(backBuffer->GetWidth(), backBuffer->GetHeight(), 1, D3D11_USAGE_DEFAULT, - backBuffer->GetFormat()); - } - - if (m_smoothTarget.Get()) - { - Render(flags, &m_smoothTarget); - - DX::Windowing()->SetAlphaBlendEnable(true); - CRect texCoord = {0, 0, 1, 1}; - CRect trgCoord = {0, 0, static_cast(backBuffer->GetWidth()), - static_cast(backBuffer->GetHeight())}; - CD3DTexture::DrawQuad(trgCoord, 0x80FFFFFF, &m_smoothTarget, &texCoord, - SHADER_METHOD_RENDER_TEXTURE_BLEND); - } - } + Render(flags, DX::Windowing()->GetBackBuffer()); } void CWinRenderer::PreInit() diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h index 1757c3a1c5..939c210cb3 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h +++ b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h @@ -125,6 +125,5 @@ protected: Microsoft::WRL::ComPtr m_pCLUTView; CD3DTexture m_IntermediateTarget; - CD3DTexture m_smoothTarget; AVColorPrimaries m_srcPrimaries; }; -- cgit v1.2.3