office-gobmx/external/skia/windows-define-conflict.patch.1
Noel Grandin 4924a9f73f update to skia m129
Change-Id: Iea920a34b11695aba32f15921018cf53f418d09a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174846
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-10-12 17:50:01 +02:00

12 lines
904 B
Groff

diff -ur skia.org/src/gpu/vk/vulkanmemoryallocator/VulkanAMDMemoryAllocator.h skia/src/gpu/vk/vulkanmemoryallocator/VulkanAMDMemoryAllocator.h
--- skia.org/src/gpu/vk/vulkanmemoryallocator/VulkanAMDMemoryAllocator.h 2024-10-10 13:39:56.699879300 +0200
+++ skia/src/gpu/vk/vulkanmemoryallocator/VulkanAMDMemoryAllocator.h 2024-10-10 13:40:06.489885800 +0200
@@ -30,7 +30,7 @@
VkDevice device,
uint32_t physicalDeviceVersion,
const VulkanExtensions* extensions,
- const VulkanInterface* interface,
+ const VulkanInterface* vinterface,
ThreadSafe,
std::optional<VkDeviceSize> blockSize);