download.lst | 4 - external/skia/Library_skia.mk | 33 +---------- external/skia/clang-attributes-warning.patch.1 | 6 +- external/skia/fix-pch.patch.1 | 26 +-------- external/skia/fix-without-gl.patch.1 | 2 external/skia/share-grcontext.patch.1 | 72 ++++++++++++------------- 6 files changed, 49 insertions(+), 94 deletions(-)
New commits: commit 860ec21856a25c1aee45e64b5760a31294e62d54 Author: Noel Grandin <[email protected]> AuthorDate: Tue Oct 8 16:00:47 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Oct 9 13:55:48 2024 +0200 update to skia m123 Change-Id: Ic7687add0fce85b17bf77b003137649bc7be9042 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174703 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/download.lst b/download.lst index 64069403bca1..98810dbf4588 100644 --- a/download.lst +++ b/download.lst @@ -626,8 +626,8 @@ RHINO_TARBALL := rhino-1.7.15.zip # three static lines # so that git cherry-pick # will not run into conflicts -SKIA_SHA256SUM := 68a0bb515b8834a93a7bc5b49d1a0d789be0bd92ac2b7c2a60a99dac41d12f9d -SKIA_TARBALL := skia-m122-256631b5cc1d91e84811e2ded209d999515618f1.tar.xz +SKIA_SHA256SUM := b14a960166f9a87f96287f7f1809152c658e4187a1159f876f174379c4032c66 +SKIA_TARBALL := skia-m123-4a0a5e99062a105b3d8f3f819f1579f776897171.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index 64d74d531d8f..b63c2f4ae392 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -466,7 +466,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/core/SkScan_Antihair \ UnpackedTarball/skia/src/core/SkScan_Hairline \ UnpackedTarball/skia/src/core/SkScan_Path \ - UnpackedTarball/skia/src/core/SkScan_SAAPath \ UnpackedTarball/skia/src/core/SkSpecialImage \ UnpackedTarball/skia/src/core/SkSpriteBlitter_ARGB32 \ UnpackedTarball/skia/src/core/SkStream \ @@ -757,6 +756,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/sksl/transform/SkSLEliminateEmptyStatements \ UnpackedTarball/skia/src/sksl/transform/SkSLEliminateUnreachableCode \ UnpackedTarball/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinFunctions \ + UnpackedTarball/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinStructs \ UnpackedTarball/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinVariables \ UnpackedTarball/skia/src/sksl/transform/SkSLHoistSwitchVarDeclarationsAtTopLevel \ UnpackedTarball/skia/src/sksl/transform/SkSLRenamePrivateSymbols \ @@ -1232,7 +1232,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/opts/SkOpts_hsw \ UnpackedTarball/skia/src/core/SkSwizzler_opts_hsw \ UnpackedTarball/skia/src/core/SkBlitRow_opts_hsw \ - UnpackedTarball/skia/src/core/SkBitmapProcState_opts_hsw \ UnpackedTarball/skia/modules/skcms/src/skcms_TransformHsw, \ $(CXXFLAGS_INTRINSICS_AVX2) $(CXXFLAGS_INTRINSICS_F16C) $(CXXFLAGS_INTRINSICS_FMA) \ $(LO_CLANG_CXXFLAGS_INTRINSICS_AVX2) $(LO_CLANG_CXXFLAGS_INTRINSICS_F16C) $(LO_CLANG_CXXFLAGS_INTRINSICS_FMA) \ diff --git a/external/skia/clang-attributes-warning.patch.1 b/external/skia/clang-attributes-warning.patch.1 index fa617c4e831f..6e6c34674734 100644 --- a/external/skia/clang-attributes-warning.patch.1 +++ b/external/skia/clang-attributes-warning.patch.1 @@ -12,9 +12,9 @@ diff -ur skia.org/include/private/base/SkFloatingPoint.h skia/include/private/ba return static_cast<float>(x); } @@ -161,12 +163,16 @@ - - // IEEE defines how float divide behaves for non-finite values and zero-denoms, but C does not, - // so we have a helper that suppresses the possible undefined-behavior warnings. + #pragma warning( disable : 4723) + #endif + // Your function +#if defined(__clang__) SK_NO_SANITIZE("float-divide-by-zero") +#endif diff --git a/external/skia/fix-pch.patch.1 b/external/skia/fix-pch.patch.1 index fa449941171e..235b63be6908 100644 --- a/external/skia/fix-pch.patch.1 +++ b/external/skia/fix-pch.patch.1 @@ -2,13 +2,13 @@ diff --git a/include/private/SkColorData.h b/include/private/SkColorData.h index a59e7b0446..960b4c0313 100644 --- a/include/private/SkColorData.h +++ b/include/private/SkColorData.h -@@ -438,4 +438,6 @@ constexpr SkPMColor4f SK_PMColor4fILLEGAL = { SK_FloatNegativeInfinity, +@@ -382,4 +382,6 @@ constexpr SkPMColor4f SK_PMColor4fILLEGAL = { SK_FloatNegativeInfinity, + SK_FloatNegativeInfinity, SK_FloatNegativeInfinity, SK_FloatNegativeInfinity }; - +template <> uint32_t SkPMColor4f::toBytes_RGBA() const; + - #endif + #endif // SkColorData_DEFINED diff --git a/src/core/SkM44.cpp b/src/core/SkM44.cpp index 02b1741763..4cece999d2 100644 --- a/src/core/SkM44.cpp @@ -34,26 +34,6 @@ index 70c7f0ea80..ab8319a447 100644 #ifdef VK_USE_PLATFORM_WIN32_KHR // windows wants to define this as CreateSemaphoreA or CreateSemaphoreW -diff --git a/src/sksl/ir/SkSLPoison.h b/src/sksl/ir/SkSLPoison.h -index 035f94e1f6..3cf12db902 100644 ---- a/src/sksl/ir/SkSLPoison.h -+++ b/src/sksl/ir/SkSLPoison.h -@@ -5,6 +5,9 @@ - * found in the LICENSE file. - */ - -+#ifndef SKSL_POISON -+#define SKSL_POISON -+ - #include "src/sksl/SkSLBuiltinTypes.h" - #include "src/sksl/SkSLCompiler.h" - #include "src/sksl/SkSLContext.h" -@@ -38,3 +41,5 @@ private: - }; - - } // namespace SkSL -+ -+#endif diff --git a/src/utils/win/SkDWriteGeometrySink.h b/src/utils/win/SkDWriteGeometrySink.h index af4909aaaf..825ec35c83 100644 --- a/src/utils/win/SkDWriteGeometrySink.h diff --git a/external/skia/fix-without-gl.patch.1 b/external/skia/fix-without-gl.patch.1 index 1f78e3ebe22d..cdc89df8efa4 100644 --- a/external/skia/fix-without-gl.patch.1 +++ b/external/skia/fix-without-gl.patch.1 @@ -2,7 +2,7 @@ diff -ur skia.org/include/gpu/gl/GrGLInterface.h skia/include/gpu/gl/GrGLInterfa --- skia.org/include/gpu/gl/GrGLInterface.h 2024-10-04 15:33:38.063875425 +0200 +++ skia/include/gpu/gl/GrGLInterface.h 2024-10-04 15:34:00.073017585 +0200 @@ -83,7 +83,9 @@ - + GrGLStandard fStandard; GrGLExtensions fExtensions; +#ifdef SK_GL commit a16a0dc9d211e48da5799e8c10a3b5e4f58f2525 Author: Noel Grandin <[email protected]> AuthorDate: Tue Oct 8 15:06:19 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Oct 9 13:55:40 2024 +0200 update to skia m122 Change-Id: Ifdc602fa7007a9352cdd1a654555204955c89317 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174702 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/download.lst b/download.lst index 1d570dfb0c82..64069403bca1 100644 --- a/download.lst +++ b/download.lst @@ -626,8 +626,8 @@ RHINO_TARBALL := rhino-1.7.15.zip # three static lines # so that git cherry-pick # will not run into conflicts -SKIA_SHA256SUM := 5243142cfc4df00d43b41152e9de3a31d45351cd11c2981739a2a785df637d6f -SKIA_TARBALL := skia-m121-18df6cbca7783c3c24a564ef54a12fc9c2d8cd70.tar.xz +SKIA_SHA256SUM := 68a0bb515b8834a93a7bc5b49d1a0d789be0bd92ac2b7c2a60a99dac41d12f9d +SKIA_TARBALL := skia-m122-256631b5cc1d91e84811e2ded209d999515618f1.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index ce5eef8926dd..64d74d531d8f 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -148,14 +148,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ )) endif -# from file skia/gn/BUILD.gn:426, target "optional("fontmgr_fontconfig_factory")" -# -ifneq ($(filter-out WNT MACOSX,$(OS)),) -$(eval $(call gb_Library_add_generated_exception_objects,skia,\ - UnpackedTarball/skia/src/ports/SkFontMgr_fontconfig_factory \ -)) -endif - # from file skia/gn/BUILD.gn:432, target "optional("fontmgr_FontConfigInterface")" # ifneq ($(filter-out WNT MACOSX,$(OS)),) @@ -177,14 +169,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ )) endif -# from file skia/gn/BUILD.gn:508, target "optional("fontmgr_mac_ct_factory")" -# -ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_generated_exception_objects,skia,\ - UnpackedTarball/skia/src/ports/SkFontMgr_mac_ct_factory \ -)) -endif - # from file skia/gn/BUILD.gn:514, target "optional("fontmgr_win")" # ifeq ($(OS),WNT) @@ -196,14 +180,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ )) endif -# from file skia/gn/BUILD.gn:530, target "optional("fontmgr_win_factory")" -# -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_generated_exception_objects,skia,\ - UnpackedTarball/skia/src/ports/SkFontMgr_win_dw_factory \ -)) -endif - # from file skia/gn/BUILD.gn:536, target "optional("fontmgr_win_gdi")" # ifeq ($(OS),WNT) @@ -300,7 +276,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/codec/SkColorPalette \ UnpackedTarball/skia/src/codec/SkExif \ UnpackedTarball/skia/src/codec/SkImageGenerator_FromEncoded \ - UnpackedTarball/skia/src/codec/SkMasks \ UnpackedTarball/skia/src/codec/SkMaskSwizzler \ UnpackedTarball/skia/src/codec/SkPixmapUtils \ UnpackedTarball/skia/src/codec/SkSampler \ @@ -435,6 +410,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/core/SkMaskCache \ UnpackedTarball/skia/src/core/SkMaskFilter \ UnpackedTarball/skia/src/core/SkMaskGamma \ + UnpackedTarball/skia/src/core/SkMasks \ UnpackedTarball/skia/src/core/SkMatrix \ UnpackedTarball/skia/src/core/SkMatrixInvert \ UnpackedTarball/skia/src/core/SkMemset_opts \ @@ -707,10 +683,10 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/sksl/SkSLPosition \ UnpackedTarball/skia/src/sksl/SkSLSampleUsage \ UnpackedTarball/skia/src/sksl/SkSLString \ - UnpackedTarball/skia/src/sksl/SkSLThreadContext \ UnpackedTarball/skia/src/sksl/SkSLUtil \ UnpackedTarball/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue \ UnpackedTarball/skia/src/sksl/analysis/SkSLCheckProgramStructure \ + UnpackedTarball/skia/src/sksl/analysis/SkSLCheckSymbolTableCorrectness \ UnpackedTarball/skia/src/sksl/analysis/SkSLFinalizationChecks \ UnpackedTarball/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo \ UnpackedTarball/skia/src/sksl/analysis/SkSLGetLoopUnrollInfo \ @@ -764,6 +740,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/sksl/ir/SkSLSwitchCase \ UnpackedTarball/skia/src/sksl/ir/SkSLSwitchStatement \ UnpackedTarball/skia/src/sksl/ir/SkSLSwizzle \ + UnpackedTarball/skia/src/sksl/ir/SkSLSymbol \ UnpackedTarball/skia/src/sksl/ir/SkSLSymbolTable \ UnpackedTarball/skia/src/sksl/ir/SkSLTernaryExpression \ UnpackedTarball/skia/src/sksl/ir/SkSLType \ @@ -899,7 +876,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/gpu/ganesh/GrDriverBugWorkarounds \ UnpackedTarball/skia/src/gpu/ganesh/GrDynamicAtlas \ UnpackedTarball/skia/src/gpu/ganesh/GrEagerVertexAllocator \ - UnpackedTarball/skia/src/gpu/ganesh/GrFinishCallbacks \ UnpackedTarball/skia/src/gpu/ganesh/GrFixedClip \ UnpackedTarball/skia/src/gpu/ganesh/GrFragmentProcessor \ UnpackedTarball/skia/src/gpu/ganesh/GrFragmentProcessors \ diff --git a/external/skia/share-grcontext.patch.1 b/external/skia/share-grcontext.patch.1 index d7ccb9ddabc2..35dfa36eb972 100644 --- a/external/skia/share-grcontext.patch.1 +++ b/external/skia/share-grcontext.patch.1 @@ -1,6 +1,6 @@ diff -ur skia.org/tools/window/mac/MetalWindowContext_mac.mm skia/tools/window/mac/MetalWindowContext_mac.mm ---- skia.org/tools/window/mac/MetalWindowContext_mac.mm 2024-10-07 15:52:39.401549032 +0200 -+++ skia/tools/window/mac/MetalWindowContext_mac.mm 2024-10-07 15:53:13.752695698 +0200 +--- skia.org/tools/window/mac/MetalWindowContext_mac.mm 2024-10-08 14:58:53.731121800 +0200 ++++ skia/tools/window/mac/MetalWindowContext_mac.mm 2024-10-08 14:59:05.913213666 +0200 @@ -47,10 +47,14 @@ } @@ -18,8 +18,8 @@ diff -ur skia.org/tools/window/mac/MetalWindowContext_mac.mm skia/tools/window/m // resize ignores the passed values and uses the fMainView directly. diff -ur skia.org/tools/window/MetalWindowContext.h skia/tools/window/MetalWindowContext.h ---- skia.org/tools/window/MetalWindowContext.h 2024-10-07 15:52:39.401549032 +0200 -+++ skia/tools/window/MetalWindowContext.h 2024-10-07 15:53:13.752695698 +0200 +--- skia.org/tools/window/MetalWindowContext.h 2024-10-08 14:58:53.730121792 +0200 ++++ skia/tools/window/MetalWindowContext.h 2024-10-08 14:59:05.913213666 +0200 @@ -14,13 +14,18 @@ #include "tools/window/WindowContext.h" @@ -79,8 +79,8 @@ diff -ur skia.org/tools/window/MetalWindowContext.h skia/tools/window/MetalWindo } // namespace skwindow::internal diff -ur skia.org/tools/window/MetalWindowContext.mm skia/tools/window/MetalWindowContext.mm ---- skia.org/tools/window/MetalWindowContext.mm 2024-10-07 15:52:39.401549032 +0200 -+++ skia/tools/window/MetalWindowContext.mm 2024-10-07 15:53:13.753695702 +0200 +--- skia.org/tools/window/MetalWindowContext.mm 2024-10-08 14:58:53.730121792 +0200 ++++ skia/tools/window/MetalWindowContext.mm 2024-10-08 14:59:05.914213673 +0200 @@ -39,24 +39,30 @@ } @@ -260,8 +260,8 @@ diff -ur skia.org/tools/window/MetalWindowContext.mm skia/tools/window/MetalWind + } //namespace skwindow::internal diff -ur skia.org/tools/window/unix/VulkanWindowContext_unix.cpp skia/tools/window/unix/VulkanWindowContext_unix.cpp ---- skia.org/tools/window/unix/VulkanWindowContext_unix.cpp 2024-10-07 15:52:39.401549032 +0200 -+++ skia/tools/window/unix/VulkanWindowContext_unix.cpp 2024-10-07 15:53:13.753695702 +0200 +--- skia.org/tools/window/unix/VulkanWindowContext_unix.cpp 2024-10-08 14:58:53.731121800 +0200 ++++ skia/tools/window/unix/VulkanWindowContext_unix.cpp 2024-10-08 14:59:05.914213673 +0200 @@ -24,7 +24,7 @@ return nullptr; } @@ -291,9 +291,9 @@ diff -ur skia.org/tools/window/unix/VulkanWindowContext_unix.cpp skia/tools/wind } return ctx; diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanWindowContext.cpp ---- skia.org/tools/window/VulkanWindowContext.cpp 2024-10-07 15:52:39.401549032 +0200 -+++ skia/tools/window/VulkanWindowContext.cpp 2024-10-07 15:55:28.596316545 +0200 -@@ -27,9 +27,13 @@ +--- skia.org/tools/window/VulkanWindowContext.cpp 2024-10-08 14:58:53.730121792 +0200 ++++ skia/tools/window/VulkanWindowContext.cpp 2024-10-08 14:59:28.352382864 +0200 +@@ -29,9 +29,13 @@ #endif #define GET_PROC(F) f ## F = \ @@ -309,7 +309,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW namespace skwindow::internal { -@@ -51,32 +55,39 @@ +@@ -53,32 +57,39 @@ } void VulkanWindowContext::initializeContext() { @@ -362,7 +362,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW PFN_vkGetPhysicalDeviceProperties localGetPhysicalDeviceProperties = reinterpret_cast<PFN_vkGetPhysicalDeviceProperties>( -@@ -84,21 +95,30 @@ +@@ -86,21 +97,30 @@ backendContext.fInstance, VK_NULL_HANDLE)); if (!localGetPhysicalDeviceProperties) { @@ -401,7 +401,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW GET_PROC(DestroySurfaceKHR); GET_PROC(GetPhysicalDeviceSurfaceSupportKHR); GET_PROC(GetPhysicalDeviceSurfaceCapabilitiesKHR); -@@ -106,7 +126,6 @@ +@@ -108,7 +128,6 @@ GET_PROC(GetPhysicalDeviceSurfacePresentModesKHR); GET_DEV_PROC(DeviceWaitIdle); GET_DEV_PROC(QueueWaitIdle); @@ -409,7 +409,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW GET_DEV_PROC(CreateSwapchainKHR); GET_DEV_PROC(DestroySwapchainKHR); GET_DEV_PROC(GetSwapchainImagesKHR); -@@ -114,46 +133,44 @@ +@@ -116,46 +135,44 @@ GET_DEV_PROC(QueuePresentKHR); GET_DEV_PROC(GetDeviceQueue); @@ -466,7 +466,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW nullptr); if (VK_SUCCESS != res) { return false; -@@ -161,14 +178,14 @@ +@@ -163,14 +180,14 @@ SkAutoMalloc surfaceFormatAlloc(surfaceFormatCount * sizeof(VkSurfaceFormatKHR)); VkSurfaceFormatKHR* surfaceFormats = (VkSurfaceFormatKHR*)surfaceFormatAlloc.get(); @@ -483,7 +483,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW nullptr); if (VK_SUCCESS != res) { return false; -@@ -176,7 +193,7 @@ +@@ -178,7 +195,7 @@ SkAutoMalloc presentModeAlloc(presentModeCount * sizeof(VkPresentModeKHR)); VkPresentModeKHR* presentModes = (VkPresentModeKHR*)presentModeAlloc.get(); @@ -492,7 +492,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW presentModes); if (VK_SUCCESS != res) { return false; -@@ -292,8 +309,8 @@ +@@ -294,8 +311,8 @@ swapchainCreateInfo.imageArrayLayers = 1; swapchainCreateInfo.imageUsage = usageFlags; @@ -503,7 +503,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW swapchainCreateInfo.imageSharingMode = VK_SHARING_MODE_CONCURRENT; swapchainCreateInfo.queueFamilyIndexCount = 2; swapchainCreateInfo.pQueueFamilyIndices = queueFamilies; -@@ -309,27 +326,27 @@ +@@ -311,27 +328,27 @@ swapchainCreateInfo.clipped = true; swapchainCreateInfo.oldSwapchain = fSwapchain; @@ -536,7 +536,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW } return true; -@@ -339,10 +356,9 @@ +@@ -341,10 +358,9 @@ VkImageUsageFlags usageFlags, SkColorType colorType, VkSharingMode sharingMode) { @@ -548,7 +548,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW // set up initial image layouts and create surfaces fImageLayouts = new VkImageLayout[fImageCount]; -@@ -358,7 +374,7 @@ +@@ -360,7 +376,7 @@ info.fFormat = format; info.fImageUsageFlags = usageFlags; info.fLevelCount = 1; @@ -557,7 +557,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW info.fProtected = skgpu::Protected(fDisplayParams.fCreateProtectedNativeBackend); info.fSharingMode = sharingMode; -@@ -401,8 +417,8 @@ +@@ -403,8 +419,8 @@ fBackbuffers = new BackbufferInfo[fImageCount + 1]; for (uint32_t i = 0; i < fImageCount + 1; ++i) { fBackbuffers[i].fImageIndex = -1; @@ -568,7 +568,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW &fBackbuffers[i].fRenderSemaphore)); SkASSERT(result == VK_SUCCESS); } -@@ -415,8 +431,8 @@ +@@ -417,8 +433,8 @@ if (fBackbuffers) { for (uint32_t i = 0; i < fImageCount + 1; ++i) { fBackbuffers[i].fImageIndex = -1; @@ -579,7 +579,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW fBackbuffers[i].fRenderSemaphore, nullptr)); } -@@ -441,42 +457,59 @@ +@@ -443,42 +459,59 @@ void VulkanWindowContext::destroyContext() { if (this->isValid()) { fQueueWaitIdle(fPresentQueue); @@ -653,7 +653,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW } VulkanWindowContext::BackbufferInfo* VulkanWindowContext::getAvailableBackbuffer() { -@@ -502,35 +535,35 @@ +@@ -504,35 +537,35 @@ semaphoreInfo.pNext = nullptr; semaphoreInfo.flags = 0; VkSemaphore semaphore; @@ -695,16 +695,16 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW return nullptr; } } -@@ -556,7 +589,7 @@ - GrFlushInfo info; +@@ -557,7 +590,7 @@ info.fNumSemaphores = 1; info.fSignalSemaphores = &beSemaphore; -- skgpu::MutableTextureState presentState(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, fPresentQueueIndex); -+ skgpu::MutableTextureState presentState(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, fShared->fPresentQueueIndex); + skgpu::MutableTextureState presentState = skgpu::MutableTextureStates::MakeVulkan( +- VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, fPresentQueueIndex); ++ VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, fShared->fPresentQueueIndex); auto dContext = surface->recordingContext()->asDirectContext(); dContext->flush(surface, info, &presentState); dContext->submit(); -@@ -577,4 +610,6 @@ +@@ -578,4 +611,6 @@ fQueuePresentKHR(fPresentQueue, &presentInfo); } @@ -714,8 +714,8 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp skia/tools/window/VulkanW Only in skia/tools/window: VulkanWindowContext.cpp.orig Only in skia/tools/window: VulkanWindowContext.cpp.rej diff -ur skia.org/tools/window/VulkanWindowContext.h skia/tools/window/VulkanWindowContext.h ---- skia.org/tools/window/VulkanWindowContext.h 2024-10-07 15:52:39.401549032 +0200 -+++ skia/tools/window/VulkanWindowContext.h 2024-10-07 15:53:13.753695702 +0200 +--- skia.org/tools/window/VulkanWindowContext.h 2024-10-08 14:58:53.730121792 +0200 ++++ skia/tools/window/VulkanWindowContext.h 2024-10-08 14:59:05.914213673 +0200 @@ -15,19 +15,23 @@ #include "tools/gpu/vk/VkTestUtils.h" #include "tools/window/WindowContext.h" @@ -823,8 +823,8 @@ diff -ur skia.org/tools/window/VulkanWindowContext.h skia/tools/window/VulkanWin uint32_t fImageCount; diff -ur skia.org/tools/window/win/VulkanWindowContext_win.cpp skia/tools/window/win/VulkanWindowContext_win.cpp ---- skia.org/tools/window/win/VulkanWindowContext_win.cpp 2024-10-07 15:52:39.401549032 +0200 -+++ skia/tools/window/win/VulkanWindowContext_win.cpp 2024-10-07 15:53:13.753695702 +0200 +--- skia.org/tools/window/win/VulkanWindowContext_win.cpp 2024-10-08 14:58:53.731121800 +0200 ++++ skia/tools/window/win/VulkanWindowContext_win.cpp 2024-10-08 14:59:05.914213673 +0200 @@ -25,7 +25,7 @@ return nullptr; } @@ -854,8 +854,8 @@ diff -ur skia.org/tools/window/win/VulkanWindowContext_win.cpp skia/tools/window } return ctx; diff -ur skia.org/tools/window/WindowContext.h skia/tools/window/WindowContext.h ---- skia.org/tools/window/WindowContext.h 2024-10-07 15:52:39.401549032 +0200 -+++ skia/tools/window/WindowContext.h 2024-10-07 15:53:13.753695702 +0200 +--- skia.org/tools/window/WindowContext.h 2024-10-08 14:58:53.730121792 +0200 ++++ skia/tools/window/WindowContext.h 2024-10-08 14:59:05.914213673 +0200 @@ -10,9 +10,9 @@ #include "include/core/SkRefCnt.h" #include "include/core/SkSurfaceProps.h"
