download.lst | 4
external/skia/Library_skia.mk | 132 ++++++++++++++------------
external/skia/UnpackedTarball_skia.mk | 4
external/skia/constexpr-debug-std-max.patch.1 | 32 ------
external/skia/fix-graphite-ifdef.patch.1 | 13 ++
external/skia/fix-without-gl.patch.1 | 40 ++-----
external/skia/inc/pch/precompiled_skia.hxx | 10 +
external/skia/make-api-visible.patch.1 | 10 -
external/skia/share-grcontext.patch.1 | 35 ++----
9 files changed, 130 insertions(+), 150 deletions(-)
New commits:
commit 5cb6c9c814e8675da181c8cfd623518da99d2b4a
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Nov 25 17:09:53 2021 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Fri Nov 26 10:49:42 2021 +0100
update Skia to chrome/m97
Change-Id: I55ab0b25389dcce3263b38a2de12c437b47751c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125821
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
(cherry picked from commit e95a808020de12351714965f5656e893d94d50f4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125830
diff --git a/download.lst b/download.lst
index df1aab85fc23..1cb460f01f66 100644
--- a/download.lst
+++ b/download.lst
@@ -237,8 +237,8 @@ export RHINO_SHA256SUM :=
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131
export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
export SERF_SHA256SUM :=
549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc
export SERF_TARBALL := serf-1.3.9.tar.bz2
-export SKIA_SHA256SUM :=
f69f9164ee982a8254722e1100aa7d31f78a5cd5e084418a3e202b55104fc3e2
-export SKIA_TARBALL := skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz
+export SKIA_SHA256SUM :=
97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177
+export SKIA_TARBALL := skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
export STAROFFICE_SHA256SUM :=
f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
export STAROFFICE_VERSION_MICRO := 7
export STAROFFICE_TARBALL :=
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 92215b0935d2..d3c3dd2cae7c 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -169,6 +169,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkBlitter \
UnpackedTarball/skia/src/core/SkBlitter_RGB565 \
UnpackedTarball/skia/src/core/SkBlitter_Sprite \
+ UnpackedTarball/skia/src/core/SkBlockAllocator \
UnpackedTarball/skia/src/core/SkBlurMask \
UnpackedTarball/skia/src/core/SkBlurMF \
UnpackedTarball/skia/src/core/SkBuffer \
@@ -357,6 +358,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/effects/imagefilters/SkBlurImageFilter \
UnpackedTarball/skia/src/effects/imagefilters/SkColorFilterImageFilter \
UnpackedTarball/skia/src/effects/imagefilters/SkComposeImageFilter \
+ UnpackedTarball/skia/src/effects/imagefilters/SkCropImageFilter \
UnpackedTarball/skia/src/effects/imagefilters/SkDisplacementMapImageFilter
\
UnpackedTarball/skia/src/effects/imagefilters/SkDropShadowImageFilter \
UnpackedTarball/skia/src/effects/imagefilters/SkImageImageFilter \
@@ -466,6 +468,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/sksl/dsl/priv/DSLWriter \
UnpackedTarball/skia/src/sksl/ir/SkSLBinaryExpression \
UnpackedTarball/skia/src/sksl/ir/SkSLBlock \
+ UnpackedTarball/skia/src/sksl/ir/SkSLChildCall \
UnpackedTarball/skia/src/sksl/ir/SkSLConstructor \
UnpackedTarball/skia/src/sksl/ir/SkSLConstructorArray \
UnpackedTarball/skia/src/sksl/ir/SkSLConstructorArrayCast \
@@ -482,8 +485,10 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/sksl/ir/SkSLForStatement \
UnpackedTarball/skia/src/sksl/ir/SkSLFunctionCall \
UnpackedTarball/skia/src/sksl/ir/SkSLFunctionDeclaration \
+ UnpackedTarball/skia/src/sksl/ir/SkSLFunctionDefinition \
UnpackedTarball/skia/src/sksl/ir/SkSLIfStatement \
UnpackedTarball/skia/src/sksl/ir/SkSLIndexExpression \
+ UnpackedTarball/skia/src/sksl/ir/SkSLModifiers \
UnpackedTarball/skia/src/sksl/ir/SkSLPrefixExpression \
UnpackedTarball/skia/src/sksl/ir/SkSLPostfixExpression \
UnpackedTarball/skia/src/sksl/ir/SkSLSetting \
@@ -492,10 +497,10 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/sksl/ir/SkSLSymbolTable \
UnpackedTarball/skia/src/sksl/ir/SkSLTernaryExpression \
UnpackedTarball/skia/src/sksl/ir/SkSLType \
+ UnpackedTarball/skia/src/sksl/ir/SkSLTypeReference \
UnpackedTarball/skia/src/sksl/ir/SkSLVarDeclarations \
UnpackedTarball/skia/src/sksl/ir/SkSLVariable \
UnpackedTarball/skia/src/sksl/ir/SkSLVariableReference \
- UnpackedTarball/skia/src/sksl/SkSLASTNode \
UnpackedTarball/skia/src/sksl/SkSLAnalysis \
UnpackedTarball/skia/src/sksl/SkSLBuiltinTypes \
UnpackedTarball/skia/src/sksl/SkSLCompiler \
@@ -503,24 +508,36 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/sksl/SkSLContext \
UnpackedTarball/skia/src/sksl/SkSLDSLParser \
UnpackedTarball/skia/src/sksl/SkSLDehydrator \
- UnpackedTarball/skia/src/sksl/SkSLIRGenerator \
+ UnpackedTarball/skia/src/sksl/SkSLErrorReporter \
UnpackedTarball/skia/src/sksl/SkSLInliner \
+ UnpackedTarball/skia/src/sksl/SkSLIntrinsicMap \
UnpackedTarball/skia/src/sksl/SkSLLexer \
UnpackedTarball/skia/src/sksl/SkSLMangler \
UnpackedTarball/skia/src/sksl/SkSLOperators \
UnpackedTarball/skia/src/sksl/SkSLOutputStream \
- UnpackedTarball/skia/src/sksl/SkSLParser \
UnpackedTarball/skia/src/sksl/SkSLPool \
UnpackedTarball/skia/src/sksl/SkSLRehydrator \
UnpackedTarball/skia/src/sksl/SkSLSampleUsage \
UnpackedTarball/skia/src/sksl/SkSLString \
+ UnpackedTarball/skia/src/sksl/SkSLThreadContext \
UnpackedTarball/skia/src/sksl/SkSLUtil \
+ UnpackedTarball/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue \
+ UnpackedTarball/skia/src/sksl/analysis/SkSLCheckProgramUnrolledSize \
+ UnpackedTarball/skia/src/sksl/analysis/SkSLGetLoopUnrollInfo \
+ UnpackedTarball/skia/src/sksl/analysis/SkSLIsConstantExpression \
+ UnpackedTarball/skia/src/sksl/analysis/SkSLProgramUsage \
+ UnpackedTarball/skia/src/sksl/analysis/SkSLSwitchCaseContainsExit \
UnpackedTarball/skia/src/sksl/codegen/SkSLGLSLCodeGenerator \
UnpackedTarball/skia/src/sksl/codegen/SkSLMetalCodeGenerator \
UnpackedTarball/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator \
UnpackedTarball/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator \
UnpackedTarball/skia/src/sksl/codegen/SkSLSPIRVtoHLSL \
UnpackedTarball/skia/src/sksl/codegen/SkSLVMCodeGenerator \
+ UnpackedTarball/skia/src/sksl/transform/SkSLBuiltinVariableScanner \
+ UnpackedTarball/skia/src/sksl/transform/SkSLEliminateDeadFunctions \
+ UnpackedTarball/skia/src/sksl/transform/SkSLEliminateDeadGlobalVariables \
+ UnpackedTarball/skia/src/sksl/transform/SkSLEliminateDeadLocalVariables \
+ UnpackedTarball/skia/src/sksl/transform/SkSLEliminateUnreachableCode \
UnpackedTarball/skia/src/utils/SkBase64 \
UnpackedTarball/skia/src/utils/SkCamera \
UnpackedTarball/skia/src/utils/SkCanvasStack \
@@ -595,7 +612,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder \
UnpackedTarball/skia/src/gpu/gradients/GrGradientBitmapCache \
UnpackedTarball/skia/src/gpu/gradients/GrGradientShader \
- UnpackedTarball/skia/src/gpu/GrAATriangulator \
UnpackedTarball/skia/src/gpu/GrAHardwareBufferImageGenerator \
UnpackedTarball/skia/src/gpu/GrAHardwareBufferUtils \
UnpackedTarball/skia/src/gpu/GrAttachment \
@@ -604,8 +620,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrBackendSurface \
UnpackedTarball/skia/src/gpu/GrBackendTextureImageGenerator \
UnpackedTarball/skia/src/gpu/GrBackendUtils \
- UnpackedTarball/skia/src/gpu/GrBlockAllocator \
- UnpackedTarball/skia/src/gpu/GrBlurUtils \
UnpackedTarball/skia/src/gpu/GrBufferAllocPool \
UnpackedTarball/skia/src/gpu/GrCaps \
UnpackedTarball/skia/src/gpu/GrClientMappedBufferManager \
@@ -623,7 +637,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrDistanceFieldGenFromVector \
UnpackedTarball/skia/src/gpu/GrDrawingManager \
UnpackedTarball/skia/src/gpu/GrDrawOpAtlas \
- UnpackedTarball/skia/src/gpu/GrDrawOpTest \
UnpackedTarball/skia/src/gpu/GrDriverBugWorkarounds \
UnpackedTarball/skia/src/gpu/GrDynamicAtlas \
UnpackedTarball/skia/src/gpu/GrEagerVertexAllocator \
@@ -641,7 +654,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrOnFlushResourceProvider \
UnpackedTarball/skia/src/gpu/GrOpFlushState \
UnpackedTarball/skia/src/gpu/GrOpsRenderPass \
- UnpackedTarball/skia/src/gpu/GrOpsTask \
UnpackedTarball/skia/src/gpu/GrPaint \
UnpackedTarball/skia/src/gpu/GrPersistentCacheUtils \
UnpackedTarball/skia/src/gpu/GrPipeline \
@@ -674,11 +686,11 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrStyle \
UnpackedTarball/skia/src/gpu/GrSubRunAllocator \
UnpackedTarball/skia/src/gpu/GrSurface \
+ UnpackedTarball/skia/src/gpu/GrSurfaceInfo \
UnpackedTarball/skia/src/gpu/GrSurfaceProxy \
UnpackedTarball/skia/src/gpu/GrSwizzle \
UnpackedTarball/skia/src/gpu/GrSWMaskHelper \
UnpackedTarball/skia/src/gpu/GrTestUtils \
- UnpackedTarball/skia/src/gpu/GrTriangulator \
UnpackedTarball/skia/src/gpu/GrUniformDataManager \
UnpackedTarball/skia/src/gpu/GrTexture \
UnpackedTarball/skia/src/gpu/GrTextureProxy \
@@ -694,44 +706,21 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrXferProcessor \
UnpackedTarball/skia/src/gpu/GrYUVABackendTextures \
UnpackedTarball/skia/src/gpu/GrYUVATextureProxies \
+ UnpackedTarball/skia/src/gpu/geometry/GrAAConvexTessellator \
+ UnpackedTarball/skia/src/gpu/geometry/GrAATriangulator \
+ UnpackedTarball/skia/src/gpu/geometry/GrTriangulator \
UnpackedTarball/skia/src/gpu/mock/GrMockCaps \
UnpackedTarball/skia/src/gpu/mock/GrMockGpu \
UnpackedTarball/skia/src/gpu/mock/GrMockTypes \
- UnpackedTarball/skia/src/gpu/ops/GrAAConvexTessellator \
- UnpackedTarball/skia/src/gpu/ops/GrAtlasTextOp \
- UnpackedTarball/skia/src/gpu/ops/GrClearOp \
- UnpackedTarball/skia/src/gpu/ops/GrDashOp \
- UnpackedTarball/skia/src/gpu/ops/GrDrawableOp \
- UnpackedTarball/skia/src/gpu/ops/GrDrawAtlasOp \
- UnpackedTarball/skia/src/gpu/ops/GrDrawVerticesOp \
- UnpackedTarball/skia/src/gpu/ops/GrFillRectOp \
- UnpackedTarball/skia/src/gpu/ops/GrFillRRectOp \
- UnpackedTarball/skia/src/gpu/ops/GrLatticeOp \
- UnpackedTarball/skia/src/gpu/ops/GrMeshDrawOp \
- UnpackedTarball/skia/src/gpu/ops/GrOp \
- UnpackedTarball/skia/src/gpu/ops/GrOvalOpFactory \
- UnpackedTarball/skia/src/gpu/ops/GrQuadPerEdgeAA \
- UnpackedTarball/skia/src/gpu/ops/GrRegionOp \
- UnpackedTarball/skia/src/gpu/ops/GrShadowRRectOp \
- UnpackedTarball/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper \
- UnpackedTarball/skia/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil \
- UnpackedTarball/skia/src/gpu/ops/GrSmallPathAtlasMgr \
- UnpackedTarball/skia/src/gpu/ops/GrSmallPathShapeData \
- UnpackedTarball/skia/src/gpu/ops/GrStrokeRectOp \
- UnpackedTarball/skia/src/gpu/ops/GrTextureOp \
UnpackedTarball/skia/src/gpu/BaseDevice \
UnpackedTarball/skia/src/gpu/SkGr \
UnpackedTarball/skia/src/gpu/SurfaceContext \
UnpackedTarball/skia/src/gpu/SurfaceFillContext \
- UnpackedTarball/skia/src/gpu/tessellate/GrAtlasRenderTask \
- UnpackedTarball/skia/src/gpu/tessellate/GrPathCurveTessellator \
- UnpackedTarball/skia/src/gpu/tessellate/GrPathInnerTriangulateOp \
- UnpackedTarball/skia/src/gpu/tessellate/GrPathStencilCoverOp \
- UnpackedTarball/skia/src/gpu/tessellate/GrPathTessellateOp \
- UnpackedTarball/skia/src/gpu/tessellate/GrPathWedgeTessellator \
- UnpackedTarball/skia/src/gpu/tessellate/GrStrokeFixedCountTessellator \
- UnpackedTarball/skia/src/gpu/tessellate/GrStrokeHardwareTessellator \
- UnpackedTarball/skia/src/gpu/tessellate/GrStrokeTessellateOp \
+ UnpackedTarball/skia/src/gpu/tessellate/PathCurveTessellator \
+ UnpackedTarball/skia/src/gpu/tessellate/PathWedgeTessellator \
+ UnpackedTarball/skia/src/gpu/tessellate/StrokeFixedCountTessellator \
+ UnpackedTarball/skia/src/gpu/tessellate/StrokeHardwareTessellator \
+ UnpackedTarball/skia/src/gpu/tessellate/Tessellation \
UnpackedTarball/skia/src/gpu/tessellate/shaders/GrPathTessellationShader \
UnpackedTarball/skia/src/gpu/tessellate/shaders/GrPathTessellationShader_Hardware
\
UnpackedTarball/skia/src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut
\
@@ -754,24 +743,53 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrAuditTrail \
- UnpackedTarball/skia/src/gpu/GrClipStack \
- UnpackedTarball/skia/src/gpu/GrPathRenderer \
- UnpackedTarball/skia/src/gpu/GrPathRendererChain \
- UnpackedTarball/skia/src/gpu/GrSoftwarePathRenderer \
- UnpackedTarball/skia/src/gpu/GrStencilMaskHelper \
- UnpackedTarball/skia/src/gpu/ops/GrAAConvexPathRenderer \
- UnpackedTarball/skia/src/gpu/ops/GrAAHairLinePathRenderer \
- UnpackedTarball/skia/src/gpu/ops/GrAALinearizingConvexPathRenderer \
- UnpackedTarball/skia/src/gpu/ops/GrAtlasInstancedHelper \
- UnpackedTarball/skia/src/gpu/ops/GrAtlasPathRenderer \
- UnpackedTarball/skia/src/gpu/ops/GrDashLinePathRenderer \
- UnpackedTarball/skia/src/gpu/ops/GrDefaultPathRenderer \
- UnpackedTarball/skia/src/gpu/ops/GrDrawAtlasPathOp \
- UnpackedTarball/skia/src/gpu/ops/GrSmallPathRenderer \
- UnpackedTarball/skia/src/gpu/ops/GrTriangulatingPathRenderer \
- UnpackedTarball/skia/src/gpu/tessellate/GrTessellationPathRenderer \
+ UnpackedTarball/skia/src/gpu/GrBlurUtils \
+ UnpackedTarball/skia/src/gpu/GrDrawOpTest \
+ UnpackedTarball/skia/src/gpu/ops/AAConvexPathRenderer \
+ UnpackedTarball/skia/src/gpu/ops/AAHairLinePathRenderer \
+ UnpackedTarball/skia/src/gpu/ops/AALinearizingConvexPathRenderer \
+ UnpackedTarball/skia/src/gpu/ops/AtlasInstancedHelper \
+ UnpackedTarball/skia/src/gpu/ops/AtlasPathRenderer \
+ UnpackedTarball/skia/src/gpu/ops/AtlasRenderTask \
+ UnpackedTarball/skia/src/gpu/ops/AtlasTextOp \
+ UnpackedTarball/skia/src/gpu/ops/ClearOp \
+ UnpackedTarball/skia/src/gpu/ops/DashLinePathRenderer \
+ UnpackedTarball/skia/src/gpu/ops/DashOp \
+ UnpackedTarball/skia/src/gpu/ops/DefaultPathRenderer \
+ UnpackedTarball/skia/src/gpu/ops/DrawAtlasOp \
+ UnpackedTarball/skia/src/gpu/ops/DrawAtlasPathOp \
+ UnpackedTarball/skia/src/gpu/ops/DrawVerticesOp \
+ UnpackedTarball/skia/src/gpu/ops/DrawableOp \
+ UnpackedTarball/skia/src/gpu/ops/FillRRectOp \
+ UnpackedTarball/skia/src/gpu/ops/FillRectOp \
+ UnpackedTarball/skia/src/gpu/ops/GrMeshDrawOp \
+ UnpackedTarball/skia/src/gpu/ops/GrOp \
+ UnpackedTarball/skia/src/gpu/ops/GrOvalOpFactory \
+ UnpackedTarball/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper \
+ UnpackedTarball/skia/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil \
+ UnpackedTarball/skia/src/gpu/ops/LatticeOp \
+ UnpackedTarball/skia/src/gpu/ops/OpsTask \
+ UnpackedTarball/skia/src/gpu/ops/PathInnerTriangulateOp \
+ UnpackedTarball/skia/src/gpu/ops/PathStencilCoverOp \
+ UnpackedTarball/skia/src/gpu/ops/PathTessellateOp \
+ UnpackedTarball/skia/src/gpu/ops/QuadPerEdgeAA \
+ UnpackedTarball/skia/src/gpu/ops/RegionOp \
+ UnpackedTarball/skia/src/gpu/ops/ShadowRRectOp \
+ UnpackedTarball/skia/src/gpu/ops/SmallPathAtlasMgr \
+ UnpackedTarball/skia/src/gpu/ops/SmallPathRenderer \
+ UnpackedTarball/skia/src/gpu/ops/SmallPathShapeData \
+ UnpackedTarball/skia/src/gpu/ops/SoftwarePathRenderer \
+ UnpackedTarball/skia/src/gpu/ops/StrokeRectOp \
+ UnpackedTarball/skia/src/gpu/ops/StrokeTessellateOp \
+ UnpackedTarball/skia/src/gpu/ops/TessellationPathRenderer \
+ UnpackedTarball/skia/src/gpu/ops/TextureOp \
+ UnpackedTarball/skia/src/gpu/ops/TriangulatingPathRenderer \
+ UnpackedTarball/skia/src/gpu/v1/ClipStack \
UnpackedTarball/skia/src/gpu/v1/Device \
UnpackedTarball/skia/src/gpu/v1/Device_drawTexture \
+ UnpackedTarball/skia/src/gpu/v1/PathRenderer \
+ UnpackedTarball/skia/src/gpu/v1/PathRendererChain \
+ UnpackedTarball/skia/src/gpu/v1/StencilMaskHelper \
UnpackedTarball/skia/src/gpu/v1/SurfaceDrawContext \
UnpackedTarball/skia/src/gpu/v1/SurfaceFillContext_v1 \
))
@@ -779,7 +797,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
ifeq ($(SKIA_GPU),VULKAN)
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/vk/GrVkAMDMemoryAllocator \
- UnpackedTarball/skia/src/gpu/vk/GrVkAttachment \
UnpackedTarball/skia/src/gpu/vk/GrVkBuffer \
UnpackedTarball/skia/src/gpu/vk/GrVkCaps \
UnpackedTarball/skia/src/gpu/vk/GrVkCommandBuffer \
@@ -941,6 +958,7 @@ $(eval $(call gb_Library_add_generated_objcxxobjects,skia,\
UnpackedTarball/skia/src/gpu/mtl/GrMtlTexture \
UnpackedTarball/skia/src/gpu/mtl/GrMtlTextureRenderTarget \
UnpackedTarball/skia/src/gpu/mtl/GrMtlTrampoline \
+ UnpackedTarball/skia/src/gpu/mtl/GrMtlTypesPriv \
UnpackedTarball/skia/src/gpu/mtl/GrMtlUniformHandler \
UnpackedTarball/skia/src/gpu/mtl/GrMtlUtil \
UnpackedTarball/skia/src/gpu/mtl/GrMtlVaryingHandler \
diff --git a/external/skia/UnpackedTarball_skia.mk
b/external/skia/UnpackedTarball_skia.mk
index f1b4cc74e324..c6e27ecf4183 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -25,11 +25,10 @@ skia_patches := \
windows-do-not-modify-logfont.patch.0 \
windows-text-gamma.patch.0 \
windows-force-unicode-api.patch.0 \
- fix-without-gl.patch.0 \
+ fix-without-gl.patch.1 \
windows-typeface-directwrite.patch.0 \
windows-raster-surface-no-copies.patch.1 \
fix-windows-dwrite.patch.1 \
- constexpr-debug-std-max.patch.1 \
swap-buffers-rect.patch.1 \
ubsan.patch.0 \
fast-png-write.patch.1 \
@@ -37,6 +36,7 @@ skia_patches := \
fix-warnings.patch.1 \
disable-freetype-colrv1.1 \
windows-libraries-system32.patch.1 \
+ fix-graphite-ifdef.patch.1 \
$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
diff --git a/external/skia/constexpr-debug-std-max.patch.1
b/external/skia/constexpr-debug-std-max.patch.1
deleted file mode 100644
index b20e4d218bc8..000000000000
--- a/external/skia/constexpr-debug-std-max.patch.1
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/sksl/SkSLASTNode.h b/src/sksl/SkSLASTNode.h
-index f266e75493..84a958411d 100644
---- a/src/sksl/SkSLASTNode.h
-+++ b/src/sksl/SkSLASTNode.h
-@@ -18,6 +18,18 @@
-
- namespace SkSL {
-
-+namespace {
-+template<typename T>
-+constexpr T skia_max( std::initializer_list<T> list )
-+{
-+T max = *list.begin();
-+for(auto i: list)
-+ if( max < i )
-+ max = i;
-+return max;
-+}
-+}
-+
- /**
- * Represents a node in the abstract syntax tree (AST). The AST is based
directly on the parse tree;
- * it is a parsed-but-not-yet-analyzed version of the program.
-@@ -233,7 +245,7 @@ struct ASTNode {
- // We use fBytes as a union which can hold any type of AST node, and
use placement-new to
- // copy AST objects into fBytes. Note that none of the AST objects
have interesting
- // destructors, so we do not bother doing a placement-delete on any
of them in ~NodeData.
-- char fBytes[std::max({sizeof(Operator),
-+ char fBytes[skia_max({sizeof(Operator),
- sizeof(skstd::string_view),
- sizeof(bool),
- sizeof(SKSL_INT),
diff --git a/external/skia/fix-graphite-ifdef.patch.1
b/external/skia/fix-graphite-ifdef.patch.1
new file mode 100644
index 000000000000..594341bb25c9
--- /dev/null
+++ b/external/skia/fix-graphite-ifdef.patch.1
@@ -0,0 +1,13 @@
+diff --git a/tools/sk_app/WindowContext.h b/tools/sk_app/WindowContext.h
+index 79f6d72f35..f9d8081b85 100644
+--- a/tools/sk_app/WindowContext.h
++++ b/tools/sk_app/WindowContext.h
+@@ -55,7 +55,7 @@ protected:
+ virtual bool isGpuContext() { return true; }
+
+ sk_sp<GrDirectContext> fContext;
+-#if SK_GRAPHITE_ENABLED
++#ifdef SK_GRAPHITE_ENABLED
+ sk_sp<skgpu::Context> fGraphiteContext;
+ #endif
+
diff --git a/external/skia/fix-without-gl.patch.0
b/external/skia/fix-without-gl.patch.1
similarity index 57%
rename from external/skia/fix-without-gl.patch.0
rename to external/skia/fix-without-gl.patch.1
index f0409d15e35a..3a17e32dcff6 100644
--- a/external/skia/fix-without-gl.patch.0
+++ b/external/skia/fix-without-gl.patch.1
@@ -1,24 +1,8 @@
-diff --git a/include/gpu/GrBackendSurface.h b/include/gpu/GrBackendSurface.h
-index 378646ebc1..af3b9ce290 100644
---- ./include/gpu/GrBackendSurface.h
-+++ ./include/gpu/GrBackendSurface.h
-@@ -74,9 +74,11 @@ public:
- GrBackendFormat(const GrBackendFormat&);
- GrBackendFormat& operator=(const GrBackendFormat&);
-
-+#ifdef SK_GL
- static GrBackendFormat MakeGL(GrGLenum format, GrGLenum target) {
- return GrBackendFormat(format, target);
- }
-+#endif
-
- static GrBackendFormat MakeVk(VkFormat format) {
- return GrBackendFormat(format, GrVkYcbcrConversionInfo());
diff --git a/include/gpu/gl/GrGLInterface.h b/include/gpu/gl/GrGLInterface.h
-index 17655bdbed..ce0641f423 100644
---- ./include/gpu/gl/GrGLInterface.h
-+++ ./include/gpu/gl/GrGLInterface.h
-@@ -65,7 +65,9 @@ public:
+index af3ca67dcc..14d2521d12 100644
+--- a/include/gpu/gl/GrGLInterface.h
++++ b/include/gpu/gl/GrGLInterface.h
+@@ -85,7 +85,9 @@ public:
GrGLExtensions fExtensions;
@@ -29,9 +13,9 @@ index 17655bdbed..ce0641f423 100644
/**
* The function pointers are in a struct so that we can have a compiler
generated assignment
diff --git a/src/gpu/gl/GrGLContext.h b/src/gpu/gl/GrGLContext.h
-index 66bfe29331..034cd21838 100644
---- ./src/gpu/gl/GrGLContext.h
-+++ ./src/gpu/gl/GrGLContext.h
+index 93bd57c2c5..487774d7d5 100644
+--- a/src/gpu/gl/GrGLContext.h
++++ b/src/gpu/gl/GrGLContext.h
@@ -45,9 +45,11 @@ public:
const GrGLCaps* caps() const { return fGLCaps.get(); }
GrGLCaps* caps() { return fGLCaps.get(); }
@@ -45,10 +29,10 @@ index 66bfe29331..034cd21838 100644
const GrGLExtensions& extensions() const { return
fInterface->fExtensions; }
diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h
-index 8e550c36e6..27fb5efe9b 100644
---- ./src/gpu/gl/GrGLGpu.h
-+++ ./src/gpu/gl/GrGLGpu.h
-@@ -259,6 +259,7 @@ private:
+index 50affac85e..f0f28046a9 100644
+--- a/src/gpu/gl/GrGLGpu.h
++++ b/src/gpu/gl/GrGLGpu.h
+@@ -277,6 +277,7 @@ private:
// compatible stencil format, or negative if there is no compatible
stencil format.
int getCompatibleStencilIndex(GrGLFormat format);
@@ -56,7 +40,7 @@ index 8e550c36e6..27fb5efe9b 100644
GrBackendFormat getPreferredStencilFormat(const GrBackendFormat& format)
override {
int idx = this->getCompatibleStencilIndex(format.asGLFormat());
if (idx < 0) {
-@@ -267,6 +268,7 @@ private:
+@@ -285,6 +286,7 @@ private:
return
GrBackendFormat::MakeGL(GrGLFormatToEnum(this->glCaps().stencilFormats()[idx]),
GR_GL_TEXTURE_NONE);
}
diff --git a/external/skia/inc/pch/precompiled_skia.hxx
b/external/skia/inc/pch/precompiled_skia.hxx
index 81f57816abcf..a6b39fe19eac 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-09-10 22:24:48 using:
+ Generated on 2021-11-25 16:36:08 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:
@@ -54,6 +54,7 @@
#include <png.h>
#include <queue>
#include <sstream>
+#include <stack>
#include <stdarg.h>
#include <stddef.h>
#include <stdio.h>
@@ -215,6 +216,7 @@
#include <include/private/SkSLLayout.h>
#include <include/private/SkSLModifiers.h>
#include <include/private/SkSLProgramElement.h>
+#include <include/private/SkSLProgramKind.h>
#include <include/private/SkSLSampleUsage.h>
#include <include/private/SkSLStatement.h>
#include <include/private/SkSLString.h>
@@ -261,18 +263,15 @@
#include <src/codec/SkColorTable.h>
#include <src/codec/SkFrameHolder.h>
#include <src/codec/SkIcoCodec.h>
-#include <src/codec/SkJpegCodec.h>
#include <src/codec/SkMaskSwizzler.h>
#include <src/codec/SkMasks.h>
#include <src/codec/SkPngCodec.h>
#include <src/codec/SkPngPriv.h>
-#include <src/codec/SkRawCodec.h>
#include <src/codec/SkSampledCodec.h>
#include <src/codec/SkSampler.h>
#include <src/codec/SkStreamBuffer.h>
#include <src/codec/SkSwizzler.h>
#include <src/codec/SkWbmpCodec.h>
-#include <src/codec/SkWebpCodec.h>
#include <src/core/SkAAClip.h>
#include <src/core/SkATrace.h>
#include <src/core/SkAdvancedTypefaceMetrics.h>
@@ -292,6 +291,7 @@
#include <src/core/SkBlenderBase.h>
#include <src/core/SkBlitRow.h>
#include <src/core/SkBlitter.h>
+#include <src/core/SkBlockAllocator.h>
#include <src/core/SkBlurMask.h>
#include <src/core/SkBuffer.h>
#include <src/core/SkCachedData.h>
@@ -454,6 +454,7 @@
#include <src/effects/SkEmbossMaskFilter.h>
#include <src/effects/SkOpPE.h>
#include <src/effects/SkTrimPE.h>
+#include <src/effects/imagefilters/SkCropImageFilter.h>
#include <src/effects/imagefilters/SkRuntimeImageFilter.h>
#include <src/gpu/BaseDevice.h>
#include <src/gpu/GrBlend.h>
@@ -502,6 +503,7 @@
#include <src/gpu/text/GrSDFTControl.h>
#include <src/gpu/text/GrStrikeCache.h>
#include <src/gpu/text/GrTextBlobCache.h>
+#include <src/gpu/v1/SurfaceDrawContext_v1.h>
#include <src/image/SkImage_Base.h>
#include <src/image/SkImage_Gpu.h>
#include <src/image/SkImage_Lazy.h>
diff --git a/external/skia/make-api-visible.patch.1
b/external/skia/make-api-visible.patch.1
index 9b09506d388c..a90bd99431c7 100644
--- a/external/skia/make-api-visible.patch.1
+++ b/external/skia/make-api-visible.patch.1
@@ -1,8 +1,8 @@
diff --git a/tools/sk_app/WindowContext.h b/tools/sk_app/WindowContext.h
-index f143dab013..046c525365 100644
+index 79f6d72f35..428d198159 100644
--- a/tools/sk_app/WindowContext.h
+++ b/tools/sk_app/WindowContext.h
-@@ -17,7 +17,7 @@ class SkSurface;
+@@ -22,7 +22,7 @@ class Context;
namespace sk_app {
@@ -12,7 +12,7 @@ index f143dab013..046c525365 100644
WindowContext(const DisplayParams&);
diff --git a/tools/sk_app/mac/WindowContextFactory_mac.h
b/tools/sk_app/mac/WindowContextFactory_mac.h
-index e772030b95..224ff03f23 100644
+index 3e136a8f57..affb89e43e 100644
--- a/tools/sk_app/mac/WindowContextFactory_mac.h
+++ b/tools/sk_app/mac/WindowContextFactory_mac.h
@@ -52,7 +52,7 @@ std::unique_ptr<WindowContext> MakeDawnMTLForMac(const
MacWindowInfo&, const Dis
@@ -21,9 +21,9 @@ index e772030b95..224ff03f23 100644
#ifdef SK_METAL
-std::unique_ptr<WindowContext> MakeMetalForMac(const MacWindowInfo&, const
DisplayParams&);
+SK_API std::unique_ptr<WindowContext> MakeMetalForMac(const MacWindowInfo&,
const DisplayParams&);
+ #ifdef SK_GRAPHITE_ENABLED
+ std::unique_ptr<WindowContext> MakeGraphiteMetalForMac(const MacWindowInfo&,
const DisplayParams&);
#endif
-
- } // namespace window_context_factory
diff --git a/tools/sk_app/unix/WindowContextFactory_unix.h
b/tools/sk_app/unix/WindowContextFactory_unix.h
index 11bd2d2ac2..09c92dc417 100644
--- a/tools/sk_app/unix/WindowContextFactory_unix.h
diff --git a/external/skia/share-grcontext.patch.1
b/external/skia/share-grcontext.patch.1
index 984dbdbd123e..f131069e7a1c 100644
--- a/external/skia/share-grcontext.patch.1
+++ b/external/skia/share-grcontext.patch.1
@@ -1,8 +1,8 @@
diff --git a/tools/sk_app/MetalWindowContext.h
b/tools/sk_app/MetalWindowContext.h
-index e8c8392a15..fbf35c3c2b 100644
+index a9eacdd66f..23604db25b 100644
--- a/tools/sk_app/MetalWindowContext.h
+++ b/tools/sk_app/MetalWindowContext.h
-@@ -13,13 +13,18 @@
+@@ -14,13 +14,18 @@
#include "tools/sk_app/WindowContext.h"
@@ -21,7 +21,7 @@ index e8c8392a15..fbf35c3c2b 100644
sk_sp<SkSurface> getBackbufferSurface() override;
bool isValid() override { return fValid; }
-@@ -45,16 +50,34 @@ protected:
+@@ -46,16 +51,34 @@ protected:
void destroyContext();
virtual void onDestroyContext() = 0;
@@ -59,10 +59,10 @@ index e8c8392a15..fbf35c3c2b 100644
} // namespace sk_app
diff --git a/tools/sk_app/MetalWindowContext.mm
b/tools/sk_app/MetalWindowContext.mm
-index 5b623811ed..49dc77b74d 100644
+index c464c3904a..799aafa78b 100644
--- a/tools/sk_app/MetalWindowContext.mm
+++ b/tools/sk_app/MetalWindowContext.mm
-@@ -37,24 +37,30 @@
+@@ -37,24 +37,30 @@ NSURL* MetalWindowContext::CacheURL() {
}
void MetalWindowContext::initializeContext() {
@@ -100,7 +100,7 @@ index 5b623811ed..49dc77b74d 100644
#if GR_METAL_SDK_VERSION >= 230
if (fDisplayParams.fEnableBinaryArchive) {
-@@ -62,12 +68,12 @@
+@@ -62,11 +68,11 @@ void MetalWindowContext::initializeContext() {
sk_cfp<MTLBinaryArchiveDescriptor*>
desc([MTLBinaryArchiveDescriptor new]);
(*desc).url = CacheURL(); // try to load
NSError* error;
@@ -109,7 +109,6 @@ index 5b623811ed..49dc77b74d 100644
+ d->fPipelineArchive = [*d->fDevice
newBinaryArchiveWithDescriptor:*desc error:&error];
+ if (!d->fPipelineArchive) {
(*desc).url = nil; // create new
- NSError* error;
- fPipelineArchive = [*fDevice
newBinaryArchiveWithDescriptor:*desc error:&error];
- if (!fPipelineArchive) {
+ d->fPipelineArchive = [*d->fDevice
newBinaryArchiveWithDescriptor:*desc error:&error];
@@ -117,7 +116,7 @@ index 5b623811ed..49dc77b74d 100644
SkDebugf("Error creating MTLBinaryArchive:\n%s\n",
error.debugDescription.UTF8String);
}
-@@ -75,46 +81,75 @@
+@@ -74,46 +80,75 @@ void MetalWindowContext::initializeContext() {
}
} else {
if (@available(macOS 11.0, iOS 14.0, *)) {
@@ -208,7 +207,7 @@ index 5b623811ed..49dc77b74d 100644
}
sk_sp<SkSurface> MetalWindowContext::getBackbufferSurface() {
-@@ -155,7 +190,7 @@ GrBackendRenderTarget backendRT(fWidth,
+@@ -154,7 +189,7 @@ sk_sp<SkSurface>
MetalWindowContext::getBackbufferSurface() {
void MetalWindowContext::swapBuffers() {
id<CAMetalDrawable> currentDrawable =
(id<CAMetalDrawable>)fDrawableHandle;
@@ -217,7 +216,7 @@ index 5b623811ed..49dc77b74d 100644
commandBuffer.label = @"Present";
[commandBuffer presentDrawable:currentDrawable];
-@@ -176,9 +211,9 @@ GrBackendRenderTarget backendRT(fWidth,
+@@ -175,9 +210,9 @@ void MetalWindowContext::activate(bool isActive) {
if (!isActive) {
#if GR_METAL_SDK_VERSION >= 230
if (@available(macOS 11.0, iOS 14.0, *)) {
@@ -229,7 +228,7 @@ index 5b623811ed..49dc77b74d 100644
if (error) {
SkDebugf("Error storing MTLBinaryArchive:\n%s\n",
error.debugDescription.UTF8String);
-@@ -189,4 +224,11 @@ GrBackendRenderTarget backendRT(fWidth,
+@@ -188,4 +223,11 @@ void MetalWindowContext::activate(bool isActive) {
}
}
@@ -767,7 +766,7 @@ index 580dba2733..92bfba6dff 100644
uint32_t fImageCount;
diff --git a/tools/sk_app/WindowContext.h b/tools/sk_app/WindowContext.h
-index f143dab013..68bb84b988 100644
+index 79f6d72f35..01d0e18f46 100644
--- a/tools/sk_app/WindowContext.h
+++ b/tools/sk_app/WindowContext.h
@@ -10,9 +10,9 @@
@@ -779,13 +778,13 @@ index f143dab013..68bb84b988 100644
-class GrDirectContext;
class SkSurface;
-
- namespace sk_app {
+ #ifdef SK_GRAPHITE_ENABLED
+ namespace skgpu {
diff --git a/tools/sk_app/mac/MetalWindowContext_mac.mm
b/tools/sk_app/mac/MetalWindowContext_mac.mm
-index 5bea8578fa..058c3994be 100644
+index 5bea8578fa..f7df061af0 100644
--- a/tools/sk_app/mac/MetalWindowContext_mac.mm
+++ b/tools/sk_app/mac/MetalWindowContext_mac.mm
-@@ -49,6 +49,10 @@
+@@ -49,10 +49,14 @@ MetalWindowContext_mac::~MetalWindowContext_mac() {
}
bool MetalWindowContext_mac::onInitializeContext() {
@@ -795,10 +794,6 @@ index 5bea8578fa..058c3994be 100644
+
SkASSERT(nil != fMainView);
- fMetalLayer = [CAMetalLayer layer];
-@@ -56,7 +56,7 @@
- SkASSERT(nil != fMainView);
-
fMetalLayer = [CAMetalLayer layer];
- fMetalLayer.device = fDevice.get();
+ fMetalLayer.device = fShared->fDevice.get();
