maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

huh. This is definitely rendering, and not flickering. So that much mean the copy is working (so long as you don't scroll apparently)

Browse source
This commit is contained in:
Mike Griese 2021-07-28 09:45:49 -05:00
parent 77ef9debb3
commit 63f87e9d33
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/renderer/dx/DxRenderer.cpp
View file

@ -787,8 +787,8 @@ static constexpr D2D1_ALPHA_MODE _dxgiAlphaToD2d1Alpha(DXGI_ALPHA_MODE mode) noe
return S_OK;
}
[[nodiscard]] HRESULT DxEngine::_PrepareRenderTarget(::Microsoft::WRL::ComPtr<ID3D11Texture2D> buffer,
::Microsoft::WRL::ComPtr<ID2D1Bitmap1> bitmap) noexcept
[[nodiscard]] HRESULT DxEngine::_PrepareRenderTarget(::Microsoft::WRL::ComPtr<ID3D11Texture2D>& buffer,
::Microsoft::WRL::ComPtr<ID2D1Bitmap1>& bitmap) noexcept
{
try
{
@ -1372,7 +1372,16 @@ try
std::swap(_framebuffer, _otherbuffer);
std::swap(_d2dBitmap, _d2dOtherBitmap);
// _d2dDeviceContext->SetTarget(_d2dBitmap.Get());
if (_d2dBitmap && _d2dOtherBitmap)
{
til::point scrollInPixels = _invalidScroll * _fontRenderData->GlyphCell();
D2D_POINT_2U tgtPos{ scrollInPixels.x<uint32_t>(), scrollInPixels.y<uint32_t>() };
D2D1_RECT_U srcRect{ 0, 0, _displaySizePixels.width<uint32_t>(), _displaySizePixels.height<uint32_t>() };
Microsoft::WRL::ComPtr<ID2D1RenderTarget> otherRenderTarget;
RETURN_IF_FAILED(_d2dDeviceContext->QueryInterface(IID_PPV_ARGS(&otherRenderTarget)));
_d2dBitmap->CopyFromRenderTarget(&tgtPos, otherRenderTarget.Get(), &srcRect);
}
_d2dDeviceContext->BeginDraw();
_isPainting = true;

8
src/renderer/dx/DxRenderer.hpp
View file

@ -222,8 +222,8 @@ namespace Microsoft::Console::Render
wil::unique_handle _swapChainFrameLatencyWaitableObject;
std::unique_ptr<DrawingContext> _drawingContext;
::Microsoft::WRL::ComPtr<ID3D11Texture2D> _framebuffer;
::Microsoft::WRL::ComPtr<ID3D11Texture2D> _otherbuffer;
::Microsoft::WRL::ComPtr<ID3D11Texture2D> _framebuffer{ nullptr };
::Microsoft::WRL::ComPtr<ID3D11Texture2D> _otherbuffer{ nullptr };
// Terminal effects resources.
// Controls if configured terminal effects are enabled
@ -291,8 +291,8 @@ namespace Microsoft::Console::Render
void _ComputePixelShaderSettings() noexcept;
[[nodiscard]] HRESULT _PrepareRenderTarget() noexcept;
[[nodiscard]] HRESULT _PrepareRenderTarget(::Microsoft::WRL::ComPtr<ID3D11Texture2D> buffer,
::Microsoft::WRL::ComPtr<ID2D1Bitmap1> bitmap) noexcept;
[[nodiscard]] HRESULT _PrepareRenderTarget(::Microsoft::WRL::ComPtr<ID3D11Texture2D>& buffer,
::Microsoft::WRL::ComPtr<ID2D1Bitmap1>& bitmap) noexcept;
void _ReleaseDeviceResources() noexcept;