update Skia to chrome/m81

Change-Id: I62ac293ac5fde3716b2db1421301f3a4aed0bcc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87763
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>

6 files changed, 65 insertions, 39 deletions

diff --git a/download.lst b/download.lst
index 18830d01861c..f1066cac4aad 100644
--- a/download.lst
+++ b/download.lst
@@ -231,8 +231,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 := f1b3be9d9468c20a84fa21aea44b19daa48bca8fd2c7f9ea6fe76d6e31f54530
-export SKIA_TARBALL := skia-m80-0af13b3caf0384981f50e073ebc7bd0f3f751711.tar.xz
+export SKIA_SHA256SUM := af190451976580081b0133a37ea6fa1434a8f3056f76d42ffb65ac8c79b223b7
+export SKIA_TARBALL := skia-m81-3e98c0e1d11516347ecc594959af2c1da4d04fc9.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 9a619a9d51dd..1325f8180c99 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -138,6 +138,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkColorFilter_Matrix \
     UnpackedTarball/skia/src/core/SkColorSpace \
     UnpackedTarball/skia/src/core/SkColorSpaceXformSteps \
+    UnpackedTarball/skia/src/core/SkCompressedDataUtils \
     UnpackedTarball/skia/src/core/SkContourMeasure \
     UnpackedTarball/skia/src/core/SkConvertPixels \
     UnpackedTarball/skia/src/core/SkCpu \
@@ -171,7 +172,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkFontLCDConfig \
     UnpackedTarball/skia/src/core/SkFontMgr \
     UnpackedTarball/skia/src/core/SkFontStream \
-    UnpackedTarball/skia/src/core/SkForceCPlusPlusLinking \
     UnpackedTarball/skia/src/core/SkGaussFilter \
     UnpackedTarball/skia/src/core/SkGeometry \
     UnpackedTarball/skia/src/core/SkGlobalInitialization_core \
@@ -201,6 +201,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkMatrix \
     UnpackedTarball/skia/src/core/SkMatrixImageFilter \
     UnpackedTarball/skia/src/core/SkMatrix44 \
+    UnpackedTarball/skia/src/core/SkM44 \
     UnpackedTarball/skia/src/core/SkMD5 \
     UnpackedTarball/skia/src/core/SkMiniRecorder \
     UnpackedTarball/skia/src/core/SkMipMap \
@@ -248,6 +249,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkResourceCache \
     UnpackedTarball/skia/src/core/SkRRect \
     UnpackedTarball/skia/src/core/SkRTree \
+    UnpackedTarball/skia/src/core/SkRuntimeEffect \
     UnpackedTarball/skia/src/core/SkRWBuffer \
     UnpackedTarball/skia/src/core/SkScalar \
     UnpackedTarball/skia/src/core/SkScalerContext \
@@ -434,7 +436,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/sksl/ir/SkSLType \
     UnpackedTarball/skia/src/sksl/ir/SkSLVariableReference \
     UnpackedTarball/skia/src/sksl/SkSLASTNode \
-    UnpackedTarball/skia/src/sksl/SkSLByteCode \
     UnpackedTarball/skia/src/sksl/SkSLByteCodeGenerator \
     UnpackedTarball/skia/src/sksl/SkSLCFGGenerator \
     UnpackedTarball/skia/src/sksl/SkSLCompiler \
@@ -461,6 +462,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/utils/SkFloatToDecimal \
     UnpackedTarball/skia/src/utils/SkFrontBufferedStream \
     UnpackedTarball/skia/src/utils/SkCharToGlyphCache \
+    UnpackedTarball/skia/src/utils/SkClipStackUtils \
     UnpackedTarball/skia/src/utils/SkInterpolator \
     UnpackedTarball/skia/src/utils/SkJSON \
     UnpackedTarball/skia/src/utils/SkJSONWriter \
@@ -516,6 +518,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor \
     UnpackedTarball/skia/src/gpu/effects/generated/GrCircleBlurFragmentProcessor \
     UnpackedTarball/skia/src/gpu/effects/generated/GrCircleEffect \
