core.git: download.lst external/skia

Noel Grandin (via logerrit) Tue, 08 Oct 2024 09:59:43 -0700

 download.lst                          |    4 ++--
 external/skia/Library_skia.mk         |   28 ++++++++++++++++++++++------
 external/skia/UnpackedTarball_skia.mk |    5 ++++-
 external/skia/fix-pch.patch.1         |   17 +----------------
 external/skia/vk_mem_alloc.patch.1    |    8 ++++----
 5 files changed, 33 insertions(+), 29 deletions(-)


New commits:
commit de212916cbe14461f46eab59a17426ea50ddc1f3
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Oct 8 10:59:45 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 8 18:59:15 2024 +0200

    update to skia m121
    
    Change-Id: Ic3ab29795af11470d4b41a73d02eac1cd56cadb7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174692
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/download.lst b/download.lst
index 2824decca19a..1d570dfb0c82 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 := 
78557d309e426651f5465177b97bb85253d44d61e8e8011e9ff517387c617083
-SKIA_TARBALL := skia-m120-77fe8841d9ec287eeb3d3f70fc0a674162664064.tar.xz
+SKIA_SHA256SUM := 
5243142cfc4df00d43b41152e9de3a31d45351cd11c2981739a2a785df637d6f
+SKIA_TARBALL := skia-m121-18df6cbca7783c3c24a564ef54a12fc9c2d8cd70.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 ff455793a261..ce5eef8926dd 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -1079,11 +1079,13 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/BlendFormula \
     UnpackedTarball/skia/src/gpu/BlurUtils \
     UnpackedTarball/skia/src/gpu/DitherUtils \
+    UnpackedTarball/skia/src/gpu/MutableTextureState \
     UnpackedTarball/skia/src/gpu/PipelineUtils \
     UnpackedTarball/skia/src/gpu/RectanizerPow2 \
     UnpackedTarball/skia/src/gpu/RectanizerSkyline \
     UnpackedTarball/skia/src/gpu/ResourceKey \
     UnpackedTarball/skia/src/gpu/ShaderErrorHandler \
+    UnpackedTarball/skia/src/gpu/SkBackingFit \
     UnpackedTarball/skia/src/gpu/Swizzle \
     UnpackedTarball/skia/src/gpu/TiledTextureUtils \
     UnpackedTarball/skia/src/gpu/tessellate/FixedCountBufferUtils \
@@ -1109,11 +1111,13 @@ endif
 ifeq ($(SKIA_GPU),VULKAN)
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ganesh/vk/AHardwareBufferVk \
+    UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkBackendSemaphore \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkBackendSurface \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkBuffer \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkCaps \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkCommandBuffer \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkCommandPool \
+    UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkContextThreadSafeProxy \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkDescriptorPool \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkDescriptorSet \
     UnpackedTarball/skia/src/gpu/ganesh/vk/GrVkDescriptorSetManager \
@@ -1193,6 +1197,8 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/vk/VulkanExtensions \
     UnpackedTarball/skia/src/gpu/vk/VulkanInterface \
     UnpackedTarball/skia/src/gpu/vk/VulkanMemory \
+    UnpackedTarball/skia/src/gpu/vk/VulkanMutableTextureState \
+    UnpackedTarball/skia/src/gpu/vk/VulkanUtilsPriv \
 ))
 endif
 
@@ -1233,21 +1239,28 @@ endif
 # Not used, uses OpenGL - 
UnpackedTarball/skia/tools/sk_app/mac/RasterWindowContext_mac
 
 $(eval $(call gb_Library_add_exception_objects,skia,\
-    external/skia/source/skia_opts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) 
$(LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3) \
+    external/skia/source/skia_opts_ssse3, \
+       $(CXXFLAGS_INTRINSICS_SSSE3) $(LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3) \
 ))
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkMemset_opts_avx, \
        $(CXXFLAGS_INTRINSICS_AVX) $(LO_CLANG_CXXFLAGS_INTRINSICS_AVX) \
     $(LO_SKIA_AVOID_INLINE_COPIES) \
 ))
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+       UnpackedTarball/skia/modules/skcms/src/skcms_TransformSkx, \
+       $(CXXFLAGS_INTRINSICS_AVX512) $(LO_CLANG_CXXFLAGS_INTRINSICS_AVX512) \
+    $(LO_SKIA_AVOID_INLINE_COPIES) \
+))
 $(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, \
-        $(CXXFLAGS_INTRINSICS_AVX2) $(CXXFLAGS_INTRINSICS_F16C) 
$(CXXFLAGS_INTRINSICS_FMA) \
-        $(LO_CLANG_CXXFLAGS_INTRINSICS_AVX2) 
$(LO_CLANG_CXXFLAGS_INTRINSICS_F16C) $(LO_CLANG_CXXFLAGS_INTRINSICS_FMA) \
-        $(LO_SKIA_AVOID_INLINE_COPIES) \
+    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) \
+       $(LO_SKIA_AVOID_INLINE_COPIES) \
 ))
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkSwizzler_opts_ssse3 \
@@ -1257,11 +1270,14 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
        $(LO_SKIA_AVOID_INLINE_COPIES) \
 ))
 
