download.lst | 4 -
external/skia/Library_skia.mk | 14 ++++--
external/skia/UnpackedTarball_skia.mk | 1
external/skia/fix-pch.patch.1 | 6 +-
external/skia/incomplete.patch.0 | 18 --------
external/skia/share-grcontext.patch.1 | 73 ++++++++++++++++------------------
external/skia/vk_mem_alloc.patch.1 | 10 ++--
7 files changed, 55 insertions(+), 71 deletions(-)
New commits:
commit 9ecefe3e3608e73d8ba659f2b44bd07e24ee7ba8
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Oct 8 07:23:56 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 8 17:57:02 2024 +0200
update to skia m120
The following patch appears to be upstreamed now
incomplete.patch.0
Change-Id: I36a4c62928c050ed4f8103a580899cdb3cf237cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174654
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/download.lst b/download.lst
index b926fa6504c7..2824decca19a 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 :=
89fd7b376aea68e515f4af53893a3b9b6199b1b01bd77791cafe68057309c4ed
-SKIA_TARBALL := skia-m119-fcb55886b914028a99f35fb0ba28e66ff82027e3.tar.xz
+SKIA_SHA256SUM :=
78557d309e426651f5465177b97bb85253d44d61e8e8011e9ff517387c617083
+SKIA_TARBALL := skia-m120-77fe8841d9ec287eeb3d3f70fc0a674162664064.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 faee9931ab19..ff455793a261 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -127,6 +127,7 @@ $(eval $(call gb_Library_set_include,skia,\
-I$(gb_UnpackedTarball_workdir)/skia \
-I$(gb_UnpackedTarball_workdir)/skia/modules/skcms/ \
-I$(gb_UnpackedTarball_workdir)/skia/third_party/vulkanmemoryallocator/ \
+ -I$(gb_UnpackedTarball_workdir)/skia/src/gpu/vk/vulkanmemoryallocator/ \
-I$(gb_UnpackedTarball_workdir)/skia/include/third_party/vulkan/ \
-I$(SRCDIR)/external/skia/inc/ \
))
@@ -297,12 +298,14 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/codec/SkCodec \
UnpackedTarball/skia/src/codec/SkCodecImageGenerator \
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 \
UnpackedTarball/skia/src/codec/SkSwizzler \
+ UnpackedTarball/skia/src/codec/SkTiffUtility \
))
# from file skia/gn/codec.gni, target "skia_codec_decode_bmp"
@@ -320,6 +323,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
#
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/base/SkArenaAlloc \
+ UnpackedTarball/skia/src/base/SkBase64 \
UnpackedTarball/skia/src/base/SkBezierCurves \
UnpackedTarball/skia/src/base/SkBlockAllocator \
UnpackedTarball/skia/src/base/SkBuffer \
@@ -385,7 +389,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkCubicMap \
UnpackedTarball/skia/src/core/SkData \
UnpackedTarball/skia/src/core/SkDataTable \
- UnpackedTarball/skia/src/core/SkDebug \
UnpackedTarball/skia/src/core/SkDescriptor \
UnpackedTarball/skia/src/core/SkDevice \
UnpackedTarball/skia/src/core/SkDistanceFieldGen \
@@ -440,6 +443,8 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkMipmap \
UnpackedTarball/skia/src/core/SkMipmapAccessor \
UnpackedTarball/skia/src/core/SkMipmapBuilder \
+ UnpackedTarball/skia/src/core/SkMipmapDrawDownSampler \
+ UnpackedTarball/skia/src/core/SkMipmapHQDownSampler \
UnpackedTarball/skia/src/core/SkOpts \
UnpackedTarball/skia/src/core/SkOverdrawCanvas \
UnpackedTarball/skia/src/core/SkPaint \
@@ -802,7 +807,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
# from file skia/gn/utils.gni:55, target "skia_utils_private"
#
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
- UnpackedTarball/skia/src/utils/SkBase64 \
UnpackedTarball/skia/src/utils/SkCamera \
UnpackedTarball/skia/src/utils/SkCanvasStack \
UnpackedTarball/skia/src/utils/SkCanvasStateUtils \
@@ -942,7 +946,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/ganesh/GrStyle \
UnpackedTarball/skia/src/gpu/ganesh/GrSurface \
UnpackedTarball/skia/src/gpu/ganesh/GrSurfaceCharacterization \
- UnpackedTarball/skia/src/gpu/ganesh/GrSurfaceInfo \
UnpackedTarball/skia/src/gpu/ganesh/GrSurfaceProxy \
UnpackedTarball/skia/src/gpu/ganesh/GrSurfaceProxyView \
UnpackedTarball/skia/src/gpu/ganesh/GrTestUtils \
@@ -1114,6 +1117,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkDescriptorPool \
UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkDescriptorSet \
UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkDescriptorSetManager \
+ UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkDirectContext \
UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkFramebuffer \
UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkGpu \
UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkImage \
@@ -1204,11 +1208,11 @@ endif
endif
-# from file skia/third_party/vulkanmemoryallocator/BUILD.gn:15, target
"source_set("vulkanmemoryallocator")"
+# from file skia/src/gpu/vk/vulkanmemoryallocator/BUILD.gn:15, target
"source_set("vulkanmemoryallocator")"
#
ifeq ($(SKIA_GPU),VULKAN)
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-
UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator \
+
UnpackedTarball/skia/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper
\
))
endif
diff --git a/external/skia/UnpackedTarball_skia.mk
b/external/skia/UnpackedTarball_skia.mk
index d6fe0b65c05c..22a7500abc76 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -37,7 +37,6 @@ skia_patches := \
redefinition-of-op.patch.0 \
0001-Added-missing-include-cstdio.patch \
fix-SkDebugf-link-error.patch.1 \
- incomplete.patch.0 \
ubsan-missing-typeinfo.patch.1 \
help-msvc-analyzer.patch \
always_inline_and_multiversioning_conflict.patch.1 \
diff --git a/external/skia/fix-pch.patch.1 b/external/skia/fix-pch.patch.1
index 9adb47903013..35ce85693b2b 100644
--- a/external/skia/fix-pch.patch.1
+++ b/external/skia/fix-pch.patch.1
@@ -72,9 +72,9 @@ index 1b643f45cf..c1981110da 100644
--- a/modules/skcms/skcms.cc
+++ b/modules/skcms/skcms.cc
@@ -2371,7 +2372,9 @@ typedef enum {
- Op_store_hhhh,
- Op_store_fff,
- Op_store_ffff,
+ SKCMS_WORK_OPS(M)
+ SKCMS_STORE_OPS(M)
+ #undef M
-} Op;
+} Op_skcms;
+
diff --git a/external/skia/incomplete.patch.0 b/external/skia/incomplete.patch.0
deleted file mode 100644
index 390ca146b522..000000000000
--- a/external/skia/incomplete.patch.0
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/gpu/ganesh/image/GrImageUtils.h
-+++ src/gpu/ganesh/image/GrImageUtils.h
-@@ -12,6 +12,7 @@
-
- #include "include/core/SkSamplingOptions.h"
- #include "include/core/SkYUVAPixmaps.h"
-+#include "src/gpu/ganesh/GrFragmentProcessor.h"
- #include "src/gpu/ganesh/GrSurfaceProxyView.h" // IWYU pragma: keep
- #include "src/gpu/ganesh/SkGr.h"
-
-@@ -21,7 +22,6 @@
- #include <tuple>
-
- class GrCaps;
--class GrFragmentProcessor;
- class GrImageContext;
- class GrRecordingContext;
- class SkImage;
diff --git a/external/skia/share-grcontext.patch.1
b/external/skia/share-grcontext.patch.1
index a5ba9f1a4f25..d7ccb9ddabc2 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
10:24:45.995984589 +0200
-+++ skia/tools/window/mac/MetalWindowContext_mac.mm 2024-10-07
10:27:27.598123570 +0200
+--- 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
@@ -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 10:24:45.995984589
+0200
-+++ skia/tools/window/MetalWindowContext.h 2024-10-07 10:27:27.606123626
+0200
+--- 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
@@ -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
10:24:45.995984589 +0200
-+++ skia/tools/window/MetalWindowContext.mm 2024-10-07 10:31:33.430849254
+0200
+--- 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
@@ -39,24 +39,30 @@
}
@@ -259,11 +259,9 @@ diff -ur skia.org/tools/window/MetalWindowContext.mm
skia/tools/window/MetalWind
+}
+
} //namespace skwindow::internal
-Only in skia/tools/window: MetalWindowContext.mm.orig
-Only in skia/tools/window: MetalWindowContext.mm.rej
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
10:24:45.996984596 +0200
-+++ skia/tools/window/unix/VulkanWindowContext_unix.cpp 2024-10-07
10:27:27.606123626 +0200
+--- 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
@@ -24,7 +24,7 @@
return nullptr;
}
@@ -293,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
10:24:45.995984589 +0200
-+++ skia/tools/window/VulkanWindowContext.cpp 2024-10-07 10:27:27.606123626
+0200
-@@ -26,9 +26,13 @@
+--- 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 @@
#endif
#define GET_PROC(F) f ## F = \
@@ -311,7 +309,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
namespace skwindow::internal {
-@@ -50,32 +54,39 @@
+@@ -51,32 +55,39 @@
}
void VulkanWindowContext::initializeContext() {
@@ -364,7 +362,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
PFN_vkGetPhysicalDeviceProperties localGetPhysicalDeviceProperties =
reinterpret_cast<PFN_vkGetPhysicalDeviceProperties>(
-@@ -83,21 +94,30 @@
+@@ -84,21 +95,30 @@
backendContext.fInstance,
VK_NULL_HANDLE));
if (!localGetPhysicalDeviceProperties) {
@@ -387,7 +385,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
- GET_PROC(DestroyInstance);
- if (fDebugCallback != VK_NULL_HANDLE) {
- GET_PROC(DestroyDebugReportCallbackEXT);
-+ d->fContext = GrDirectContext::MakeVulkan(backendContext,
fDisplayParams.fGrContextOptions);
++ d->fContext = GrDirectContexts::MakeVulkan(backendContext,
fDisplayParams.fGrContextOptions);
+
+ GET_PROC_GLOBAL(DestroyInstance);
+ GET_DEV_PROC_GLOBAL(DestroyDevice);
@@ -403,7 +401,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
GET_PROC(DestroySurfaceKHR);
GET_PROC(GetPhysicalDeviceSurfaceSupportKHR);
GET_PROC(GetPhysicalDeviceSurfaceCapabilitiesKHR);
-@@ -105,7 +125,6 @@
+@@ -106,7 +126,6 @@
GET_PROC(GetPhysicalDeviceSurfacePresentModesKHR);
GET_DEV_PROC(DeviceWaitIdle);
GET_DEV_PROC(QueueWaitIdle);
@@ -411,11 +409,11 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
GET_DEV_PROC(CreateSwapchainKHR);
GET_DEV_PROC(DestroySwapchainKHR);
GET_DEV_PROC(GetSwapchainImagesKHR);
-@@ -113,46 +132,44 @@
+@@ -114,46 +133,44 @@
GET_DEV_PROC(QueuePresentKHR);
GET_DEV_PROC(GetDeviceQueue);
-- fContext = GrDirectContext::MakeVulkan(backendContext,
fDisplayParams.fGrContextOptions);
+- fContext = GrDirectContexts::MakeVulkan(backendContext,
fDisplayParams.fGrContextOptions);
+ // No actual window, used just to create the shared GrContext.
+ if(fCreateVkSurfaceFn == nullptr)
+ return;
@@ -468,7 +466,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
nullptr);
if (VK_SUCCESS != res) {
return false;
-@@ -160,14 +177,14 @@
+@@ -161,14 +178,14 @@
SkAutoMalloc surfaceFormatAlloc(surfaceFormatCount *
sizeof(VkSurfaceFormatKHR));
VkSurfaceFormatKHR* surfaceFormats =
(VkSurfaceFormatKHR*)surfaceFormatAlloc.get();
@@ -485,7 +483,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
nullptr);
if (VK_SUCCESS != res) {
return false;
-@@ -175,7 +192,7 @@
+@@ -176,7 +193,7 @@
SkAutoMalloc presentModeAlloc(presentModeCount *
sizeof(VkPresentModeKHR));
VkPresentModeKHR* presentModes =
(VkPresentModeKHR*)presentModeAlloc.get();
@@ -494,7 +492,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
presentModes);
if (VK_SUCCESS != res) {
return false;
-@@ -291,8 +308,8 @@
+@@ -292,8 +309,8 @@
swapchainCreateInfo.imageArrayLayers = 1;
swapchainCreateInfo.imageUsage = usageFlags;
@@ -505,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;
-@@ -308,27 +325,27 @@
+@@ -309,27 +326,27 @@
swapchainCreateInfo.clipped = true;
swapchainCreateInfo.oldSwapchain = fSwapchain;
@@ -538,7 +536,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
}
return true;
-@@ -338,10 +355,9 @@
+@@ -339,10 +356,9 @@
VkImageUsageFlags usageFlags,
SkColorType colorType,
VkSharingMode sharingMode) {
@@ -550,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];
-@@ -357,7 +373,7 @@
+@@ -358,7 +374,7 @@
info.fFormat = format;
info.fImageUsageFlags = usageFlags;
info.fLevelCount = 1;
@@ -559,7 +557,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
info.fProtected =
skgpu::Protected(fDisplayParams.fCreateProtectedNativeBackend);
info.fSharingMode = sharingMode;
-@@ -400,8 +416,8 @@
+@@ -401,8 +417,8 @@
fBackbuffers = new BackbufferInfo[fImageCount + 1];
for (uint32_t i = 0; i < fImageCount + 1; ++i) {
fBackbuffers[i].fImageIndex = -1;
@@ -570,7 +568,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
&fBackbuffers[i].fRenderSemaphore));
SkASSERT(result == VK_SUCCESS);
}
-@@ -414,8 +430,8 @@
+@@ -415,8 +431,8 @@
if (fBackbuffers) {
for (uint32_t i = 0; i < fImageCount + 1; ++i) {
fBackbuffers[i].fImageIndex = -1;
@@ -581,7 +579,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
fBackbuffers[i].fRenderSemaphore,
nullptr));
}
-@@ -440,42 +456,59 @@
+@@ -441,42 +457,59 @@
void VulkanWindowContext::destroyContext() {
if (this->isValid()) {
fQueueWaitIdle(fPresentQueue);
@@ -655,7 +653,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
}
VulkanWindowContext::BackbufferInfo*
VulkanWindowContext::getAvailableBackbuffer() {
-@@ -501,35 +534,35 @@
+@@ -502,35 +535,35 @@
semaphoreInfo.pNext = nullptr;
semaphoreInfo.flags = 0;
VkSemaphore semaphore;
@@ -697,7 +695,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
return nullptr;
}
}
-@@ -555,7 +588,7 @@
+@@ -556,7 +589,7 @@
GrFlushInfo info;
info.fNumSemaphores = 1;
info.fSignalSemaphores = &beSemaphore;
@@ -706,7 +704,7 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
auto dContext = surface->recordingContext()->asDirectContext();
dContext->flush(surface, info, &presentState);
dContext->submit();
-@@ -576,4 +609,6 @@
+@@ -577,4 +610,6 @@
fQueuePresentKHR(fPresentQueue, &presentInfo);
}
@@ -714,9 +712,10 @@ diff -ur skia.org/tools/window/VulkanWindowContext.cpp
skia/tools/window/VulkanW
+
} // namespace skwindow::internal
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
10:24:45.995984589 +0200
-+++ skia/tools/window/VulkanWindowContext.h 2024-10-07 10:27:27.606123626
+0200
+--- 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
@@ -15,19 +15,23 @@
#include "tools/gpu/vk/VkTestUtils.h"
#include "tools/window/WindowContext.h"
@@ -824,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
10:24:45.995984589 +0200
-+++ skia/tools/window/win/VulkanWindowContext_win.cpp 2024-10-07
10:27:27.607123633 +0200
+--- 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
@@ -25,7 +25,7 @@
return nullptr;
}
@@ -855,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 10:24:45.995984589
+0200
-+++ skia/tools/window/WindowContext.h 2024-10-07 10:27:27.607123633 +0200
+--- 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
@@ -10,9 +10,9 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkSurfaceProps.h"
diff --git a/external/skia/vk_mem_alloc.patch.1
b/external/skia/vk_mem_alloc.patch.1
index 94f2504cbd52..b85c8fff5f15 100644
--- a/external/skia/vk_mem_alloc.patch.1
+++ b/external/skia/vk_mem_alloc.patch.1
@@ -1,12 +1,12 @@
-diff --git a/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h
b/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h
+diff --git a/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper.h
b/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper.h
index 1c6212bd47..756175b4e7 100644
---- a/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h
-+++ b/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h
-@@ -32,7 +32,7 @@
+--- a/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper.h
++++ b/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper.h
+@@ -31,7 +31,7 @@
#define VULKAN_H_
#define GR_NEEDED_TO_DEFINE_VULKAN_H
#endif
--#include "vk_mem_alloc.h"
+-#include "vk_mem_alloc.h" // NO_G3_REWRITE
+#include "include/vk_mem_alloc.h"
#ifdef GR_NEEDED_TO_DEFINE_VULKAN_H
#undef VULKAN_H_