+    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 \
@@ -531,8 +534,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/effects/generated/GrRectBlurEffect \
     UnpackedTarball/skia/src/gpu/effects/generated/GrRGBToHSLFilterEffect \
     UnpackedTarball/skia/src/gpu/effects/generated/GrRRectBlurEffect \
-    UnpackedTarball/skia/src/gpu/effects/generated/GrSaturateProcessor \
-    UnpackedTarball/skia/src/gpu/effects/generated/GrSimpleTextureEffect \
     UnpackedTarball/skia/src/gpu/effects/GrBezierEffect \
     UnpackedTarball/skia/src/gpu/effects/GrBicubicEffect \
     UnpackedTarball/skia/src/gpu/effects/GrBitmapTextGeoProc \
@@ -550,6 +551,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     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 \
     UnpackedTarball/skia/src/gpu/effects/GrYUVtoRGBEffect \
     UnpackedTarball/skia/src/gpu/geometry/GrPathUtils \
@@ -666,8 +668,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/GrProgramInfo \
     UnpackedTarball/skia/src/gpu/GrProxyProvider \
     UnpackedTarball/skia/src/gpu/GrRecordingContext \
-    UnpackedTarball/skia/src/gpu/GrRectanizer_pow2 \
-    UnpackedTarball/skia/src/gpu/GrRectanizer_skyline \
+    UnpackedTarball/skia/src/gpu/GrRectanizerSkyline \
     UnpackedTarball/skia/src/gpu/GrRenderTask \
     UnpackedTarball/skia/src/gpu/GrReducedClip \
     UnpackedTarball/skia/src/gpu/GrRenderTargetContext \
@@ -692,7 +693,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/GrTessellator \
     UnpackedTarball/skia/src/gpu/GrTestUtils \
     UnpackedTarball/skia/src/gpu/GrTextureAdjuster \
-    UnpackedTarball/skia/src/gpu/GrTextureContext \
     UnpackedTarball/skia/src/gpu/GrTexture \
     UnpackedTarball/skia/src/gpu/GrTextureMaker \
     UnpackedTarball/skia/src/gpu/GrTextureProducer \
@@ -715,7 +715,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/ops/GrClearStencilClipOp \
     UnpackedTarball/skia/src/gpu/ops/GrDashLinePathRenderer \
     UnpackedTarball/skia/src/gpu/ops/GrDashOp \
-    UnpackedTarball/skia/src/gpu/ops/GrDebugMarkerOp \
     UnpackedTarball/skia/src/gpu/ops/GrDefaultPathRenderer \
     UnpackedTarball/skia/src/gpu/ops/GrDrawableOp \
     UnpackedTarball/skia/src/gpu/ops/GrDrawAtlasOp \
@@ -740,13 +739,17 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/gpu/SkGpuDevice \
     UnpackedTarball/skia/src/gpu/SkGpuDevice_drawTexture \
     UnpackedTarball/skia/src/gpu/SkGr \
+    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/text/GrAtlasManager \
     UnpackedTarball/skia/src/gpu/text/GrDistanceFieldAdjustTable \
     UnpackedTarball/skia/src/gpu/text/GrSDFMaskFilter \
     UnpackedTarball/skia/src/gpu/text/GrStrikeCache \
     UnpackedTarball/skia/src/gpu/text/GrTextBlobCache \
     UnpackedTarball/skia/src/gpu/text/GrTextBlob \
-    UnpackedTarball/skia/src/gpu/text/GrTextBlobVertexRegenerator \
     UnpackedTarball/skia/src/gpu/text/GrTextContext \
     UnpackedTarball/skia/src/image/SkImage_GpuBase \
     UnpackedTarball/skia/src/image/SkImage_Gpu \
