bin/update_pch | 13 +++++++-
config_host/config_skia.h.in | 45 +++++++++++++++++++++++++++++
external/skia/inc/pch/precompiled_skia.hxx | 24 ++++++++++++---
vcl/skia/SkiaHelper.cxx | 11 +++++--
4 files changed, 85 insertions(+), 8 deletions(-)
New commits:
commit f8218d8f35030b26b3be7aff47600b71702b2bf6
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Oct 17 15:56:46 2019 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Thu Oct 17 16:16:16 2019 +0200
update PCH for Skia
Change-Id: Iece4d90774890576bd3d84ed2218de56def96077
diff --git a/bin/update_pch b/bin/update_pch
index aaf97e4ccd4b..47d4da870e07 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -439,9 +439,20 @@ def filter_ignore(line, module):
'dirent.h', # unix-specific
'pthread.h',
'unistd.h',
+ 'sys/stat.h',
'ft2build.h',
'fontconfig/fontconfig.h',
- 'GL/glx.h'
+ 'GL/glx.h',
+ 'src/Transform_inl.h',
+ 'src/c/sk_c_from_to.h',
+ 'src/c/sk_types_priv.h',
+ 'src/core/SkBlitBWMaskTemplate.h',
+ 'src/sfnt/SkSFNTHeader.h',
+ 'src/opts/',
+ 'src/core/SkCubicSolver.h',
+ 'src/sksl/SkSLCPP.h',
+ 'src/gpu/vk/GrVkAMDMemoryAllocator.h',
+ 'src/gpu/GrUtil.h'
]
for i in ignore_list:
diff --git a/external/skia/inc/pch/precompiled_skia.hxx
b/external/skia/inc/pch/precompiled_skia.hxx
index 5f40d7a38273..3d87068fcaa9 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 2019-09-26 11:31:14 using:
+ Generated on 2019-10-17 15:51:12 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:
@@ -109,7 +109,6 @@
#include <include/core/SkFontLCDConfig.h>
#include <include/core/SkFontMetrics.h>
#include <include/core/SkFontMgr.h>
-#include <include/core/SkFontStyle.h>
#include <include/core/SkFontTypes.h>
#include <include/core/SkGraphics.h>
#include <include/core/SkICC.h>
@@ -227,8 +226,9 @@
#include <include/gpu/mock/GrMockTypes.h>
#include <include/gpu/vk/GrVkBackendContext.h>
#include <include/gpu/vk/GrVkExtensions.h>
+#include <include/gpu/vk/GrVkMemoryAllocator.h>
#include <include/gpu/vk/GrVkTypes.h>
-#include <include/ports/SkFontMgr_indirect.h>
+#include <include/pathops/SkPathOps.h>
#include <include/ports/SkRemotableFontMgr.h>
#include <include/private/GrContext_Base.h>
#include <include/private/GrGLTypesPriv.h>
@@ -612,6 +612,7 @@
#include <src/gpu/ccpr/GrCCPathCache.h>
#include <src/gpu/ccpr/GrCCPathProcessor.h>
#include <src/gpu/ccpr/GrCCPerFlushResources.h>
+#include <src/gpu/ccpr/GrCCPerOpListPaths.h>
#include <src/gpu/ccpr/GrCCQuadraticShader.h>
#include <src/gpu/ccpr/GrCCStrokeGeometry.h>
#include <src/gpu/ccpr/GrCCStroker.h>
@@ -642,13 +643,23 @@
#include <src/gpu/effects/GrXfermodeFragmentProcessor.h>
#include <src/gpu/effects/GrYUVtoRGBEffect.h>
#include <src/gpu/effects/generated/GrAARectEffect.h>
+#include <src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.h>
+#include <src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.h>
+#include <src/gpu/effects/generated/GrCircleBlurFragmentProcessor.h>
#include <src/gpu/effects/generated/GrCircleEffect.h>
#include <src/gpu/effects/generated/GrColorMatrixFragmentProcessor.h>
+#include <src/gpu/effects/generated/GrComposeLerpEffect.h>
+#include <src/gpu/effects/generated/GrComposeLerpRedEffect.h>
#include <src/gpu/effects/generated/GrConfigConversionEffect.h>
#include <src/gpu/effects/generated/GrConstColorProcessor.h>
#include <src/gpu/effects/generated/GrEllipseEffect.h>
+#include <src/gpu/effects/generated/GrLumaColorFilterEffect.h>
+#include <src/gpu/effects/generated/GrMagnifierEffect.h>
+#include <src/gpu/effects/generated/GrMixerEffect.h>
#include <src/gpu/effects/generated/GrOverrideInputFragmentProcessor.h>
#include <src/gpu/effects/generated/GrPremulInputFragmentProcessor.h>
+#include <src/gpu/effects/generated/GrRRectBlurEffect.h>
+#include <src/gpu/effects/generated/GrRectBlurEffect.h>
#include <src/gpu/effects/generated/GrSimpleTextureEffect.h>
#include <src/gpu/geometry/GrPathUtils.h>
#include <src/gpu/geometry/GrQuad.h>
@@ -852,7 +863,7 @@
#include <src/pdf/SkPDFTypes.h>
#include <src/pdf/SkPDFUnion.h>
#include <src/pdf/SkPDFUtils.h>
-#include <src/ports/SkFontHost_FreeType_common.h>
+#include <src/ports/SkOSLibrary.h>
#include <src/sfnt/SkOTTableTypes.h>
#include <src/sfnt/SkOTTable_OS_2.h>
#include <src/sfnt/SkOTTable_head.h>
@@ -947,7 +958,6 @@
#include <src/sksl/ir/SkSLVariable.h>
#include <src/sksl/ir/SkSLVariableReference.h>
#include <src/sksl/ir/SkSLWhileStatement.h>
-#include <src/utils/SkCallableTraits.h>
#include <src/utils/SkCanvasStack.h>
#include <src/utils/SkCharToGlyphCache.h>
#include <src/utils/SkDashPathPriv.h>
@@ -964,6 +974,10 @@
#include <src/utils/SkShaperJSONWriter.h>
#include <src/utils/SkUTF.h>
#include <third_party/gif/SkGifImageReader.h>
+#include <tools/gpu/vk/GrVulkanDefines.h>
+#include <tools/gpu/vk/VkTestUtils.h>
+#include <tools/sk_app/GLWindowContext.h>
+#include <tools/sk_app/VulkanWindowContext.h>
#include <vulkan/vulkan_core.h>
#endif // PCH_LEVEL >= 3
#if PCH_LEVEL >= 4
commit 04df4cad3e235133d4e3704d0034977e806be0ed
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Oct 17 12:56:31 2019 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Thu Oct 17 16:16:11 2019 +0200
fix Skia enabling (disabling and it should not be enabled by default)
Change-Id: I96bd8565a2a311d556ca96d868feccaf00a9cfe3
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index 84291a3d1899..278d19bd8d52 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -18,6 +18,14 @@ bool SkiaHelper::isVCLSkiaEnabled() { return false; }
#else
+static bool supportsVCLSkia()
+{
+ static bool bDisableSkia = !!getenv("SAL_DISABLESKIA");
+ bool bBlacklisted = false; // TODO isDeviceBlacklisted();
+
+ return !bDisableSkia && !bBlacklisted;
+}
+
bool SkiaHelper::isVCLSkiaEnabled()
{
/**
@@ -50,7 +58,7 @@ bool SkiaHelper::isVCLSkiaEnabled()
"SAL_FORCESKIA"); // TODO SKIA ||
officecfg::Office::Common::VCL::ForceOpenGL::get();
bool bRet = false;
- bool bSupportsVCLSkia = true; // TODO SKIA supportsVCLOpenGL();
+ bool bSupportsVCLSkia = supportsVCLSkia();
// TODO SKIA always call supportsVCLOpenGL to de-zombie the glxtest child
process on X11
if (bForceSkia)
{
@@ -63,7 +71,6 @@ bool SkiaHelper::isVCLSkiaEnabled()
bEnable = bEnableSkiaEnv;
// TODO SKIA if
(officecfg::Office::Common::VCL::UseOpenGL::get())
- bEnable = true;
// Force disable in safe mode
if (Application::IsSafeModeEnabled())
commit 46b60cf079e4389a18639ca075cc21ec7b4b89f1
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Oct 17 12:07:48 2019 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Thu Oct 17 16:16:06 2019 +0200
use the same config file for skia build and using it
So that the setup is consistent.
Change-Id: Ia113c7bf79036e3ec7585263ed70da68e461fbac
diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in
new file mode 100644
index 000000000000..75b1e099ce8e
--- /dev/null
+++ b/config_host/config_skia.h.in
@@ -0,0 +1,45 @@
+/*
+
+Settings for the Skia library. We compile the Skia library with these
+settings and also LO code uses this header to ensure the settings
+are the same.
+*/
+
+#ifndef CONFIG_SKIA_H
+#define CONFIG_SKIA_H
+
+/* TODO SKIA check all these */
+
+#define SK_SUPPORT_GPU 1
+
+#define SK_GL 1
+
+#define SK_VULKAN 1
+
+#define SK_HAS_JPEG_LIBRARY 1
+
+#define SK_HAS_PNG_LIBRARY 1
+
+#define SK_GAMMA_APPLY_TO_A8
+
+#define SK_ASSUME_GL 1
+
+#define SK_ASSUME_GL_ES 0
+
+
+#ifdef DBG_UTIL
+
+#define SK_DEBUG
+
+#define SK_ENABLE_DUMP_GPU
+
+#else
+
+#define DSK_RELEASE
+
+#endif // DBG_UTIL
+
+// TODO ?
+//#define SK_R32_SHIFT 16
+
+#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
