summaryrefslogtreecommitdiff
path: root/config_host/config_skia.h.in
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-07-08 20:28:29 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-07-10 12:44:38 +0200
commitf8c15850dbfaa46605e1e353ae1f49e69184e8a1 (patch)
treec8e2ef783ce0a9ca87a7e674ac3791ffe77103db /config_host/config_skia.h.in
parent9a5329a266bd74abc4794f1fcbae3db07582dbde (diff)
update skia to m116
(from m111) SK_SUPPORT_GPU is now SK_GANESH GR_OP_ALLOCATE_USE_NEW was removed in skia m111 commit dd8f8ed3848cbe2032edc7ec08ef648a23e28ad9 Author: Mike Klein <mtklein@google.com> Date: Thu Apr 22 12:17:33 2021 -0500 clean up defines that do nothing the fast-png-write patch was removed. The underlying helper function we need was removed in commit 0ec4c84abd0b578a5c792b04b56653cbc325530e Author: Kevin Lubick <kjlubick@google.com> Date: Thu Apr 20 14:46:28 2023 -0400 Remove SkImageEncoder and SkImage::encodeToData So I updated our dump() function in SkiaHelper.cxx to use the new Skia API. The constexpr-template patch seems to be superceded by skia changes. SkOpts: :hash_fn has been replaced with SkChecksum::Hash32 commit 657ed9cf2379a950b925cb2aba7c85d6e1dd36ed Author: Brian Osman <brianosman@google.com> Date: Tue May 23 12:40:12 2023 +0000 Reland "Replace SkOpts::hash/hash_fn with SkChecksum::Hash32" The SkDebugf function needs to be exported from the library since it leaks out to calling code via some of the headers. Change-Id: I80ace8f25e660fa7889d22ef90676f47264d866c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154223 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'config_host/config_skia.h.in')
-rw-r--r--config_host/config_skia.h.in5
1 files changed, 1 insertions, 4 deletions
diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in
index 85711486984f..602e18a3f67b 100644
--- a/config_host/config_skia.h.in
+++ b/config_host/config_skia.h.in
@@ -31,7 +31,7 @@ are the same.
// GPU support (set by configure).
-#undef SK_SUPPORT_GPU
+#undef SK_GANESH
// Vulkan support enabled (set by configure).
#undef SK_VULKAN
// Metal support enabled (set by configure).
@@ -40,9 +40,6 @@ are the same.
// Memory allocator for Vulkan.
#define SK_USE_VMA 1
-// Set by Skia's BUILD.gn.
-#define GR_OP_ALLOCATE_USE_NEW
-
#define SK_CODEC_DECODES_PNG 1
#define SK_ENCODE_PNG 1