diff --git a/external/skia/README b/external/skia/README
index 79cb3334a12a..ccd1be1519a9 100644
--- a/external/skia/README
+++ b/external/skia/README
@@ -11,14 +11,14 @@ cd skia
 git checkout chrome/mXX
 id=$(git rev-parse chrome/mXX)
 git clean -idx
-rm -rf .git gitignore
+rm -rf .git gitignore infra modules/canvaskit resources site
 cd ..
 tar cvJf skia-mXX-$id.tar.xz skia
 
 (where XX refers to the branch version)
 
-And review differences for BUILD.gn and relevant files in gn/
-(git diff chrome/mYY..chrome/mXX ./file).
+And review differences for BUILD.gn and relevant files in gn/ :
+git diff chrome/mYY..chrome/mXX ./BUILD.gn ./gn
 
 
 GrContext sharing
diff --git a/external/skia/fix-msvc.patch.1 b/external/skia/fix-msvc.patch.1
index 807d0adfcfb2..ffbf19883988 100644
--- a/external/skia/fix-msvc.patch.1
+++ b/external/skia/fix-msvc.patch.1
@@ -2,15 +2,6 @@ diff --git a/src/gpu/GrFragmentProcessor.h b/src/gpu/GrFragmentProcessor.h
 index 03d22aeaae..0f91f6f73c 100644
 --- a/src/gpu/GrFragmentProcessor.h
 +++ b/src/gpu/GrFragmentProcessor.h
-@@ -531,7 +531,7 @@ public:
-     bool operator!=(const EndIter&) { return (bool)*this; }
- 
-     // Because each iterator carries a stack we want to avoid copies.
--    IterBase(const IterBase&) = delete;
-+    IterBase(const IterBase&) = default;
-     IterBase& operator=(const IterBase&) = delete;
- 
- protected:
 @@ -603,7 +603,7 @@ public:
      operator bool() const { return fFPIter; }
      bool operator!=(const FPItemEndIter&) { return (bool)*this; }
diff --git a/external/skia/fix-pch.patch.1 b/external/skia/fix-pch.patch.1
index d884c151a869..11292572c555 100644
--- a/external/skia/fix-pch.patch.1
+++ b/external/skia/fix-pch.patch.1
@@ -96,3 +96,29 @@ index cc5738d977..c67310f6cc 100644
  
  #if defined(__clang__)
      template <int N, typename T> using Vec = T __attribute__((ext_vector_type(N)));
