diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-10-17 15:56:46 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 09:55:09 +0100 |
| commit | 7d3c4e89b642ff464dd1e2fd5ae188d35a625648 (patch) | |
| tree | 18b637f8db218d9f2f3200bb0d89e898dfd887bc | |
| parent | fix Skia enabling (disabling and it should not be enabled by default) (diff) | |
| download | core-7d3c4e89b642ff464dd1e2fd5ae188d35a625648.tar.gz core-7d3c4e89b642ff464dd1e2fd5ae188d35a625648.zip | |
update PCH for Skia
Change-Id: Iece4d90774890576bd3d84ed2218de56def96077
| -rwxr-xr-x | bin/update_pch | 13 | ||||
| -rw-r--r-- | external/skia/inc/pch/precompiled_skia.hxx | 24 |
2 files changed, 31 insertions, 6 deletions
diff --git a/bin/update_pch b/bin/update_pch index 31fcadae763d..10537d75e676 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -449,9 +449,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 |