[Libreoffice-commits] core.git: 2 commits - config_host/config_skia.h.in download.lst external/skia vcl/inc vcl/skia

Luboš Luňák (via logerrit) logerrit at kemper.freedesktop.org
Mon Apr 6 16:55:38 UTC 2020 

 config_host/config_skia.h.in               |    4 --
 download.lst                               |    4 +-
 external/skia/Library_skia.mk              |   53 ++-------------------------
 external/skia/UnpackedTarball_skia.mk      |    4 +-
 external/skia/Wdeprecated-copy.patch.0     |   24 ------------
 external/skia/c++20-comparison.patch.0     |   19 ---------
 external/skia/fix-pch.patch.1              |    4 +-
 external/skia/fix-without-gl.patch.0       |   47 ++++++++++++++++++++++++
 external/skia/inc/pch/precompiled_skia.hxx |   56 ++++++-----------------------
 external/skia/operator-eq-bool.patch.0     |   21 ++++++++++
 vcl/inc/skia/gdiimpl.hxx                   |    1 
 vcl/skia/SkiaHelper.cxx                    |    2 +
 vcl/skia/win/gdiimpl.cxx                   |    2 +
 vcl/skia/win/winlayout.cxx                 |    3 +
 14 files changed, 99 insertions(+), 145 deletions(-)

New commits:
commit 01546c005eaf6bce8fe4066dbec92c5655190a2a
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Apr 6 13:05:06 2020 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Apr 6 18:55:06 2020 +0200

    do not build OpenGL support in Skia
    
    We currently do not use it. If somebody wants to add support for that,
    you're welcome, but until then there's no point in building this.
    
    Change-Id: Ia714a6babdac1824e6cca3438794a0945e175c14
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91746
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in
index 0c843c128756..2f39dbd13c29 100644
--- a/config_host/config_skia.h.in
+++ b/config_host/config_skia.h.in
@@ -29,15 +29,13 @@ are the same.
 
 #define SK_SUPPORT_GPU 1
 
-#define SK_GL 1
-
 #define SK_VULKAN 1
 
 #define SK_CODEC_DECODES_PNG 1
 #define SK_ENCODE_PNG 1
 
+// These are just to avoid warnings (some headers use them even with GL disabled).
 #define SK_ASSUME_GL 1
-
 #define SK_ASSUME_GL_ES 0
 
 
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 576f8ede1997..747556f2b0e6 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_use_system_win32_libs,skia,\
     oleaut32 \
     user32 \
     usp10 \
-    opengl32 \
     gdi32 \
 ))
 else
@@ -60,7 +59,6 @@ ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,skia,\
     -lm \
     -ldl \
-    -lGL \
     -lX11-xcb \
     -lX11 \
 ))
@@ -530,36 +528,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/geometry/GrQuad \
     UnpackedTarball/skia/src/gpu/geometry/GrQuadUtils \
     UnpackedTarball/skia/src/gpu/geometry/GrShape \
-    UnpackedTarball/skia/src/gpu/gl/builders/GrGLProgramBuilder \
-    UnpackedTarball/skia/src/gpu/gl/builders/GrGLShaderStringBuilder \
-    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen \
-    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleGLInterfaceAutogen \
-    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleHelpers \
-    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleInterface \
-    UnpackedTarball/skia/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen \
-    UnpackedTarball/skia/src/gpu/gl/GrGLBuffer \
-    UnpackedTarball/skia/src/gpu/gl/GrGLCaps \
-    UnpackedTarball/skia/src/gpu/gl/GrGLContext \
-    UnpackedTarball/skia/src/gpu/gl/GrGLExtensions \
-    UnpackedTarball/skia/src/gpu/gl/GrGLGLSL \
-    UnpackedTarball/skia/src/gpu/gl/GrGLGpu \
-    UnpackedTarball/skia/src/gpu/gl/GrGLGpuProgramCache \
-    UnpackedTarball/skia/src/gpu/gl/GrGLInterfaceAutogen \
-    UnpackedTarball/skia/src/gpu/gl/GrGLPath \
-    UnpackedTarball/skia/src/gpu/gl/GrGLPathRendering \
-    UnpackedTarball/skia/src/gpu/gl/GrGLOpsRenderPass \
-    UnpackedTarball/skia/src/gpu/gl/GrGLProgram \
-    UnpackedTarball/skia/src/gpu/gl/GrGLProgramDataManager \
-    UnpackedTarball/skia/src/gpu/gl/GrGLRenderTarget \
-    UnpackedTarball/skia/src/gpu/gl/GrGLSemaphore \
-    UnpackedTarball/skia/src/gpu/gl/GrGLStencilAttachment \
-    UnpackedTarball/skia/src/gpu/gl/GrGLTexture \
-    UnpackedTarball/skia/src/gpu/gl/GrGLTextureRenderTarget \
-    UnpackedTarball/skia/src/gpu/gl/GrGLTypesPriv \
-    UnpackedTarball/skia/src/gpu/gl/GrGLUniformHandler \
-    UnpackedTarball/skia/src/gpu/gl/GrGLUtil \
-    UnpackedTarball/skia/src/gpu/gl/GrGLVaryingHandler \
-    UnpackedTarball/skia/src/gpu/gl/GrGLVertexArray \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLBlend \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSL \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLFragmentProcessor \
@@ -797,13 +765,11 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
 
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/tools/gpu/vk/VkTestUtils \
-    UnpackedTarball/skia/tools/sk_app/GLWindowContext \
     UnpackedTarball/skia/tools/sk_app/VulkanWindowContext \
 ))
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/gpu/gl/win/GrGLMakeNativeInterface_win \
     UnpackedTarball/skia/src/ports/SkDebug_win \
     UnpackedTarball/skia/src/ports/SkFontHost_win \
     UnpackedTarball/skia/src/fonts/SkFontMgr_indirect \
