[Libreoffice-commits] core.git: Branch 'feature/skia' - vcl/skia

Luboš Luňák (via logerrit) logerrit at kemper.freedesktop.org
Wed Nov 13 13:56:11 UTC 2019


 vcl/skia/gdiimpl.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit ff8b13efb1299c291742bfd5d70f8d11695e0b03
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Nov 13 13:58:58 2019 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Wed Nov 13 14:55:25 2019 +0100

    remove no-longer-needed Skia workaround for GPU offscreen drawing
    
    Change-Id: I044a9a31af71c4c624f08a0813bc59472f4c728a

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index cb2beb2667a0..caed9fb33431 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -739,11 +739,6 @@ void SkiaSalGraphicsImpl::copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcG
         assert(dynamic_cast<SkiaSalGraphicsImpl*>(pSrcGraphics->GetImpl()));
         src = static_cast<SkiaSalGraphicsImpl*>(pSrcGraphics->GetImpl());
         src->checkSurface();
-        // TODO Without this flush() Skia asserts if both src and destination are
-        // GPU-backed SkSurface that come from different GrContext (e.g. when
-        // src comes from SkiaVulkanGrContext and target is a window). I don't
-        // know if it's a Skia bug or our GrContext usage is incorrect.
-        src->mSurface->flush();
     }
     else
         src = this;


More information about the Libreoffice-commits mailing list