bin/update_pch | 2 ++
external/skia/inc/pch/precompiled_skia.hxx | 4 +---
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8793f3c406d5acba910fb5b819e8263cd38a3af0
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Fri Sep 10 22:25:18 2021 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Sat Sep 11 00:00:23 2021 +0200
don't include Vulkan headers for Skia PCH
It's not built on Mac.
Change-Id: Ica6aed9da51bb5cfd6dd1255e1231d5f0e53ba2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121926
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/bin/update_pch b/bin/update_pch
index e59e72172deb..6dc1b823ba58 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -476,6 +476,8 @@ def filter_ignore(line, module):
'src/gpu/GrUtil.h',
'src/sksl/', # conflict between SkSL::Expression and
SkSL::dsl::Expression
'include/sksl/',
+ 'src/gpu/vk/',
+ 'include/gpu/vk'
]
for i in ignore_list:
diff --git a/external/skia/inc/pch/precompiled_skia.hxx
b/external/skia/inc/pch/precompiled_skia.hxx
index f10eac6b43b5..81f57816abcf 100644
--- a/external/skia/inc/pch/precompiled_skia.hxx
+++ b/external/skia/inc/pch/precompiled_skia.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which
presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2021-08-24 13:03:12 using:
+ Generated on 2021-09-10 22:24:48 using:
./bin/update_pch external/skia skia --cutoff=1 --exclude:system
--include:module --include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -191,7 +191,6 @@
#include <include/gpu/GrContextThreadSafeProxy.h>
#include <include/gpu/GrDirectContext.h>
#include <include/gpu/GrRecordingContext.h>
-#include <include/gpu/vk/GrVkTypes.h>
#include <include/pathops/SkPathOps.h>
#include <include/ports/SkRemotableFontMgr.h>
#include <include/private/GrImageContext.h>
@@ -503,7 +502,6 @@
#include <src/gpu/text/GrSDFTControl.h>
#include <src/gpu/text/GrStrikeCache.h>
#include <src/gpu/text/GrTextBlobCache.h>
-#include <src/gpu/vk/GrVkCaps.h>
#include <src/image/SkImage_Base.h>
#include <src/image/SkImage_Gpu.h>
#include <src/image/SkImage_Lazy.h>
