[Libreoffice-commits] core.git: external/skia

Luboš Luňák (via logerrit) logerrit at kemper.freedesktop.org
Mon Mar 29 19:21:53 UTC 2021


 external/skia/Library_skia.mk |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit fb376fb7cfd8559c89f89af967e5ca2bbb138e52
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Mar 17 11:54:12 2021 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Mar 29 21:21:18 2021 +0200

    speed up SkiaHelper::dump() in Skia debug builds
    
    Change-Id: Ic5c4bb38e9b8c0c1bb0e3efc2c5ee7a3fa787d93
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113320
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 7ab2877d55ae..a1f1f1c30ef6 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_Library_add_defs,skia,\
 # This controls whether to build with compiler optimizations, normally yes, --enable-skia=debug
 # allows to build non-optimized. We normally wouldn't debug a 3rd-party library, and Skia
 # performance is relatively important (it may be the drawing engine used in software mode).
+# Some code may be always built with optimizations, even with Skia debug enabled (see
+# $(gb_COMPILEROPTFLAGS) usage).
 ifeq ($(ENABLE_SKIA_DEBUG),)
 $(eval $(call gb_Library_add_cxxflags,skia, \
     $(gb_COMPILEROPTFLAGS) \
@@ -896,8 +898,14 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
 endif
 
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/third_party/skcms/skcms \
     UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator \
 ))
 
+# 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/third_party/skcms/skcms, $(gb_COMPILEROPTFLAGS) \
+))
+
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list