@@ -819,17 +785,14 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/utils/win/SkDWriteGeometrySink \
     UnpackedTarball/skia/src/utils/win/SkHRESULT \
     UnpackedTarball/skia/src/utils/win/SkIStream \
-    UnpackedTarball/skia/src/utils/win/SkWGL_win \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/tools/sk_app/win/GLWindowContext_win \
     UnpackedTarball/skia/tools/sk_app/win/RasterWindowContext_win \
     UnpackedTarball/skia/tools/sk_app/win/VulkanWindowContext_win \
 ))
 else
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/src/gpu/gl/glx/GrGLMakeNativeInterface_glx \
     UnpackedTarball/skia/src/ports/SkDebug_stdio \
     UnpackedTarball/skia/src/ports/SkFontConfigInterface \
     UnpackedTarball/skia/src/ports/SkFontConfigInterface_direct \
@@ -844,7 +807,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
-    UnpackedTarball/skia/tools/sk_app/unix/GLWindowContext_unix \
     UnpackedTarball/skia/tools/sk_app/unix/RasterWindowContext_unix \
     UnpackedTarball/skia/tools/sk_app/unix/VulkanWindowContext_unix \
 ))
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk
index 749a651adc28..99344871cb9d 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -31,6 +31,7 @@ skia_patches := \
     windows-text-gamma.patch.0 \
     windows-force-unicode-api.patch.0 \
     operator-eq-bool.patch.0 \
+    fix-without-gl.patch.0 \
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
 
diff --git a/external/skia/fix-without-gl.patch.0 b/external/skia/fix-without-gl.patch.0
new file mode 100644
index 000000000000..0729162b2aa0
--- /dev/null
+++ b/external/skia/fix-without-gl.patch.0
@@ -0,0 +1,47 @@
+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:
+ 
+     GrGLExtensions fExtensions;
+ 
++#ifdef SK_GL
+     bool hasExtension(const char ext[]) const { return fExtensions.has(ext); }
++#endif
+ 
+     /**
+      * 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
+@@ -45,10 +45,11 @@ public:
+     GrGLDriverVersion driverVersion() const { return fDriverVersion; }
+     const GrGLCaps* caps() const { return fGLCaps.get(); }
+     GrGLCaps* caps() { return fGLCaps.get(); }
++#ifdef SK_GL
+     bool hasExtension(const char* ext) const {
+         return fInterface->hasExtension(ext);
+     }
+-
++#endif
+     const GrGLExtensions& extensions() const { return fInterface->fExtensions; }
+ 
+ protected:
diff --git a/external/skia/inc/pch/precompiled_skia.hxx b/external/skia/inc/pch/precompiled_skia.hxx
index 09d809a950b7..8b82875fba89 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 2020-04-06 12:31:09 using:
+ Generated on 2020-04-06 12:59:34 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:
@@ -211,10 +211,6 @@
 #include <include/gpu/GrContextThreadSafeProxy.h>
 #include <include/gpu/GrDriverBugWorkarounds.h>
 #include <include/gpu/GrTypes.h>
-#include <include/gpu/gl/GrGLAssembleHelpers.h>
-#include <include/gpu/gl/GrGLAssembleInterface.h>
-#include <include/gpu/gl/GrGLExtensions.h>
-#include <include/gpu/gl/GrGLInterface.h>
 #include <include/gpu/mock/GrMockTypes.h>
 #include <include/gpu/vk/GrVkBackendContext.h>
 #include <include/gpu/vk/GrVkExtensions.h>
@@ -223,7 +219,6 @@
 #include <include/pathops/SkPathOps.h>
 #include <include/ports/SkRemotableFontMgr.h>
 #include <include/private/GrContext_Base.h>
-#include <include/private/GrGLTypesPriv.h>
 #include <include/private/GrImageContext.h>
 #include <include/private/GrRecordingContext.h>
 #include <include/private/GrResourceKey.h>
@@ -584,7 +579,6 @@
 #include <src/gpu/GrSurfaceProxyPriv.h>
 #include <src/gpu/GrSurfaceProxyView.h>
 #include <src/gpu/GrSwizzle.h>
-#include <src/gpu/GrTAllocator.h>
 #include <src/gpu/GrTestUtils.h>
 #include <src/gpu/GrTexture.h>
 #include <src/gpu/GrTextureAdjuster.h>
@@ -677,28 +671,9 @@
 #include <src/gpu/geometry/GrQuadUtils.h>
 #include <src/gpu/geometry/GrRect.h>
 #include <src/gpu/geometry/GrShape.h>
-#include <src/gpu/gl/GrGLBuffer.h>
-#include <src/gpu/gl/GrGLCaps.h>
-#include <src/gpu/gl/GrGLContext.h>
-#include <src/gpu/gl/GrGLDefines.h>
-#include <src/gpu/gl/GrGLGLSL.h>
 #include <src/gpu/gl/GrGLGpu.h>
-#include <src/gpu/gl/GrGLOpsRenderPass.h>
-#include <src/gpu/gl/GrGLPath.h>
-#include <src/gpu/gl/GrGLPathRendering.h>
-#include <src/gpu/gl/GrGLProgram.h>
-#include <src/gpu/gl/GrGLProgramDataManager.h>
-#include <src/gpu/gl/GrGLRenderTarget.h>
-#include <src/gpu/gl/GrGLSemaphore.h>
-#include <src/gpu/gl/GrGLStencilAttachment.h>
 #include <src/gpu/gl/GrGLTexture.h>
-#include <src/gpu/gl/GrGLTextureRenderTarget.h>
-#include <src/gpu/gl/GrGLUniformHandler.h>
 #include <src/gpu/gl/GrGLUtil.h>
-#include <src/gpu/gl/GrGLVaryingHandler.h>
-#include <src/gpu/gl/GrGLVertexArray.h>
-#include <src/gpu/gl/builders/GrGLProgramBuilder.h>
-#include <src/gpu/gl/builders/GrGLShaderStringBuilder.h>
 #include <src/gpu/glsl/GrGLSL.h>
 #include <src/gpu/glsl/GrGLSLBlend.h>
 #include <src/gpu/glsl/GrGLSLColorSpaceXformHelper.h>
@@ -925,7 +900,6 @@
 #include <src/sksl/ir/SkSLNullLiteral.h>
 #include <src/sksl/ir/SkSLPostfixExpression.h>
 #include <src/sksl/ir/SkSLPrefixExpression.h>
-#include <src/sksl/ir/SkSLProgram.h>
 #include <src/sksl/ir/SkSLReturnStatement.h>
 #include <src/sksl/ir/SkSLSection.h>
 #include <src/sksl/ir/SkSLSetting.h>
@@ -958,7 +932,6 @@
 #include <src/utils/SkUTF.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
commit 5d4cc08cf7ac7a79754133946568c92e0ff88017
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Apr 6 12:56:16 2020 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Apr 6 18:54:54 2020 +0200

    update Skia to chrome/m83
    
    Change-Id: I350cbdf753f3d6f61623e384c4446c9c6890f041
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91745
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/download.lst b/download.lst
index 26c47cff20f3..fce6e1195fd2 100644
--- a/download.lst
+++ b/download.lst
@@ -234,8 +234,8 @@ export RHINO_SHA256SUM := 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 export SERF_SHA256SUM := 6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
 export SERF_TARBALL := serf-1.2.1.tar.bz2
-export SKIA_SHA256SUM := 2a70d467815eb3eb60ded071309eef907c6a49ce8bd5ab4595910240c75b6e19
-export SKIA_TARBALL := skia-m82-7bb74c4299b8a85de1e5718fc45da569d6dab3fc.tar.xz
+export SKIA_SHA256SUM := d724dd60d4375359aa4751ea39950ad833592f01774914873f6d033f14e1c63f
+export SKIA_TARBALL := skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz
 export STAROFFICE_SHA256SUM := 6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4
 export STAROFFICE_VERSION_MICRO := 6
 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 62285ca09f8b..576f8ede1997 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -210,9 +210,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkMiniRecorder \
     UnpackedTarball/skia/src/core/SkMipMap \
     UnpackedTarball/skia/src/core/SkModeColorFilter \
-    UnpackedTarball/skia/src/core/SkNormalFlatSource \
-    UnpackedTarball/skia/src/core/SkNormalMapSource \
-    UnpackedTarball/skia/src/core/SkNormalSource \
     UnpackedTarball/skia/src/core/SkOpts \
     UnpackedTarball/skia/src/core/SkOverdrawCanvas \
     UnpackedTarball/skia/src/core/SkPaint \
@@ -403,8 +400,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/shaders/SkColorShader \
     UnpackedTarball/skia/src/shaders/SkComposeShader \
     UnpackedTarball/skia/src/shaders/SkImageShader \
-    UnpackedTarball/skia/src/shaders/SkLightingShader \
-    UnpackedTarball/skia/src/shaders/SkLights \
     UnpackedTarball/skia/src/shaders/SkLocalMatrixShader \
     UnpackedTarball/skia/src/shaders/SkPerlinNoiseShader \
     UnpackedTarball/skia/src/shaders/SkPictureShader \
@@ -499,7 +494,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/effects/generated/GrClampFragmentProcessor \
     UnpackedTarball/skia/src/gpu/effects/generated/GrColorMatrixFragmentProcessor \
     UnpackedTarball/skia/src/gpu/effects/generated/GrComposeLerpEffect \
-    UnpackedTarball/skia/src/gpu/effects/generated/GrComposeLerpRedEffect \
     UnpackedTarball/skia/src/gpu/effects/generated/GrConfigConversionEffect \
     UnpackedTarball/skia/src/gpu/effects/generated/GrConstColorProcessor \
     UnpackedTarball/skia/src/gpu/effects/generated/GrEllipseEffect \
@@ -528,7 +522,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/effects/GrRRectEffect \
     UnpackedTarball/skia/src/gpu/effects/GrShadowGeoProc \
     UnpackedTarball/skia/src/gpu/effects/GrSkSLFP \
-    UnpackedTarball/skia/src/gpu/effects/GrSRGBEffect \
     UnpackedTarball/skia/src/gpu/effects/GrTextureDomain \
     UnpackedTarball/skia/src/gpu/effects/GrTextureEffect \
     UnpackedTarball/skia/src/gpu/effects/GrXfermodeFragmentProcessor \
@@ -576,7 +569,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLProgramBuilder \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLProgramDataManager \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLShaderBuilder \
-    UnpackedTarball/skia/src/gpu/glsl/GrGLSLUtil \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLVarying \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder \
     UnpackedTarball/skia/src/gpu/glsl/GrGLSLXferProcessor \
@@ -598,6 +590,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/GrBackendSurface \
     UnpackedTarball/skia/src/gpu/GrBackendTextureImageGenerator \
     UnpackedTarball/skia/src/gpu/GrBitmapTextureMaker \
+    UnpackedTarball/skia/src/gpu/GrBlockAllocator \
     UnpackedTarball/skia/src/gpu/GrBlurUtils \
     UnpackedTarball/skia/src/gpu/GrBufferAllocPool \
     UnpackedTarball/skia/src/gpu/GrCaps \
@@ -671,8 +664,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/GrSurfaceProxy \
     UnpackedTarball/skia/src/gpu/GrSwizzle \
     UnpackedTarball/skia/src/gpu/GrSWMaskHelper \
-    UnpackedTarball/skia/src/gpu/GrTessellator \
     UnpackedTarball/skia/src/gpu/GrTestUtils \
+    UnpackedTarball/skia/src/gpu/GrTriangulator \
     UnpackedTarball/skia/src/gpu/GrTextureAdjuster \
     UnpackedTarball/skia/src/gpu/GrTexture \
     UnpackedTarball/skia/src/gpu/GrTextureMaker \
@@ -716,17 +709,17 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ops/GrStencilAndCoverPathRenderer \
     UnpackedTarball/skia/src/gpu/ops/GrStencilPathOp \
     UnpackedTarball/skia/src/gpu/ops/GrStrokeRectOp \
-    UnpackedTarball/skia/src/gpu/ops/GrTessellatingPathRenderer \
+    UnpackedTarball/skia/src/gpu/ops/GrTriangulatingPathRenderer \
     UnpackedTarball/skia/src/gpu/ops/GrTextureOp \
     UnpackedTarball/skia/src/gpu/SkGpuDevice \
     UnpackedTarball/skia/src/gpu/SkGpuDevice_drawTexture \
     UnpackedTarball/skia/src/gpu/SkGr \
     UnpackedTarball/skia/src/gpu/tessellate/GrDrawAtlasPathOp \
     UnpackedTarball/skia/src/gpu/tessellate/GrFillPathShader \
-    UnpackedTarball/skia/src/gpu/tessellate/GrGpuTessellationPathRenderer \
     UnpackedTarball/skia/src/gpu/tessellate/GrPathParser \
     UnpackedTarball/skia/src/gpu/tessellate/GrStencilPathShader \
     UnpackedTarball/skia/src/gpu/tessellate/GrTessellatePathOp \
+    UnpackedTarball/skia/src/gpu/tessellate/GrTessellationPathRenderer \
     UnpackedTarball/skia/src/gpu/text/GrAtlasManager \
     UnpackedTarball/skia/src/gpu/text/GrDistanceFieldAdjustTable \
     UnpackedTarball/skia/src/gpu/text/GrSDFMaskFilter \
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk
index 8e0df446af95..749a651adc28 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -20,8 +20,6 @@ skia_patches := \
     fix-alpha-difference-copy.patch.1 \
     libvulkan-name.patch.1 \
     share-grcontext.patch.1 \
-    c++20-comparison.patch.0 \
-    Wdeprecated-copy.patch.0 \
     Wdeprecated-copy-dtor.patch.0 \
     fix-msvc.patch.1 \
     fix-gcc-x86.patch.1	\
@@ -32,6 +30,7 @@ skia_patches := \
     windows-do-not-modify-logfont.patch.0 \
     windows-text-gamma.patch.0 \
     windows-force-unicode-api.patch.0 \
+    operator-eq-bool.patch.0 \
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
 
diff --git a/external/skia/Wdeprecated-copy.patch.0 b/external/skia/Wdeprecated-copy.patch.0
deleted file mode 100644
index 4e0682bcebd9..000000000000
--- a/external/skia/Wdeprecated-copy.patch.0
+++ /dev/null
@@ -1,24 +0,0 @@
---- include/core/SkSurfaceProps.h
-+++ include/core/SkSurfaceProps.h
-@@ -63,7 +63,6 @@
-     };
-     SkSurfaceProps(InitType);
-     SkSurfaceProps(uint32_t flags, InitType);
--    SkSurfaceProps(const SkSurfaceProps& other);
- 
-     uint32_t flags() const { return fFlags; }
-     SkPixelGeometry pixelGeometry() const { return fPixelGeometry; }
---- src/image/SkSurface.cpp
-+++ src/image/SkSurface.cpp
-@@ -52,11 +52,6 @@
-     : fFlags(flags), fPixelGeometry(pg)
- {}
- 
--SkSurfaceProps::SkSurfaceProps(const SkSurfaceProps& other)
--    : fFlags(other.fFlags)
--    , fPixelGeometry(other.fPixelGeometry)
--{}
--
- ///////////////////////////////////////////////////////////////////////////////
- 
- SkSurface_Base::SkSurface_Base(int width, int height, const SkSurfaceProps* props)
diff --git a/external/skia/c++20-comparison.patch.0 b/external/skia/c++20-comparison.patch.0
deleted file mode 100644
index 86f0d7ff16e0..000000000000
--- a/external/skia/c++20-comparison.patch.0
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/shaders/SkLights.h
-+++ src/shaders/SkLights.h
-@@ -80,14 +80,14 @@
-             return *this;
-         }
- 
--        bool operator==(const Light& other) {
-+        bool operator==(const Light& other) const {
-             return (fType      == other.fType) &&
-                    (fColor     == other.fColor) &&
-                    (fDirOrPos  == other.fDirOrPos) &&
-                    (fIntensity == other.fIntensity);
-         }
- 
--        bool operator!=(const Light& other) { return !(this->operator==(other)); }
-+        bool operator!=(const Light& other) const { return !(this->operator==(other)); }
- 
-     private:
-         friend class SkLights;
diff --git a/external/skia/fix-pch.patch.1 b/external/skia/fix-pch.patch.1
index 2cb4752a48d8..9c89edbfeb9f 100644
--- a/external/skia/fix-pch.patch.1
+++ b/external/skia/fix-pch.patch.1
@@ -99,7 +99,7 @@ diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
 index b8fd426e13..5e6f2a9b28 100755
 --- a/src/shaders/SkImageShader.cpp
 +++ b/src/shaders/SkImageShader.cpp
-@@ -781,6 +781,8 @@ bool SkImageShader::onProgram(skvm::Builder* p,
+@@ -808,6 +808,8 @@ skvm::Color SkImageShader::onProgram(skv
  
          // See GrCubicEffect for details of these weights.
          // TODO: these maybe don't seem right looking at gm/bicubic and GrBicubicEffect.
@@ -107,7 +107,7 @@ index b8fd426e13..5e6f2a9b28 100755
 +#undef far
          auto near = [&](skvm::F32 t) {
              // 1/18 + 9/18t + 27/18t^2 - 21/18t^3 == t ( t ( -21/18t + 27/18) + 9/18) + 1/18
-             return p->mad(t,
+             return t * (t * (t * (-21/18.0f) + 27/18.0f) + 9/18.0f) + 1/18.0f;
 diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
 index 191b6a3ce5..26754acccd 100644
 --- a/src/gpu/gl/GrGLGpu.cpp
diff --git a/external/skia/inc/pch/precompiled_skia.hxx b/external/skia/inc/pch/precompiled_skia.hxx
index d91a523f8a1d..09d809a950b7 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 2020-03-17 20:41:27 using:
+ Generated on 2020-04-06 12:31:09 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:
@@ -69,7 +69,7 @@
 #include <rtl/alloc.h>
 #include <sal/log.hxx>
 #endif // PCH_LEVEL >= 2
-// PCH_LEVEL >= 3
+#if PCH_LEVEL >= 3
 #include <include/c/sk_canvas.h>
 #include <include/c/sk_colorspace.h>
 #include <include/c/sk_data.h>
@@ -325,6 +325,7 @@
 #include <src/core/SkClipOpPriv.h>
 #include <src/core/SkClipStack.h>
 #include <src/core/SkClipStackDevice.h>
+#include <src/core/SkColorFilterPriv.h>
 #include <src/core/SkColorFilter_Matrix.h>
 #include <src/core/SkColorSpacePriv.h>
 #include <src/core/SkColorSpaceXformSteps.h>
@@ -387,9 +388,6 @@
 #include <src/core/SkMipMap.h>
 #include <src/core/SkModeColorFilter.h>
 #include <src/core/SkNextID.h>
-#include <src/core/SkNormalFlatSource.h>
-#include <src/core/SkNormalMapSource.h>
-#include <src/core/SkNormalSource.h>
 #include <src/core/SkOSFile.h>
 #include <src/core/SkOpts.h>
 #include <src/core/SkPaintDefaults.h>
@@ -464,7 +462,6 @@
 #include <src/core/SkTypeface_remote.h>
 #include <src/core/SkUtils.h>
 #include <src/core/SkVM.h>
-#include <src/core/SkVMBlitter.h>
 #include <src/core/SkValidationUtils.h>
 #include <src/core/SkVertState.h>
 #include <src/core/SkVerticesPriv.h>
@@ -484,7 +481,6 @@
 #include <src/effects/SkTrimPE.h>
 #include <src/gpu/GrAHardwareBufferImageGenerator.h>
 #include <src/gpu/GrAHardwareBufferUtils.h>
-#include <src/gpu/GrAllocator.h>
 #include <src/gpu/GrAppliedClip.h>
 #include <src/gpu/GrAuditTrail.h>
 #include <src/gpu/GrAutoLocaleSetter.h>
@@ -492,6 +488,7 @@
 #include <src/gpu/GrBaseContextPriv.h>
 #include <src/gpu/GrBitmapTextureMaker.h>
 #include <src/gpu/GrBlend.h>
+#include <src/gpu/GrBlockAllocator.h>
 #include <src/gpu/GrBlurUtils.h>
 #include <src/gpu/GrBuffer.h>
 #include <src/gpu/GrBufferAllocPool.h>
@@ -531,7 +528,6 @@
 #include <src/gpu/GrImageTextureMaker.h>
 #include <src/gpu/GrManagedResource.h>
 #include <src/gpu/GrMemoryPool.h>
-#include <src/gpu/GrMesh.h>
 #include <src/gpu/GrNativeRect.h>
 #include <src/gpu/GrOnFlushResourceProvider.h>
 #include <src/gpu/GrOpFlushState.h>
@@ -574,6 +570,7 @@
 #include <src/gpu/GrShaderCaps.h>
 #include <src/gpu/GrShaderUtils.h>
 #include <src/gpu/GrShaderVar.h>
+#include <src/gpu/GrSimpleMesh.h>
 #include <src/gpu/GrSoftwarePathRenderer.h>
 #include <src/gpu/GrStencilAttachment.h>
 #include <src/gpu/GrStencilClip.h>
@@ -587,7 +584,7 @@
 #include <src/gpu/GrSurfaceProxyPriv.h>
 #include <src/gpu/GrSurfaceProxyView.h>
 #include <src/gpu/GrSwizzle.h>
-#include <src/gpu/GrTessellator.h>
+#include <src/gpu/GrTAllocator.h>
 #include <src/gpu/GrTestUtils.h>
 #include <src/gpu/GrTexture.h>
 #include <src/gpu/GrTextureAdjuster.h>
@@ -601,6 +598,7 @@
 #include <src/gpu/GrTextureResolveRenderTask.h>
 #include <src/gpu/GrTracing.h>
 #include <src/gpu/GrTransferFromRenderTask.h>
+#include <src/gpu/GrTriangulator.h>
 #include <src/gpu/GrUserStencilSettings.h>
 #include <src/gpu/GrVertexWriter.h>
 #include <src/gpu/GrWaitRenderTask.h>
@@ -609,6 +607,7 @@
 #include <src/gpu/GrYUVProvider.h>
 #include <src/gpu/SkGpuDevice.h>
 #include <src/gpu/SkGr.h>
+#include <src/gpu/ccpr/GrAutoMapVertexBuffer.h>
 #include <src/gpu/ccpr/GrCCAtlas.h>
 #include <src/gpu/ccpr/GrCCClipPath.h>
 #include <src/gpu/ccpr/GrCCClipProcessor.h>
@@ -645,7 +644,6 @@
 #include <src/gpu/effects/GrOvalEffect.h>
 #include <src/gpu/effects/GrPorterDuffXferProcessor.h>
 #include <src/gpu/effects/GrRRectEffect.h>
-#include <src/gpu/effects/GrSRGBEffect.h>
 #include <src/gpu/effects/GrShadowGeoProc.h>
 #include <src/gpu/effects/GrSkSLFP.h>
 #include <src/gpu/effects/GrTextureDomain.h>
@@ -660,7 +658,6 @@
 #include <src/gpu/effects/generated/GrClampFragmentProcessor.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/GrDeviceSpaceEffect.h>
@@ -713,7 +710,6 @@
 #include <src/gpu/glsl/GrGLSLProgramDataManager.h>
 #include <src/gpu/glsl/GrGLSLShaderBuilder.h>
 #include <src/gpu/glsl/GrGLSLUniformHandler.h>
-#include <src/gpu/glsl/GrGLSLUtil.h>
 #include <src/gpu/glsl/GrGLSLVarying.h>
 #include <src/gpu/glsl/GrGLSLVertexGeoBuilder.h>
 #include <src/gpu/glsl/GrGLSLXferProcessor.h>
@@ -765,14 +761,14 @@
 #include <src/gpu/ops/GrStencilAndCoverPathRenderer.h>
 #include <src/gpu/ops/GrStencilPathOp.h>
 #include <src/gpu/ops/GrStrokeRectOp.h>
-#include <src/gpu/ops/GrTessellatingPathRenderer.h>
 #include <src/gpu/ops/GrTextureOp.h>
+#include <src/gpu/ops/GrTriangulatingPathRenderer.h>
 #include <src/gpu/tessellate/GrDrawAtlasPathOp.h>
 #include <src/gpu/tessellate/GrFillPathShader.h>
-#include <src/gpu/tessellate/GrGpuTessellationPathRenderer.h>
 #include <src/gpu/tessellate/GrPathParser.h>
 #include <src/gpu/tessellate/GrStencilPathShader.h>
 #include <src/gpu/tessellate/GrTessellatePathOp.h>
+#include <src/gpu/tessellate/GrTessellationPathRenderer.h>
 #include <src/gpu/text/GrAtlasManager.h>
 #include <src/gpu/text/GrDistanceFieldAdjustTable.h>
 #include <src/gpu/text/GrSDFMaskFilter.h>
@@ -863,8 +859,6 @@
 #include <src/shaders/SkComposeShader.h>
 #include <src/shaders/SkEmptyShader.h>
 #include <src/shaders/SkImageShader.h>
-#include <src/shaders/SkLightingShader.h>
-#include <src/shaders/SkLights.h>
 #include <src/shaders/SkLocalMatrixShader.h>
 #include <src/shaders/SkPictureShader.h>
 #include <src/shaders/SkShaderBase.h>
@@ -967,7 +961,8 @@
 #include <tools/sk_app/GLWindowContext.h>
 #include <tools/sk_app/VulkanWindowContext.h>
 #include <vulkan/vulkan_core.h>
-// PCH_LEVEL >= 4
-// PCH_LEVEL >= 5
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/external/skia/operator-eq-bool.patch.0 b/external/skia/operator-eq-bool.patch.0
new file mode 100644
index 000000000000..1c2c77beb96f
--- /dev/null
+++ b/external/skia/operator-eq-bool.patch.0
@@ -0,0 +1,21 @@
+--- ./src/core/SkVM.cpp.sav	2020-04-06 12:42:22.976205876 +0200
++++ ./src/core/SkVM.cpp	2020-04-06 12:50:57.465941063 +0200
+@@ -1162,7 +1162,7 @@ namespace skvm {
+         // Map min channel to 0, max channel to s, and scale the middle proportionally.
+         auto scale = [&](auto c) {
+             // TODO: better to divide and check for non-finite result?
+-            return select(sat == 0.0f, 0.0f
++            return select(eq_op(0.0f, sat), 0.0f
+                                      , ((c - mn) * s) / sat);
+         };
+         *r = scale(*r);
+--- ./src/core/SkVM.h.sav	2020-04-06 12:08:50.833128845 +0200
++++ ./src/core/SkVM.h	2020-04-06 12:51:13.369987701 +0200
+@@ -875,6 +875,7 @@ namespace skvm {
+ 
+     static inline I32 operator==(F32   x, F32a y) { return x->eq(x,y); }
+     static inline I32 operator==(float x, F32  y) { return y->eq(x,y); }
++    static inline I32 eq_op(float x, F32  y) { return y->eq(x,y); }
+ 
+     static inline I32 operator!=(F32   x, F32a y) { return x->neq(x,y); }
+     static inline I32 operator!=(float x, F32  y) { return y->neq(x,y); }
diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx
index 630b7a138844..a145e001850d 100644
--- a/vcl/inc/skia/gdiimpl.hxx
+++ b/vcl/inc/skia/gdiimpl.hxx
@@ -33,6 +33,7 @@
 
 class SkiaFlushIdle;
 class GenericSalLayout;
+class SkFont;
 
 class VCL_DLLPUBLIC SkiaSalGraphicsImpl : public SalGraphicsImpl
 {
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index ff2a2a588741..ed85cec00049 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -30,6 +30,8 @@ bool isVCLSkiaEnabled() { return false; }
 #include <skia/utils.hxx>
 #include <config_folders.h>
 
+#include <SkCanvas.h>
+#include <SkPaint.h>
 #include <SkSurface.h>
 
 #ifdef DBG_UTIL
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index c90185b3e4bf..50082d2fc51b 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -15,7 +15,9 @@
 #include <skia/zone.hxx>
 #include <win/winlayout.hxx>
 
+#include <SkCanvas.h>
 #include <SkColorFilter.h>
+#include <SkPaint.h>
 #include <SkPixelRef.h>
 #include <SkTypeface_win.h>
 #include <SkFont.h>
diff --git a/vcl/skia/win/winlayout.cxx b/vcl/skia/win/winlayout.cxx
index bf46f8727c87..da8a9f6cf2be 100644
--- a/vcl/skia/win/winlayout.cxx
+++ b/vcl/skia/win/winlayout.cxx
@@ -11,6 +11,9 @@
 
 #include <skia/win/gdiimpl.hxx>
 
+#include <SkCanvas.h>
+#include <SkPaint.h>
+
 bool SkiaGlobalWinGlyphCache::AllocateTexture(WinGlyphDrawElement& rElement, CompatibleDC* dc)
 {
     assert(rElement.maTexture.get() == nullptr);

More information about the Libreoffice-commits mailing list