+diff --git a/src/core/SkM44.cpp b/src/core/SkM44.cpp
+index 2c82a0abd7..8505253d12 100644
+--- a/src/core/SkM44.cpp
++++ b/src/core/SkM44.cpp
+@@ -300,6 +300,8 @@ SkM44 Sk3LookAt(const SkV3& eye, const SkV3& center, const SkV3& up) {
+     return m;
+ }
+ 
++#undef near
++#undef far
+ SkM44 Sk3Perspective(float near, float far, float angle) {
+     SkASSERT(far > near);
+ 
+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,
+ 
+         // See GrCubicEffect for details of these weights.
+         // TODO: these maybe don't seem right looking at gm/bicubic and GrBicubicEffect.
++#undef near
++#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,
diff --git a/external/skia/inc/pch/precompiled_skia.hxx b/external/skia/inc/pch/precompiled_skia.hxx
index 8a0b7f0a6014..c39f4fb6ae2a 100644
--- a/external/skia/inc/pch/precompiled_skia.hxx
+++ b/external/skia/inc/pch/precompiled_skia.hxx
@@ -13,11 +13,11 @@
  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-12-06 12:13:34 using:
+ Generated on 2020-01-31 10:35:49 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:
- ./bin/update_pch_bisect ./external/skia/inc/pch/precompiled_skia.hxx "make external/skia.build" --find-conflicts
+ ./bin/update_pch_bisect /home/seli/build/src/l2/external/skia/inc/pch/precompiled_skia.hxx "make external/skia.build" --find-conflicts
 */
 
 #if PCH_LEVEL >= 1
@@ -70,7 +70,7 @@
 #include <rtl/alloc.h>
 #include <sal/log.hxx>
 #endif // PCH_LEVEL >= 2
-#if PCH_LEVEL >= 3
+// PCH_LEVEL >= 3
 #include <include/c/sk_canvas.h>
 #include <include/c/sk_colorspace.h>
 #include <include/c/sk_data.h>
@@ -195,6 +195,7 @@
 #include <include/effects/SkPaintImageFilter.h>
 #include <include/effects/SkPerlinNoiseShader.h>
 #include <include/effects/SkPictureImageFilter.h>
+#include <include/effects/SkRuntimeEffect.h>
 #include <include/effects/SkShaderMaskFilter.h>
 #include <include/effects/SkTableColorFilter.h>
 #include <include/effects/SkTableMaskFilter.h>
@@ -245,6 +246,7 @@
 #include <include/private/SkFloatingPoint.h>
 #include <include/private/SkHalf.h>
 #include <include/private/SkImageInfoPriv.h>
+#include <include/private/SkM44.h>
 #include <include/private/SkMacros.h>
 #include <include/private/SkMalloc.h>
 #include <include/private/SkMutex.h>
@@ -330,14 +332,15 @@
 #include <src/core/SkBlurPriv.h>
 #include <src/core/SkBuffer.h>
 #include <src/core/SkCachedData.h>
+#include <src/core/SkCanvasMatrix.h>
 #include <src/core/SkCanvasPriv.h>
 #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>
+#include <src/core/SkCompressedDataUtils.h>
 #include <src/core/SkConvertPixels.h>
 #include <src/core/SkCoreBlitters.h>
 #include <src/core/SkCoverageModePriv.h>
@@ -382,7 +385,6 @@
 #include <src/core/SkLocalMatrixImageFilter.h>
 #include <src/core/SkMD5.h>
 #include <src/core/SkMSAN.h>
-#include <src/core/SkMakeUnique.h>
 #include <src/core/SkMask.h>
 #include <src/core/SkMaskBlurFilter.h>
 #include <src/core/SkMaskCache.h>
@@ -524,6 +526,8 @@
 #include <src/gpu/GrDrawOpAtlas.h>
 #include <src/gpu/GrDrawOpTest.h>
 #include <src/gpu/GrDrawingManager.h>
+#include <src/gpu/GrEagerVertexAllocator.h>
+#include <src/gpu/GrFPArgs.h>
 #include <src/gpu/GrFixedClip.h>
 #include <src/gpu/GrFragmentProcessor.h>
 #include <src/gpu/GrGeometryProcessor.h>
@@ -559,9 +563,7 @@
 #include <src/gpu/GrProgramInfo.h>
 #include <src/gpu/GrProxyProvider.h>
 #include <src/gpu/GrRecordingContextPriv.h>
-#include <src/gpu/GrRectanizer.h>
-#include <src/gpu/GrRectanizer_pow2.h>
-#include <src/gpu/GrRectanizer_skyline.h>
+#include <src/gpu/GrRectanizerSkyline.h>
 #include <src/gpu/GrReducedClip.h>
 #include <src/gpu/GrRenderTarget.h>
 #include <src/gpu/GrRenderTargetContext.h>
@@ -581,7 +583,6 @@
 #include <src/gpu/GrShaderCaps.h>
 #include <src/gpu/GrShaderUtils.h>
 #include <src/gpu/GrShaderVar.h>
-#include <src/gpu/GrSkSLFPFactoryCache.h>
 #include <src/gpu/GrSoftwarePathRenderer.h>
 #include <src/gpu/GrStencilAttachment.h>
 #include <src/gpu/GrStencilClip.h>
@@ -592,11 +593,11 @@
 #include <src/gpu/GrSurfacePriv.h>
 #include <src/gpu/GrSurfaceProxy.h>
 #include <src/gpu/GrSurfaceProxyPriv.h>
+#include <src/gpu/GrSurfaceProxyView.h>
 #include <src/gpu/GrSwizzle.h>
 #include <src/gpu/GrTessellator.h>
 #include <src/gpu/GrTestUtils.h>
 #include <src/gpu/GrTextureAdjuster.h>
-#include <src/gpu/GrTextureContext.h>
 #include <src/gpu/GrTextureMaker.h>
 #include <src/gpu/GrTexturePriv.h>
 #include <src/gpu/GrTextureProducer.h>
@@ -655,6 +656,7 @@
 #include <src/gpu/effects/GrShadowGeoProc.h>
 #include <src/gpu/effects/GrSkSLFP.h>
 #include <src/gpu/effects/GrTextureDomain.h>
+#include <src/gpu/effects/GrTextureEffect.h>
 #include <src/gpu/effects/GrXfermodeFragmentProcessor.h>
 #include <src/gpu/effects/GrYUVtoRGBEffect.h>
 #include <src/gpu/effects/generated/GrAARectEffect.h>
@@ -662,6 +664,7 @@
 #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/GrClampFragmentProcessor.h>
 #include <src/gpu/effects/generated/GrColorMatrixFragmentProcessor.h>
 #include <src/gpu/effects/generated/GrComposeLerpEffect.h>
 #include <src/gpu/effects/generated/GrComposeLerpRedEffect.h>
@@ -677,8 +680,6 @@
 #include <src/gpu/effects/generated/GrRGBToHSLFilterEffect.h>
 #include <src/gpu/effects/generated/GrRRectBlurEffect.h>
 #include <src/gpu/effects/generated/GrRectBlurEffect.h>
-#include <src/gpu/effects/generated/GrSaturateProcessor.h>
-#include <src/gpu/effects/generated/GrSimpleTextureEffect.h>
 #include <src/gpu/geometry/GrPathUtils.h>
 #include <src/gpu/geometry/GrQuad.h>
 #include <src/gpu/geometry/GrQuadBuffer.h>
@@ -749,7 +750,6 @@
 #include <src/gpu/ops/GrClearStencilClipOp.h>
 #include <src/gpu/ops/GrDashLinePathRenderer.h>
 #include <src/gpu/ops/GrDashOp.h>
-#include <src/gpu/ops/GrDebugMarkerOp.h>
 #include <src/gpu/ops/GrDefaultPathRenderer.h>
 #include <src/gpu/ops/GrDrawAtlasOp.h>
 #include <src/gpu/ops/GrDrawOp.h>
@@ -772,6 +772,11 @@
 #include <src/gpu/ops/GrStrokeRectOp.h>
 #include <src/gpu/ops/GrTessellatingPathRenderer.h>
 #include <src/gpu/ops/GrTextureOp.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/text/GrAtlasManager.h>
 #include <src/gpu/text/GrDistanceFieldAdjustTable.h>
 #include <src/gpu/text/GrSDFMaskFilter.h>
@@ -913,6 +918,7 @@
 #include <src/sksl/SkSLGLSLCodeGenerator.h>
 #include <src/sksl/SkSLHCodeGenerator.h>
 #include <src/sksl/SkSLIRGenerator.h>
+#include <src/sksl/SkSLInterpreter.h>
 #include <src/sksl/SkSLLexer.h>
 #include <src/sksl/SkSLMetalCodeGenerator.h>
 #include <src/sksl/SkSLOutputStream.h>
@@ -973,6 +979,7 @@
 #include <src/sksl/ir/SkSLWhileStatement.h>
 #include <src/utils/SkCanvasStack.h>
 #include <src/utils/SkCharToGlyphCache.h>
+#include <src/utils/SkClipStackUtils.h>
 #include <src/utils/SkDashPathPriv.h>
 #include <src/utils/SkFloatToDecimal.h>
 #include <src/utils/SkJSON.h>
@@ -991,8 +998,7 @@
 #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
-#endif // PCH_LEVEL >= 4
+// PCH_LEVEL >= 4
+// PCH_LEVEL >= 5
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */