[Libreoffice-commits] core.git: 2 commits - vcl/skia

[Luboš Luňák (via logerrit)]

 vcl/skia/gdiimpl.cxx     |    4 +---
 vcl/skia/win/gdiimpl.cxx |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 2a0f2f074dd643b723bfbcc5c96e4f5ee8da87a3
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Aug 30 21:00:05 2021 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Tue Aug 31 10:05:18 2021 +0200

    fix Skia flushing to screen on Windows (tdf#144145)
    
    Should have been part of eb37b1e346f5651ce8e6848e51103a8986a57c36.
    
    Change-Id: I25c5524fcea90ccc30d880451034d0fa1716b6f5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121327
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index 6cc4acb42034..914e7dbc2159 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -76,7 +76,7 @@ void WinSkiaSalGraphicsImpl::performFlush()
     if (mWindowContext)
     {
         if (mDirtyRect.intersect(SkIRect::MakeWH(GetWidth(), GetHeight())))
-            mWindowContext->swapBuffers(&mDirtyRect);
+            flushSurfaceToWindowContext(mDirtyRect);
         mDirtyRect.setEmpty();
     }
 }
commit 5e4dfd68d690f38dd87609c39fc564b92bc6a0b3
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Aug 30 21:03:20 2021 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Tue Aug 31 10:05:04 2021 +0200

    Skia's kDifference now seems to cause crashes also on AMD/Windows
    
    Change-Id: Ia60605407ba9f890db308301711f2d54bca92d56
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121326
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index cb8708fd5d60..97a34bb3f66f 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1442,13 +1442,11 @@ void SkiaSalGraphicsImpl::invert(basegfx::B2DPolygon const& rPoly, SalInvert eFl
     // in drawing errors. Work that around by fetching the relevant part of the surface
     // and drawing using CPU.
     bool rasterHack = (isGPU() && getVendor() == DriverBlocklist::VendorIntel && !mXorMode);
-#if defined LINUX
     // BackendTest::testDrawInvertTrackFrameWithRectangle() also has a problem
-    // with SkBlendMode::kDifference on AMD/Linux, leading to crashes or even
+    // with SkBlendMode::kDifference on AMD, leading to crashes or even
     // driver instability. Also work around by drawing using CPU.
     if (isGPU() && getVendor() == DriverBlocklist::VendorAMD && !mXorMode)
         rasterHack = true;
-#endif
     SkPath aPath;
     aPath.incReserve(rPoly.count());
     addPolygonToPath(rPoly, aPath);