summaryrefslogtreecommitdiff
path: root/external/skia
diff options
context:
space:
mode:
Diffstat (limited to 'external/skia')
-rw-r--r--external/skia/Library_skia.mk22
-rw-r--r--external/skia/UnpackedTarball_skia.mk2
-rw-r--r--external/skia/fix-pch.patch.120
-rw-r--r--external/skia/fix-warnings.patch.128
-rw-r--r--external/skia/fontconfig-get-typeface.patch.050
-rw-r--r--external/skia/inc/pch/precompiled_skia.hxx43
-rw-r--r--external/skia/lerp.patch12
7 files changed, 61 insertions, 116 deletions
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 8c805fd787dd..87ae0c64552f 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkBBHFactory \
UnpackedTarball/skia/src/core/SkBigPicture \
UnpackedTarball/skia/src/core/SkBitmapCache \
+ UnpackedTarball/skia/src/core/SkBitmapController \
UnpackedTarball/skia/src/core/SkBitmap \
UnpackedTarball/skia/src/core/SkBitmapDevice \
UnpackedTarball/skia/src/core/SkBitmapProcState \
@@ -229,10 +230,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkMD5 \
UnpackedTarball/skia/src/core/SkMiniRecorder \
UnpackedTarball/skia/src/core/SkMipmap \
- UnpackedTarball/skia/src/core/SkMipmapAccessor \
UnpackedTarball/skia/src/core/SkModeColorFilter \
UnpackedTarball/skia/src/core/SkOpts \
- UnpackedTarball/skia/src/core/SkOpts_erms \
UnpackedTarball/skia/src/core/SkOverdrawCanvas \
UnpackedTarball/skia/src/core/SkPaint \
UnpackedTarball/skia/src/core/SkPaintPriv \
@@ -274,6 +273,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
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/SkScalerCache \
UnpackedTarball/skia/src/core/SkScalerContext \
@@ -323,6 +323,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkXfermodeInterpretation \
UnpackedTarball/skia/src/core/SkYUVAInfo \
UnpackedTarball/skia/src/core/SkYUVAPixmaps \
+ UnpackedTarball/skia/src/core/SkYUVASizeInfo \
UnpackedTarball/skia/src/core/SkYUVMath \
UnpackedTarball/skia/src/core/SkYUVPlanesCache \
UnpackedTarball/skia/src/c/sk_effects \
@@ -428,11 +429,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/shaders/SkPerlinNoiseShader \
UnpackedTarball/skia/src/shaders/SkPictureShader \
UnpackedTarball/skia/src/shaders/SkShader \
- UnpackedTarball/skia/src/sksl/dsl/DSLCore \
- UnpackedTarball/skia/src/sksl/dsl/DSLExpression \
- UnpackedTarball/skia/src/sksl/dsl/DSLType \
- UnpackedTarball/skia/src/sksl/dsl/DSLVar \
- UnpackedTarball/skia/src/sksl/dsl/priv/DSLWriter \
UnpackedTarball/skia/src/sksl/ir/SkSLConstructor \
UnpackedTarball/skia/src/sksl/ir/SkSLPrefixExpression \
UnpackedTarball/skia/src/sksl/ir/SkSLSetting \
@@ -445,8 +441,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/sksl/SkSLByteCodeGenerator \
UnpackedTarball/skia/src/sksl/SkSLCFGGenerator \
UnpackedTarball/skia/src/sksl/SkSLCompiler \
- UnpackedTarball/skia/src/sksl/SkSLConstantFolder \
- UnpackedTarball/skia/src/sksl/SkSLContext \
UnpackedTarball/skia/src/sksl/SkSLCPPCodeGenerator \
UnpackedTarball/skia/src/sksl/SkSLCPPUniformCTypes \
UnpackedTarball/skia/src/sksl/SkSLDehydrator \
@@ -455,7 +449,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/sksl/SkSLIRGenerator \
UnpackedTarball/skia/src/sksl/SkSLInliner \
UnpackedTarball/skia/src/sksl/SkSLLexer \
- UnpackedTarball/skia/src/sksl/SkSLMangler \
UnpackedTarball/skia/src/sksl/SkSLMetalCodeGenerator \
UnpackedTarball/skia/src/sksl/SkSLOutputStream \
UnpackedTarball/skia/src/sksl/SkSLParser \
@@ -468,7 +461,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/sksl/SkSLSectionAndParameterHelper \
UnpackedTarball/skia/src/sksl/SkSLString \
UnpackedTarball/skia/src/sksl/SkSLUtil \
- UnpackedTarball/skia/src/sksl/SkSLVMGenerator \
UnpackedTarball/skia/src/utils/SkBase64 \
UnpackedTarball/skia/src/utils/SkCamera \
UnpackedTarball/skia/src/utils/SkCanvasStack \
@@ -598,7 +590,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/gradients/generated/GrUnrolledBinaryGradientColorizer \
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 \
@@ -623,7 +614,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrCopyRenderTask \
UnpackedTarball/skia/src/gpu/GrDataUtils \
UnpackedTarball/skia/src/gpu/GrDDLContext \
- UnpackedTarball/skia/src/gpu/GrDDLTask \
UnpackedTarball/skia/src/gpu/GrDefaultGeoProcFactory \
UnpackedTarball/skia/src/gpu/GrDirectContext \
UnpackedTarball/skia/src/gpu/GrDirectContextPriv \
@@ -668,6 +658,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrRectanizerSkyline \
UnpackedTarball/skia/src/gpu/GrRenderTask \
UnpackedTarball/skia/src/gpu/GrReducedClip \
+ UnpackedTarball/skia/src/gpu/GrRenderTargetContext \
UnpackedTarball/skia/src/gpu/GrRenderTarget \
UnpackedTarball/skia/src/gpu/GrRenderTargetProxy \
UnpackedTarball/skia/src/gpu/GrResourceAllocator \
@@ -686,8 +677,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrStencilSettings \
UnpackedTarball/skia/src/gpu/GrStyle \
UnpackedTarball/skia/src/gpu/GrSurfaceContext \
- UnpackedTarball/skia/src/gpu/GrSurfaceDrawContext \
- UnpackedTarball/skia/src/gpu/GrSurfaceFillContext \
UnpackedTarball/skia/src/gpu/GrSurface \
UnpackedTarball/skia/src/gpu/GrSurfaceProxy \
UnpackedTarball/skia/src/gpu/GrSwizzle \
@@ -708,7 +697,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/GrWaitRenderTask \
UnpackedTarball/skia/src/gpu/GrXferProcessor \
UnpackedTarball/skia/src/gpu/GrYUVABackendTextures \
- UnpackedTarball/skia/src/gpu/GrYUVATextureProxies \
UnpackedTarball/skia/src/gpu/mock/GrMockCaps \
UnpackedTarball/skia/src/gpu/mock/GrMockGpu \
UnpackedTarball/skia/src/gpu/mock/GrMockTypes \
@@ -751,7 +739,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/tessellate/GrFillPathShader \
UnpackedTarball/skia/src/gpu/tessellate/GrPathTessellateOp \
UnpackedTarball/skia/src/gpu/tessellate/GrStencilPathShader \
- UnpackedTarball/skia/src/gpu/tessellate/GrStrokeIndirectOp \
UnpackedTarball/skia/src/gpu/tessellate/GrStrokeOp \
UnpackedTarball/skia/src/gpu/tessellate/GrStrokeTessellateOp \
UnpackedTarball/skia/src/gpu/tessellate/GrStrokeTessellateShader \
@@ -782,7 +769,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/gpu/vk/GrVkImage \
UnpackedTarball/skia/src/gpu/vk/GrVkImageView \
UnpackedTarball/skia/src/gpu/vk/GrVkInterface \
- UnpackedTarball/skia/src/gpu/vk/GrVkMSAALoadManager \
UnpackedTarball/skia/src/gpu/vk/GrVkMemory \
UnpackedTarball/skia/src/gpu/vk/GrVkMeshBuffer \
UnpackedTarball/skia/src/gpu/vk/GrVkOpsRenderPass \
diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk
index e1ea21b3cd35..0da268a17406 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,skia,$(SKIA_TARBALL)))
# * c++20.patch.0 has been reported upstream at
# <https://groups.google.com/forum/#!topic/skia-discuss/pYZQq_sLnv8> "C++20 operator== issue":
skia_patches := \
+ lerp.patch \
fix-pch.patch.1 \
fix-ddi.patch \
make-api-visible.patch.1 \
@@ -38,7 +39,6 @@ skia_patches := \
ubsan.patch.0 \
fast-png-write.patch.1 \
skia_sk_cpu_sse_level_0_by_default.patch.1 \
- fix-warnings.patch.1 \
$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
diff --git a/external/skia/fix-pch.patch.1 b/external/skia/fix-pch.patch.1
index 14199fc2feb2..8fb6ea870c10 100644
--- a/external/skia/fix-pch.patch.1
+++ b/external/skia/fix-pch.patch.1
@@ -1,8 +1,8 @@
diff --git a/include/core/SkColor.h b/include/core/SkColor.h
-index 9cba771ddd..6d324b75d0 100644
+index 36527e38e5..ef9065ce75 100644
--- a/include/core/SkColor.h
+++ b/include/core/SkColor.h
-@@ -420,6 +420,7 @@ using SkColor4f = SkRGBA4f<kUnpremul_SkAlphaType>;
+@@ -414,6 +414,7 @@ using SkColor4f = SkRGBA4f<kUnpremul_SkAlphaType>;
template <> SK_API SkColor4f SkColor4f::FromColor(SkColor);
template <> SK_API SkColor SkColor4f::toSkColor() const;
@@ -35,10 +35,10 @@ index 248917423f..3d0bc00307 100644
SkASSERT(far > near);
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
-index 76f69754c6..01ce4a1e2d 100644
+index 628e135348..5173a54575 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
-@@ -3531,6 +3531,8 @@ void GrGLGpu::xferBarrier(GrRenderTarget* rt, GrXferBarrierType type) {
+@@ -3561,6 +3561,8 @@ void GrGLGpu::xferBarrier(GrRenderTarget* rt, GrXferBarrierType type) {
}
}
@@ -48,10 +48,10 @@ index 76f69754c6..01ce4a1e2d 100644
SkASSERT(this->caps()->requiresManualFBBarrierAfterTessellatedStencilDraw());
GL_CALL(MemoryBarrier(GR_GL_FRAMEBUFFER_BARRIER_BIT));
diff --git a/src/gpu/text/GrTextBlobCache.h b/src/gpu/text/GrTextBlobCache.h
-index c973384081..8943198ddd 100644
+index 1e6dd9e02b..d917b0e0be 100644
--- a/src/gpu/text/GrTextBlobCache.h
+++ b/src/gpu/text/GrTextBlobCache.h
-@@ -91,4 +91,6 @@ private:
+@@ -93,4 +93,6 @@ private:
SkMessageBus<PurgeBlobMessage>::Inbox fPurgeBlobInbox SK_GUARDED_BY(fSpinLock);
};
@@ -84,7 +84,7 @@ index af4909aaaf..825ec35c83 100644
#include <d2d1.h>
diff --git a/third_party/skcms/skcms.cc b/third_party/skcms/skcms.cc
-index 4f983439b9..f6fc53c91a 100644
+index 3b7806081c..a76eb0a451 100644
--- a/third_party/skcms/skcms.cc
+++ b/third_party/skcms/skcms.cc
@@ -130,7 +130,8 @@ static float minus_1_ulp(float x) {
@@ -95,9 +95,9 @@ index 4f983439b9..f6fc53c91a 100644
+enum TFKind_skcms { Bad, sRGBish, PQish, HLGish, HLGinvish };
+#define TFKind TFKind_skcms
struct TF_PQish { float A,B,C,D,E,F; };
- struct TF_HLGish { float R,G,a,b,c,K_minus_1; };
- // We didn't originally support a scale factor K for HLG, and instead just stored 0 in
-@@ -2059,7 +2060,9 @@ typedef enum {
+ struct TF_HLGish { float R,G,a,b,c; };
+
+@@ -2047,7 +2048,9 @@ typedef enum {
Op_store_hhhh,
Op_store_fff,
Op_store_ffff,
diff --git a/external/skia/fix-warnings.patch.1 b/external/skia/fix-warnings.patch.1
deleted file mode 100644
index fc9418739810..000000000000
--- a/external/skia/fix-warnings.patch.1
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/include/core/SkFontParameters.h b/include/core/SkFontParameters.h
-index ae4f1d68b6..71263da7c5 100644
---- a/include/core/SkFontParameters.h
-+++ b/include/core/SkFontParameters.h
-@@ -16,8 +16,8 @@ struct SkFontParameters {
- // Parameters in a variation font axis.
- struct Axis {
- constexpr Axis() : tag(0), min(0), def(0), max(0), flags(0) {}
-- constexpr Axis(SkFourByteTag tag, float min, float def, float max, bool hidden) :
-- tag(tag), min(min), def(def), max(max), flags(hidden ? HIDDEN : 0) {}
-+ constexpr Axis(SkFourByteTag _tag, float _min, float _def, float _max, bool hidden) :
-+ tag(_tag), min(_min), def(_def), max(_max), flags(hidden ? HIDDEN : 0) {}
-
- // Four character identifier of the font axis (weight, width, slant, italic...).
- SkFourByteTag tag;
-diff --git a/tools/sk_app/WindowContext.h b/tools/sk_app/WindowContext.h
-index f143dab013..be3cde0f4f 100644
---- a/tools/sk_app/WindowContext.h
-+++ b/tools/sk_app/WindowContext.h
-@@ -31,7 +31,7 @@ public:
-
- virtual void resize(int w, int h) = 0;
-
-- virtual void activate(bool isActive) {}
-+ virtual void activate(bool /*isActive*/) {}
-
- const DisplayParams& getDisplayParams() { return fDisplayParams; }
- virtual void setDisplayParams(const DisplayParams& params) = 0;
diff --git a/external/skia/fontconfig-get-typeface.patch.0 b/external/skia/fontconfig-get-typeface.patch.0
index 20c3f5b9cbe0..a7a82bfa07f4 100644
--- a/external/skia/fontconfig-get-typeface.patch.0
+++ b/external/skia/fontconfig-get-typeface.patch.0
@@ -1,40 +1,32 @@
-diff --git a/include/ports/SkFontMgr_fontconfig.h b/include/ports/SkFontMgr_fontconfig.h
-index 4b2bb2d297..2b82cbfedd 100644
---- include/ports/SkFontMgr_fontconfig.h
-+++ include/ports/SkFontMgr_fontconfig.h
-@@ -19,4 +19,9 @@ class SkFontMgr;
- */
- SK_API sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc);
-
-+struct _FcPattern;
-+typedef struct _FcPattern FcPattern;
-+class SkTypeface;
-+SK_API sk_sp<SkTypeface> SkFontMgr_createTypefaceFromFcPattern(const sk_sp<SkFontMgr>& mgr, FcPattern* pattern);
-+
- #endif // #ifndef SkFontMgr_fontconfig_DEFINED
-diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
-index c2da39b28f..28483faf02 100644
---- src/ports/SkFontMgr_fontconfig.cpp
-+++ src/ports/SkFontMgr_fontconfig.cpp
-@@ -690,6 +690,7 @@ class SkFontMgr_fontconfig : public SkFontMgr {
+--- ./src/ports/SkFontMgr_fontconfig.cpp.sav 2020-01-20 16:42:51.322186451 +0100
++++ ./src/ports/SkFontMgr_fontconfig.cpp 2020-03-13 11:25:15.793936659 +0100
+@@ -699,6 +699,7 @@ class SkFontMgr_fontconfig : public SkFo
/** Creates a typeface using a typeface cache.
* @param pattern a complete pattern from FcFontRenderPrepare.
*/
+public:
- sk_sp<SkTypeface> createTypefaceFromFcPattern(SkAutoFcPattern pattern) const {
- if (!pattern) {
- return nullptr;
-@@ -1043,3 +1044,13 @@ protected:
+ sk_sp<SkTypeface> createTypefaceFromFcPattern(FcPattern* pattern) const {
+ FCLocker::AssertHeld();
+ SkAutoMutexExclusive ama(fTFCacheMutex);
+@@ -1039,3 +1040,9 @@ protected:
SK_API sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc) {
return sk_make_sp<SkFontMgr_fontconfig>(fc);
}
+
+SK_API sk_sp<SkTypeface> SkFontMgr_createTypefaceFromFcPattern(const sk_sp<SkFontMgr>& mgr, FcPattern* pattern)
+{
-+ SkAutoFcPattern p([pattern]() {
-+ FCLocker lock;
-+ FcPatternReference(pattern);
-+ return pattern;
-+ }());
-+ return static_cast<SkFontMgr_fontconfig*>(mgr.get())->createTypefaceFromFcPattern(std::move(p));
++ FCLocker lock;
++ return static_cast<SkFontMgr_fontconfig*>(mgr.get())->createTypefaceFromFcPattern(pattern);
+}
+--- ./include/ports/SkFontMgr_fontconfig.h.sav 2019-09-19 11:38:00.943185323 +0200
++++ ./include/ports/SkFontMgr_fontconfig.h 2020-03-13 11:31:48.025716543 +0100
+@@ -19,4 +19,9 @@ class SkFontMgr;
+ */
+ SK_API sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc);
+
++struct _FcPattern;
++typedef struct _FcPattern FcPattern;
++class SkTypeface;
++SK_API sk_sp<SkTypeface> SkFontMgr_createTypefaceFromFcPattern(const sk_sp<SkFontMgr>& mgr, FcPattern* pattern);
++
+ #endif // #ifndef SkFontMgr_fontconfig_DEFINED
diff --git a/external/skia/inc/pch/precompiled_skia.hxx b/external/skia/inc/pch/precompiled_skia.hxx
index 4e508931fc75..b4f9ea92f0af 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-01-18 18:16:50 using:
+ Generated on 2020-11-13 19:45:52 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:
@@ -48,7 +48,6 @@
#include <limits>
#include <locale>
#include <map>
-#include <math.h>
#include <memory>
#include <new>
#include <png.h>
@@ -140,6 +139,7 @@
#include <include/core/SkPromiseImageTexture.h>
#include <include/core/SkRRect.h>
#include <include/core/SkRSXform.h>
+#include <include/core/SkRWBuffer.h>
#include <include/core/SkRasterHandleAllocator.h>
#include <include/core/SkRect.h>
#include <include/core/SkRefCnt.h>
@@ -163,8 +163,10 @@
#include <include/core/SkTypes.h>
#include <include/core/SkUnPreMultiply.h>
#include <include/core/SkVertices.h>
+#include <include/core/SkYUVAIndex.h>
#include <include/core/SkYUVAInfo.h>
#include <include/core/SkYUVAPixmaps.h>
+#include <include/core/SkYUVASizeInfo.h>
#include <include/effects/Sk1DPathEffect.h>
#include <include/effects/Sk2DPathEffect.h>
#include <include/effects/SkAlphaThresholdFilter.h>
@@ -316,6 +318,7 @@
#include <src/core/SkAutoPixmapStorage.h>
#include <src/core/SkBigPicture.h>
#include <src/core/SkBitmapCache.h>
+#include <src/core/SkBitmapController.h>
#include <src/core/SkBitmapDevice.h>
#include <src/core/SkBitmapProcState.h>
#include <src/core/SkBlendModePriv.h>
@@ -391,8 +394,6 @@
#include <src/core/SkMessageBus.h>
#include <src/core/SkMiniRecorder.h>
#include <src/core/SkMipmap.h>
-#include <src/core/SkMipmapAccessor.h>
-#include <src/core/SkMipmapBuilder.h>
#include <src/core/SkModeColorFilter.h>
#include <src/core/SkNextID.h>
#include <src/core/SkOSFile.h>
@@ -431,7 +432,6 @@
#include <src/core/SkResourceCache.h>
#include <src/core/SkSafeMath.h>
#include <src/core/SkSafeRange.h>
-#include <src/core/SkSamplingPriv.h>
#include <src/core/SkScaleToSides.h>
#include <src/core/SkScalerCache.h>
#include <src/core/SkScalerContext.h>
@@ -458,6 +458,7 @@
#include <src/core/SkTLazy.h>
#include <src/core/SkTSearch.h>
#include <src/core/SkTSort.h>
+#include <src/core/SkTTopoSort.h>
#include <src/core/SkTaskGroup.h>
#include <src/core/SkTextBlobPriv.h>
#include <src/core/SkTextBlobTrace.h>
@@ -476,7 +477,6 @@
#include <src/core/SkWriter32.h>
#include <src/core/SkXfermodeInterpretation.h>
#include <src/core/SkXfermodePriv.h>
-#include <src/core/SkYUVAInfoLocation.h>
#include <src/core/SkYUVMath.h>
#include <src/core/SkYUVPlanesCache.h>
#include <src/effects/SkDashImpl.h>
@@ -485,7 +485,6 @@
#include <src/effects/SkOpPE.h>
#include <src/effects/SkPackBits.h>
#include <src/effects/SkTrimPE.h>
-#include <src/gpu/GrAATriangulator.h>
#include <src/gpu/GrAHardwareBufferImageGenerator.h>
#include <src/gpu/GrAHardwareBufferUtils.h>
#include <src/gpu/GrAppliedClip.h>
@@ -513,7 +512,6 @@
#include <src/gpu/GrContextThreadSafeProxyPriv.h>
#include <src/gpu/GrCopyRenderTask.h>
#include <src/gpu/GrCpuBuffer.h>
-#include <src/gpu/GrDDLTask.h>
#include <src/gpu/GrDataUtils.h>
#include <src/gpu/GrDefaultGeoProcFactory.h>
#include <src/gpu/GrDeferredProxyUploader.h>
@@ -566,6 +564,8 @@
#include <src/gpu/GrRectanizerSkyline.h>
#include <src/gpu/GrReducedClip.h>
#include <src/gpu/GrRenderTarget.h>
+#include <src/gpu/GrRenderTargetContext.h>
+#include <src/gpu/GrRenderTargetContextPriv.h>
#include <src/gpu/GrRenderTargetProxy.h>
#include <src/gpu/GrRenderTask.h>
#include <src/gpu/GrResourceAllocator.h>
@@ -592,14 +592,11 @@
#include <src/gpu/GrStyle.h>
#include <src/gpu/GrSurface.h>
#include <src/gpu/GrSurfaceContext.h>
-#include <src/gpu/GrSurfaceDrawContext.h>
-#include <src/gpu/GrSurfaceFillContext.h>
+#include <src/gpu/GrSurfaceContextPriv.h>
#include <src/gpu/GrSurfaceProxy.h>
#include <src/gpu/GrSurfaceProxyPriv.h>
#include <src/gpu/GrSurfaceProxyView.h>
#include <src/gpu/GrSwizzle.h>
-#include <src/gpu/GrTCluster.h>
-#include <src/gpu/GrTTopoSort.h>
#include <src/gpu/GrTestUtils.h>
#include <src/gpu/GrTexture.h>
#include <src/gpu/GrTextureAdjuster.h>
@@ -615,13 +612,12 @@
#include <src/gpu/GrTransferFromRenderTask.h>
#include <src/gpu/GrTriangulator.h>
#include <src/gpu/GrUniformDataManager.h>
+#include <src/gpu/GrUnrefDDLTask.h>
#include <src/gpu/GrUserStencilSettings.h>
#include <src/gpu/GrVertexWriter.h>
-#include <src/gpu/GrVx.h>
#include <src/gpu/GrWaitRenderTask.h>
#include <src/gpu/GrWindowRectangles.h>
#include <src/gpu/GrXferProcessor.h>
-#include <src/gpu/GrYUVATextureProxies.h>
#include <src/gpu/SkGpuDevice.h>
#include <src/gpu/SkGr.h>
#include <src/gpu/ccpr/GrAutoMapVertexBuffer.h>
@@ -771,8 +767,6 @@
#include <src/gpu/tessellate/GrPathTessellateOp.h>
#include <src/gpu/tessellate/GrResolveLevelCounter.h>
#include <src/gpu/tessellate/GrStencilPathShader.h>
-#include <src/gpu/tessellate/GrStrokeIndirectOp.h>
-#include <src/gpu/tessellate/GrStrokeIterator.h>
#include <src/gpu/tessellate/GrStrokeOp.h>
#include <src/gpu/tessellate/GrStrokeTessellateOp.h>
#include <src/gpu/tessellate/GrStrokeTessellateShader.h>
@@ -799,7 +793,6 @@
#include <src/gpu/vk/GrVkImageLayout.h>
#include <src/gpu/vk/GrVkImageView.h>
#include <src/gpu/vk/GrVkInterface.h>
-#include <src/gpu/vk/GrVkMSAALoadManager.h>
#include <src/gpu/vk/GrVkMemory.h>
#include <src/gpu/vk/GrVkMeshBuffer.h>
#include <src/gpu/vk/GrVkOpsRenderPass.h>
@@ -886,20 +879,15 @@
#include <src/sksl/SkSLCFGGenerator.h>
#include <src/sksl/SkSLCPPCodeGenerator.h>
#include <src/sksl/SkSLCPPUniformCTypes.h>
-#include <src/sksl/SkSLCodeGenerator.h>
#include <src/sksl/SkSLCompiler.h>
-#include <src/sksl/SkSLConstantFolder.h>
#include <src/sksl/SkSLContext.h>
-#include <src/sksl/SkSLDefines.h>
#include <src/sksl/SkSLDehydrator.h>
#include <src/sksl/SkSLErrorReporter.h>
-#include <src/sksl/SkSLExternalFunction.h>
#include <src/sksl/SkSLGLSLCodeGenerator.h>
#include <src/sksl/SkSLHCodeGenerator.h>
#include <src/sksl/SkSLIRGenerator.h>
#include <src/sksl/SkSLInliner.h>
#include <src/sksl/SkSLLexer.h>
-#include <src/sksl/SkSLMemoryLayout.h>
#include <src/sksl/SkSLMetalCodeGenerator.h>
#include <src/sksl/SkSLOutputStream.h>
#include <src/sksl/SkSLParser.h>
@@ -912,12 +900,6 @@
#include <src/sksl/SkSLString.h>
#include <src/sksl/SkSLStringStream.h>
#include <src/sksl/SkSLUtil.h>
-#include <src/sksl/SkSLVMGenerator.h>
-#include <src/sksl/dsl/DSLCore.h>
-#include <src/sksl/dsl/DSLExpression.h>
-#include <src/sksl/dsl/DSLType.h>
-#include <src/sksl/dsl/DSLVar.h>
-#include <src/sksl/dsl/priv/DSLWriter.h>
#include <src/sksl/ir/SkSLBinaryExpression.h>
#include <src/sksl/ir/SkSLBlock.h>
#include <src/sksl/ir/SkSLBoolLiteral.h>
@@ -931,7 +913,7 @@
#include <src/sksl/ir/SkSLExpressionStatement.h>
#include <src/sksl/ir/SkSLExtension.h>
#include <src/sksl/ir/SkSLExternalFunctionCall.h>
-#include <src/sksl/ir/SkSLExternalFunctionReference.h>
+#include <src/sksl/ir/SkSLExternalValueReference.h>
#include <src/sksl/ir/SkSLField.h>
#include <src/sksl/ir/SkSLFieldAccess.h>
#include <src/sksl/ir/SkSLFloatLiteral.h>
@@ -950,6 +932,7 @@
#include <src/sksl/ir/SkSLModifiers.h>
#include <src/sksl/ir/SkSLModifiersDeclaration.h>
#include <src/sksl/ir/SkSLNop.h>
+#include <src/sksl/ir/SkSLNullLiteral.h>
#include <src/sksl/ir/SkSLPostfixExpression.h>
#include <src/sksl/ir/SkSLPrefixExpression.h>
#include <src/sksl/ir/SkSLProgram.h>
@@ -958,7 +941,6 @@
#include <src/sksl/ir/SkSLSection.h>
#include <src/sksl/ir/SkSLSetting.h>
#include <src/sksl/ir/SkSLStatement.h>
-#include <src/sksl/ir/SkSLStructDefinition.h>
#include <src/sksl/ir/SkSLSwitchCase.h>
#include <src/sksl/ir/SkSLSwitchStatement.h>
#include <src/sksl/ir/SkSLSwizzle.h>
@@ -972,6 +954,7 @@
#include <src/sksl/ir/SkSLVarDeclarations.h>
#include <src/sksl/ir/SkSLVariable.h>
#include <src/sksl/ir/SkSLVariableReference.h>
+#include <src/sksl/ir/SkSLWhileStatement.h>
#include <src/utils/SkBitSet.h>
#include <src/utils/SkCanvasStack.h>
#include <src/utils/SkCharToGlyphCache.h>
diff --git a/external/skia/lerp.patch b/external/skia/lerp.patch
new file mode 100644
index 000000000000..2062c21f2df0
--- /dev/null
+++ b/external/skia/lerp.patch
@@ -0,0 +1,12 @@
+diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
+index 812dc1694f..60b8d617c6 100644
+--- a/src/shaders/SkPerlinNoiseShader.cpp
++++ b/src/shaders/SkPerlinNoiseShader.cpp
+@@ -573,6 +573,7 @@ static SkScalar fade(SkScalar t) {
+ return t * t * t * (t * (t * 6 - 15) + 10);
+ }
+
++#define lerp skia_lerp
+ static SkScalar lerp(SkScalar t, SkScalar a, SkScalar b) {
+ return a + t * (b - a);
+ }
generated by cgit (git 2.34.1) at 2025-01-11 03:18:36 +0000