external/skia/swap-buffers-rect.patch.1 | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-)
New commits: commit 97c0797cf379cca6056b8ab34499b56c7f01fd9b Author: Patrick Luby <[email protected]> AuthorDate: Fri Nov 22 13:43:25 2024 +0100 Commit: Patrick Luby <[email protected]> CommitDate: Fri Nov 22 15:21:54 2024 +0100 Revert "tdf#163945 present drawable immediately" This reverts commit 32eb29377c5bbf6a965357756d2813add2789053. Reason for revert: Original commit did not fix tdf#163945 Change-Id: Ie66edde40ed44f89bb28043db074fab7e6e06a49 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177025 Tested-by: Jenkins Reviewed-by: Patrick Luby <[email protected]> diff --git a/external/skia/swap-buffers-rect.patch.1 b/external/skia/swap-buffers-rect.patch.1 index 0451725fdf22..0b02be761a50 100644 --- a/external/skia/swap-buffers-rect.patch.1 +++ b/external/skia/swap-buffers-rect.patch.1 @@ -11,9 +11,9 @@ diff -ur skia.org/tools/window/MetalWindowContext.h skia/tools/window/MetalWindo bool fValid; diff -ur skia.org/tools/window/MetalWindowContext.mm skia/tools/window/MetalWindowContext.mm ---- skia.org/tools/window/MetalWindowContext.mm 2024-11-15 19:32:58 -+++ skia/tools/window/MetalWindowContext.mm 2024-11-20 19:02:09 -@@ -153,13 +153,21 @@ +--- skia.org/tools/window/MetalWindowContext.mm 2024-10-05 18:16:04.521814026 +0200 ++++ skia/tools/window/MetalWindowContext.mm 2024-10-05 18:17:31.670443188 +0200 +@@ -193,7 +193,7 @@ return surface; } @@ -22,21 +22,6 @@ diff -ur skia.org/tools/window/MetalWindowContext.mm skia/tools/window/MetalWind id<CAMetalDrawable> currentDrawable = (id<CAMetalDrawable>)fDrawableHandle; id<MTLCommandBuffer> commandBuffer([*fShared->fQueue commandBuffer]); - commandBuffer.label = @"Present"; - -- [commandBuffer presentDrawable:currentDrawable]; -+ // tdf#163945 present drawable immediately -+ // It seems that -[MTLCommandBuffer presentDrawable:] doesn't -+ // immediately replace the previous drawable on screen so I -+ // assume that there is some default minimum display time for -+ // drawables. -+ // LibreOffice only invokes this method in a timer so let -+ // LibreOffice control the rate of window updates by presenting -+ // the drawable right now. -+ [commandBuffer presentDrawable:currentDrawable atTime:CACurrentMediaTime()]; - [commandBuffer commit]; - // ARC is off in sk_app, so we need to release the CF ref manually - CFRelease(fDrawableHandle); diff -ur skia.org/tools/window/unix/RasterWindowContext_unix.cpp skia/tools/window/unix/RasterWindowContext_unix.cpp --- skia.org/tools/window/unix/RasterWindowContext_unix.cpp 2024-10-05 18:16:04.521814026 +0200 +++ skia/tools/window/unix/RasterWindowContext_unix.cpp 2024-10-05 18:18:49.554847490 +0200