+
 # Skcms code is used by png writer, which is used by SkiaHelper::dump(). 
Building
 # this without optimizations would mean having each pixel of saved images be
 # processed by unoptimized code.
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/modules/skcms/skcms, $(gb_COMPILEROPTFLAGS) \
+       UnpackedTarball/skia/modules/skcms/src/skcms_TransformBaseline \
+    UnpackedTarball/skia/modules/skcms/skcms, \
+       $(gb_COMPILEROPTFLAGS) \
 ))
 
 
diff --git a/external/skia/UnpackedTarball_skia.mk 
b/external/skia/UnpackedTarball_skia.mk
index 22a7500abc76..73ee65a74662 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -53,7 +53,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,skia,\
 ))
 
 $(eval $(call gb_UnpackedTarball_set_post_action,skia,\
-    mv modules/skcms/skcms.cc modules/skcms/skcms.cpp \
+    mv modules/skcms/skcms.cc modules/skcms/skcms.cpp && \
+       mv modules/skcms/src/skcms_TransformBaseline.cc 
modules/skcms/src/skcms_TransformBaseline.cpp && \
+       mv modules/skcms/src/skcms_TransformHsw.cc 
modules/skcms/src/skcms_TransformHsw.cpp && \
+       mv modules/skcms/src/skcms_TransformSkx.cc 
modules/skcms/src/skcms_TransformSkx.cpp \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/skia/fix-pch.patch.1 b/external/skia/fix-pch.patch.1
index 35ce85693b2b..fa449941171e 100644
--- a/external/skia/fix-pch.patch.1
+++ b/external/skia/fix-pch.patch.1
@@ -27,7 +27,7 @@ index 70c7f0ea80..ab8319a447 100644
 --- a/src/gpu/ganesh/vk/GrVkSemaphore.cpp
 +++ b/src/gpu/ganesh/vk/GrVkSemaphore.cpp
 @@ -10,6 +10,7 @@
- #include "include/gpu/GrBackendSemaphore.h"
+ #include "include/gpu/ganesh/vk/GrVkBackendSemaphore.h"
  #include "src/gpu/ganesh/vk/GrVkGpu.h"
  #include "src/gpu/ganesh/vk/GrVkUtil.h"
 +#include "tools/gpu/vk/GrVulkanDefines.h"
@@ -67,18 +67,3 @@ index af4909aaaf..825ec35c83 100644
  #include <dwrite.h>
  #include <d2d1.h>
  
-diff --git a/modules/skcms/skcms.cc b/modules/skcms/skcms.cc
-index 1b643f45cf..c1981110da 100644
---- a/modules/skcms/skcms.cc
-+++ b/modules/skcms/skcms.cc
-@@ -2371,7 +2372,9 @@ typedef enum {
-     SKCMS_WORK_OPS(M)
-     SKCMS_STORE_OPS(M)
- #undef M
--} Op;
-+} Op_skcms;
-+
-+#define Op Op_skcms
- 
- #if defined(__clang__)
-     template <int N, typename T> using Vec = T 
__attribute__((ext_vector_type(N)));
diff --git a/external/skia/vk_mem_alloc.patch.1 
b/external/skia/vk_mem_alloc.patch.1
index b85c8fff5f15..754988e8e733 100644
--- a/external/skia/vk_mem_alloc.patch.1
+++ b/external/skia/vk_mem_alloc.patch.1
@@ -2,10 +2,10 @@ diff --git 
a/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper.h b/s
 index 1c6212bd47..756175b4e7 100644
 --- 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
+@@ -39,7 +39,7 @@
+ // VMA outside of Skia, the client should instead tell Skia not to use VMA.
+ // Then they should wrap their own instance of VMA into an implementation of
+ // Skia's VulkanMemoryAllocator interface, and pass that object into context 
creation.
 -#include "vk_mem_alloc.h"  // NO_G3_REWRITE
 +#include "include/vk_mem_alloc.h"
  #ifdef GR_NEEDED_TO_DEFINE_VULKAN_H

core.git: download.lst external/skia

Reply via email to