summaryrefslogtreecommitdiff
path: root/config_host
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2021-05-25 12:13:24 +0200
committerLuboš Luňák <l.lunak@collabora.com>2021-08-26 10:27:57 +0200
commita0edcc68f94915a78fcc08e70d2cdd752abd9ebb (patch)
treecdbe1279877c3071ca84ef03ed317830a85a724f /config_host
parentb67f42c4c2906b7059b93d748c8efccd588b1e1c (diff)
update Skia to chrome/m94
Updating to m91 or newer required handling the problem with Vulkan crashing, but that's been finally fixed by the previous commit. This Skia version also requires at least freetype-2.8.1, so disable Skia if that's not available (LO's minimum is lower). Additionally patch out Skia's use of TT_SUPPORT_COLRV1, which seems to be an unstable freetype API from the git version and it doesn't even compile with the latest stable 2.9.11 release Change-Id: I4a17effb912468c43fc7cdb69fe453062e4d2447 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120967 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'config_host')
-rw-r--r--config_host/config_skia.h.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in
index 367920665704..b98ba14d31ec 100644
--- a/config_host/config_skia.h.in
+++ b/config_host/config_skia.h.in
@@ -50,6 +50,8 @@ are the same.
#define SK_ASSUME_GL 1
#define SK_ASSUME_GL_ES 0
+#define SK_ENABLE_SKSL 1
+
// See https://codereview.chromium.org/2089583002 . This makes raster drawing
// faster in some cases, it was made conditional because of some tests failing,
// but if I'm reading the review correctly the code is in fact fine and just