external/skia/UnpackedTarball_skia.mk | 2 external/skia/macosmetal.patch.0 | 70 +++++++++++++++++++--------------- vcl/osx/salgdiutils.cxx | 17 ++------ 3 files changed, 47 insertions(+), 42 deletions(-)
New commits: commit 903f23d3eeb84b2b658251876c78c0b0d6ba1616 Author: Patrick Luby <[email protected]> AuthorDate: Wed Sep 25 19:32:55 2024 -0400 Commit: Christian Lohmaier <[email protected]> CommitDate: Mon Oct 14 14:51:12 2024 +0200 tdf#163152 don't convert image's sRGB colorspace With Skia/Raster or Skia disabled, converting the image's colorspace to match the window's colorspace causes more than an expected amount of color saturation so let the window's underlying CGContext handle any necessary colorspace conversion in CGContextDrawImage(). With Skia/Metal, this bug is caused by the CAMetalLayer being set to the same colorspace as its matching window. So set the CAMetalLayer's colorspace to sRGB so that, like with Skia/Raster and Skia disabled, any colorspace conversion is handled when the CAMetalLayer is drawn to the window. Change-Id: Ifa2abe46d34bfcf5acd478fffd346603f869157b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173962 Tested-by: Jenkins Reviewed-by: Patrick Luby <[email protected]> (cherry picked from commit e4ab68142c7bc4e04ffe429567dda974b86985a7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174005 Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index 2cdcf62872d3..bdfd27d36703 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -33,7 +33,7 @@ skia_patches := \ windows-libraries-system32.patch.1 \ allow-no-es2restrictions.patch.1 \ vk_mem_alloc.patch.1 \ - tdf147342.patch.0 \ + macosmetal.patch.0 \ redefinition-of-op.patch.0 \ 0001-Added-missing-include-cstdio.patch \ fix-SkDebugf-link-error.patch.1 \ diff --git a/external/skia/tdf147342.patch.0 b/external/skia/macosmetal.patch.0 similarity index 84% rename from external/skia/tdf147342.patch.0 rename to external/skia/macosmetal.patch.0 index 3b50038c07ac..3da9fc693fe9 100644 --- a/external/skia/tdf147342.patch.0 +++ b/external/skia/macosmetal.patch.0 @@ -18,36 +18,6 @@ namespace window_context_factory { ---- tools/sk_app/mac/MetalWindowContext_mac.mm 2021-11-25 10:39:27.000000000 -0500 -+++ tools/sk_app/mac/MetalWindowContext_mac.mm 2023-01-28 14:55:57.000000000 -0500 -@@ -11,6 +11,8 @@ - #import <Cocoa/Cocoa.h> - #import <QuartzCore/CAConstraintLayoutManager.h> - -+#include <sal/log.hxx> -+ - using sk_app::DisplayParams; - using sk_app::window_context_factory::MacWindowInfo; - using sk_app::MetalWindowContext; -@@ -87,6 +89,18 @@ - fMetalLayer.drawableSize = backingSize; - fMetalLayer.contentsScale = backingScaleFactor; - -+ // Related: tdf#147342 Copy layer's colorspace to window's colorspace -+ // This method is now called when the window's backing properties have -+ // changed so copy any colorspace changes. -+ NSColorSpace* cs = fMainView.window.colorSpace; -+ fMetalLayer.colorspace = cs.CGColorSpace; -+ // Related tdf#145988 Reset layer's pixel format to MTLPixelFormatBGRA8Unorm -+ // Skia initally sets the layer's pixel format to be BGRA8888 but macOS -+ // may change the layer's pixel format when a window has moved to a screen -+ // with 30-bit color depth so reset it back to BGRA8888. -+ SAL_WARN_IF(fMetalLayer.pixelFormat != MTLPixelFormatBGRA8Unorm, "vcl.skia.metal", "CAMetalLayer pixel format is " << fMetalLayer.pixelFormat << " but should be " << MTLPixelFormatBGRA8Unorm << " (MTLPixelFormatBGRA8Unorm)"); -+ fMetalLayer.pixelFormat = MTLPixelFormatBGRA8Unorm; -+ - fWidth = backingSize.width; - fHeight = backingSize.height; - } --- /dev/null 2023-01-25 09:20:55.000000000 -0500 +++ tools/sk_app/mac/WindowContextFactory_mac.mm 2023-01-25 09:21:22.000000000 -0500 @@ -0,0 +1,57 @@ @@ -108,3 +78,43 @@ +} + +} // namespace sk_app +--- tools/sk_app/mac/MetalWindowContext_mac.mm 2024-08-31 15:49:57 ++++ tools/sk_app/mac/MetalWindowContext_mac.mm 2024-09-25 20:09:32 +@@ -11,6 +11,8 @@ + #import <Cocoa/Cocoa.h> + #import <QuartzCore/CAConstraintLayoutManager.h> + ++#include <sal/log.hxx> ++ + using sk_app::DisplayParams; + using sk_app::window_context_factory::MacWindowInfo; + using sk_app::MetalWindowContext; +@@ -66,8 +68,7 @@ + fMetalLayer.autoresizingMask = kCALayerHeightSizable | kCALayerWidthSizable; + fMetalLayer.contentsGravity = kCAGravityTopLeft; + fMetalLayer.magnificationFilter = kCAFilterNearest; +- NSColorSpace* cs = fMainView.window.colorSpace; +- fMetalLayer.colorspace = cs.CGColorSpace; ++ fMetalLayer.colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); + + fMainView.layer = fMetalLayer; + fMainView.wantsLayer = YES; +@@ -86,6 +87,18 @@ + fMetalLayer.drawableSize = backingSize; + fMetalLayer.contentsScale = backingScaleFactor; + ++ // Related: tdf#147342 Copy layer's colorspace to window's colorspace ++ // This method is now called when the window's backing properties have ++ // changed so copy any colorspace changes. ++ fMetalLayer.colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); ++ ++ // Related tdf#145988 Reset layer's pixel format to MTLPixelFormatBGRA8Unorm ++ // Skia initally sets the layer's pixel format to be BGRA8888 but macOS ++ // may change the layer's pixel format when a window has moved to a screen ++ // with 30-bit color depth so reset it back to BGRA8888. ++ SAL_WARN_IF(fMetalLayer.pixelFormat != MTLPixelFormatBGRA8Unorm, "vcl.skia.metal", "CAMetalLayer pixel format is " << fMetalLayer.pixelFormat << " but should be " << MTLPixelFormatBGRA8Unorm << " (MTLPixelFormatBGRA8Unorm)"); ++ fMetalLayer.pixelFormat = MTLPixelFormatBGRA8Unorm; ++ + fWidth = backingSize.width; + fHeight = backingSize.height; + } diff --git a/vcl/osx/salgdiutils.cxx b/vcl/osx/salgdiutils.cxx index d7f8ec48eaf0..7e2cf029b71f 100644 --- a/vcl/osx/salgdiutils.cxx +++ b/vcl/osx/salgdiutils.cxx @@ -381,17 +381,12 @@ void AquaSalGraphics::UpdateWindow( NSRect& rRect ) CGContextSetBlendMode(rCGContextHolder.get(), kCGBlendModeCopy); - NSWindow *pWindow = maShared.mpFrame->getNSWindow(); - if (pWindow) - { - CGImageRef displayColorSpaceImage = CGImageCreateCopyWithColorSpace(img, [[maShared.mpFrame->getNSWindow() colorSpace] CGColorSpace]); - CGContextDrawImage(rCGContextHolder.get(), aRect, displayColorSpaceImage); - CGImageRelease(displayColorSpaceImage); - } - else - { - CGContextDrawImage(rCGContextHolder.get(), aRect, img); - } + // tdf#163152 don't convert image's sRGB colorspace + // Converting the image's colorspace to match the window's + // colorspace causes more than an expected amount of color + // saturation so let the window's underlying CGContext handle + // any necessary colorspace conversion in CGContextDrawImage(). + CGContextDrawImage(rCGContextHolder.get(), aRect, img); rCGContextHolder.restoreState();
