@shopify/react-native-skia 0.1.129 → 0.1.130

package/cpp/skia/include/core/SkString.h

@@ -19,10 +19,7 @@
 #include <string.h>
 #include <atomic>
 #include <string>
-
-namespace skstd {
-    class string_view;
-}
+#include <string_view>
 
 /*  Some helper functions for C strings */
 static inline bool SkStrStartsWith(const char string[], const char prefixStr[]) {
@@ -126,7 +123,7 @@ public:
                 SkString(const SkString&);
                 SkString(SkString&&);
     explicit    SkString(const std::string&);
-    explicit    SkString(skstd::string_view);
+    explicit    SkString(std::string_view);
                 ~SkString();
 
     bool        isEmpty() const { return 0 == fRec->fLength; }
@@ -220,11 +217,11 @@ public:
     void prependScalar(SkScalar value) { this->insertScalar((size_t)-1, value); }
 
     void printf(const char format[], ...) SK_PRINTF_LIKE(2, 3);
-    void printVAList(const char format[], va_list);
+    void printVAList(const char format[], va_list) SK_PRINTF_LIKE(2, 0);
     void appendf(const char format[], ...) SK_PRINTF_LIKE(2, 3);
-    void appendVAList(const char format[], va_list);
+    void appendVAList(const char format[], va_list) SK_PRINTF_LIKE(2, 0);
     void prependf(const char format[], ...) SK_PRINTF_LIKE(2, 3);
-    void prependVAList(const char format[], va_list);
+    void prependVAList(const char format[], va_list) SK_PRINTF_LIKE(2, 0);
 
     void remove(size_t offset, size_t length);
 

package/cpp/skia/include/core/SkSurface.h

@@ -38,6 +38,8 @@ class GrRecordingContext;
 class GrRenderTarget;
 enum GrSurfaceOrigin: int;
 
+namespace skgpu::graphite { class Recorder; }
+
 /** \class SkSurface
     SkSurface is responsible for managing the pixels that a canvas draws into. The pixels can be
     allocated either in CPU memory (a raster surface) or on the GPU (a GrRenderTarget surface).
@@ -517,6 +519,12 @@ public:
      */
     GrRecordingContext* recordingContext();
 
+    /** Returns the recorder being used by the SkSurface.
+
+        @return the recorder, if available; nullptr otherwise
+     */
+    skgpu::graphite::Recorder* recorder();
+
 #if SK_SUPPORT_GPU
     enum BackendHandleAccess {
         kFlushRead_BackendHandleAccess,    //!< back-end object is readable
@@ -910,6 +918,19 @@ public:
     };
 
 #if SK_SUPPORT_GPU
+    /** If a surface is GPU texture backed, is being drawn with MSAA, and there is a resolve
+        texture, this call will insert a resolve command into the stream of gpu commands. In order
+        for the resolve to actually have an effect, the work still needs to be flushed and submitted
+        to the GPU after recording the resolve command. If a resolve is not supported or the
+        SkSurface has no dirty work to resolve, then this call is a no-op.
+
+        This call is most useful when the SkSurface is created by wrapping a single sampled gpu
+        texture, but asking Skia to render with MSAA. If the client wants to use the wrapped texture
+        outside of Skia, the only way to trigger a resolve is either to call this command or use
+        SkSurface::flush.
+     */
+    void resolveMSAA();
+
     /** Issues pending SkSurface commands to the GPU-backed API objects and resolves any SkSurface
         MSAA. A call to GrDirectContext::submit is always required to ensure work is actually sent
         to the gpu. Some specific API details:

package/cpp/skia/include/core/SkTypeface.h

@@ -29,7 +29,12 @@ struct SkAdvancedTypefaceMetrics;
 struct SkScalerContextEffects;
 struct SkScalerContextRec;
 
-typedef uint32_t SkFontID;
+using SkTypefaceID = uint32_t;
+
+// SkFontID is deprecated, please use SkTypefaceID.
+using SkFontID = SkTypefaceID;
+
+
 /** Machine endian. */
 typedef uint32_t SkFontTableTag;
 
@@ -91,13 +96,13 @@ public:
     /** Return a 32bit value for this typeface, unique for the underlying font
         data. Will never return 0.
      */
-    SkFontID uniqueID() const { return fUniqueID; }
+    SkTypefaceID uniqueID() const { return fUniqueID; }
 
     /** Return the uniqueID for the specified typeface. If the face is null,
         resolve it to the default font and return its uniqueID. Will never
         return 0.
     */
-    static SkFontID UniqueID(const SkTypeface* face);
+    static SkTypefaceID UniqueID(const SkTypeface* face);
 
     /** Returns true if the two typefaces reference the same underlying font,
         handling either being null (treating null as the default font)
@@ -319,6 +324,15 @@ public:
      */
     std::unique_ptr<SkStreamAsset> openStream(int* ttcIndex) const;
 
+    /**
+     * Return a stream for the contents of the font data.
+     * Returns nullptr on failure or if the font data isn't already available in stream form.
+     * Use when the stream can be used opportunistically but the calling code would prefer
+     * to fall back to table access if creating the stream would be expensive.
+     * Otherwise acts the same as openStream.
+     */
+    std::unique_ptr<SkStreamAsset> openExistingStream(int* ttcIndex) const;
+
     /**
      *  Return a scalercontext for the given descriptor. It may return a
      *  stub scalercontext that will not crash, but will draw nothing.
@@ -377,6 +391,8 @@ protected:
 
     virtual std::unique_ptr<SkStreamAsset> onOpenStream(int* ttcIndex) const = 0;
 
+    virtual std::unique_ptr<SkStreamAsset> onOpenExistingStream(int* ttcIndex) const;
+
     virtual bool onGlyphMaskNeedsCurrentColor() const = 0;
 
     virtual int onGetVariationDesignPosition(
@@ -443,7 +459,7 @@ private:
     friend class SkFont;             // getGlyphToUnicodeMap
 
 private:
-    SkFontID            fUniqueID;
+    SkTypefaceID        fUniqueID;
     SkFontStyle         fStyle;
     mutable SkRect      fBounds;
     mutable SkOnce      fBoundsOnce;

package/cpp/skia/include/core/SkTypes.h

@@ -263,8 +263,10 @@
 
 #if defined(SK_BUILD_FOR_GOOGLE3)
     void SkDebugfForDumpStackTrace(const char* data, void* unused);
-    void DumpStackTrace(int skip_count, void w(const char*, void*), void* arg);
-#  define SK_DUMP_GOOGLE3_STACK() DumpStackTrace(0, SkDebugfForDumpStackTrace, nullptr)
+    namespace base {
+        void DumpStackTrace(int skip_count, void w(const char*, void*), void* arg);
+    }
+#  define SK_DUMP_GOOGLE3_STACK() ::base::DumpStackTrace(0, SkDebugfForDumpStackTrace, nullptr)
 #else
 #  define SK_DUMP_GOOGLE3_STACK()
 #endif
@@ -392,8 +394,10 @@
 #  define GR_TEST_UTILS 0
 #endif
 
-#ifndef SK_GPU_V1
-#  define SK_GPU_V1 1
+#if !SK_SUPPORT_GPU
+   #define SK_GPU_V1 0 // always false if Ganesh is disabled
+#elif !defined(SK_GPU_V1)
+#  define SK_GPU_V1 1   // otherwise default to v1 enabled
 #endif
 
 #if defined(SK_HISTOGRAM_ENUMERATION)  || \
@@ -500,7 +504,7 @@ typedef unsigned U16CPU;
 /** @return false or true based on the condition
 */
 template <typename T> static constexpr bool SkToBool(const T& x) {
-    return 0 != x;  // NOLINT(modernize-use-nullptr)
+    return (bool)x;
 }
 
 static constexpr int16_t SK_MaxS16 = INT16_MAX;

package/cpp/skia/include/effects/SkGradientShader.h

@@ -8,7 +8,11 @@
 #ifndef SkGradientShader_DEFINED
 #define SkGradientShader_DEFINED
 
+#include "include/core/SkRefCnt.h"
 #include "include/core/SkShader.h"
+#include "include/core/SkTileMode.h"
+
+class SkColorSpace;
 
 /** \class SkGradientShader
 
@@ -100,9 +104,7 @@ public:
                                       uint32_t flags, const SkMatrix* localMatrix);
     static sk_sp<SkShader> MakeLinear(const SkPoint pts[2],
                                       const SkColor4f colors[], sk_sp<SkColorSpace> colorSpace,
-                                      const SkScalar pos[], int count, SkTileMode mode) {
-        return MakeLinear(pts, colors, std::move(colorSpace), pos, count, mode, 0, nullptr);
-    }
+                                      const SkScalar pos[], int count, SkTileMode mode);
 
     /** Returns a shader that generates a radial gradient given the center and radius.
         <p />
@@ -146,10 +148,7 @@ public:
                                       uint32_t flags, const SkMatrix* localMatrix);
     static sk_sp<SkShader> MakeRadial(const SkPoint& center, SkScalar radius,
                                       const SkColor4f colors[], sk_sp<SkColorSpace> colorSpace,
-                                      const SkScalar pos[], int count, SkTileMode mode) {
-        return MakeRadial(center, radius, colors, std::move(colorSpace), pos, count, mode,
-                          0, nullptr);
-    }
+                                      const SkScalar pos[], int count, SkTileMode mode);
 
     /**
      *  Returns a shader that generates a conical gradient given two circles, or
@@ -186,10 +185,7 @@ public:
                                                const SkPoint& end, SkScalar endRadius,
                                                const SkColor4f colors[],
                                                sk_sp<SkColorSpace> colorSpace, const SkScalar pos[],
-                                               int count, SkTileMode mode) {
-        return MakeTwoPointConical(start, startRadius, end, endRadius, colors,
-                                   std::move(colorSpace), pos, count, mode, 0, nullptr);
-    }
+                                               int count, SkTileMode mode);
 
     /** Returns a shader that generates a sweep gradient given a center.
         <p />
@@ -248,15 +244,10 @@ public:
     static sk_sp<SkShader> MakeSweep(SkScalar cx, SkScalar cy,
                                      const SkColor4f colors[], sk_sp<SkColorSpace> colorSpace,
                                      const SkScalar pos[], int count,
-                                     uint32_t flags, const SkMatrix* localMatrix) {
-        return MakeSweep(cx, cy, colors, std::move(colorSpace), pos, count,
-                         SkTileMode::kClamp, 0, 360, flags, localMatrix);
-    }
+                                     uint32_t flags, const SkMatrix* localMatrix);
     static sk_sp<SkShader> MakeSweep(SkScalar cx, SkScalar cy,
                                      const SkColor4f colors[], sk_sp<SkColorSpace> colorSpace,
-                                     const SkScalar pos[], int count) {
-        return MakeSweep(cx, cy, colors, std::move(colorSpace), pos, count, 0, nullptr);
-    }
+                                     const SkScalar pos[], int count);
 
     static void RegisterFlattenables();
 };

package/cpp/skia/include/effects/SkRuntimeEffect.h

@@ -18,9 +18,9 @@
 #include "include/core/SkString.h"
 #include "include/private/SkOnce.h"
 #include "include/private/SkSLSampleUsage.h"
-#include "include/private/SkTOptional.h"
 
 #include <string>
+#include <optional>
 #include <vector>
 
 #ifdef SK_ENABLE_SKSL
@@ -103,9 +103,10 @@ public:
 
     class Options {
     public:
-        // For testing purposes, completely disable the inliner. (Normally, Runtime Effects don't
-        // run the inliner directly, but they still get an inlining pass once they are painted.)
-        bool forceNoInline = false;
+        // For testing purposes, disables optimization and inlining. (Normally, Runtime Effects
+        // don't run the inliner directly, but they still get an inlining pass once they are
+        // painted.)
+        bool forceUnoptimized = false;
 
     private:
         friend class SkRuntimeEffect;
@@ -120,7 +121,7 @@ public:
         // Similarly: Public SkSL does not allow access to sk_FragCoord. The semantics of that
         // variable are confusing, and expose clients to implementation details of saveLayer and
         // image filters.
-        bool allowFragCoord = false;
+        bool usePrivateRTShaderModule = false;
     };
 
     // If the effect is compiled successfully, `effect` will be non-null.
@@ -184,7 +185,10 @@ public:
         ChildPtr(sk_sp<SkColorFilter> cf) : fChild(std::move(cf)) {}
         ChildPtr(sk_sp<SkBlender> b) : fChild(std::move(b)) {}
 
-        skstd::optional<ChildType> type() const;
+        // Asserts that the flattenable is either null, or one of the legal derived types
+        ChildPtr(sk_sp<SkFlattenable> f);
+
+        std::optional<ChildType> type() const;
 
         SkShader* shader() const;
         SkColorFilter* colorFilter() const;
@@ -198,12 +202,10 @@ public:
     sk_sp<SkShader> makeShader(sk_sp<SkData> uniforms,
                                sk_sp<SkShader> children[],
                                size_t childCount,
-                               const SkMatrix* localMatrix,
-                               bool isOpaque) const;
+                               const SkMatrix* localMatrix = nullptr) const;
     sk_sp<SkShader> makeShader(sk_sp<SkData> uniforms,
                                SkSpan<ChildPtr> children,
-                               const SkMatrix* localMatrix,
-                               bool isOpaque) const;
+                               const SkMatrix* localMatrix = nullptr) const;
 
     sk_sp<SkImage> makeImage(GrRecordingContext*,
                              sk_sp<SkData> uniforms,
@@ -266,6 +268,7 @@ private:
         kAllowBlender_Flag       = 0x08,
         kSamplesOutsideMain_Flag = 0x10,
         kUsesColorTransform_Flag = 0x20,
+        kAlwaysOpaque_Flag       = 0x40,
     };
 
     SkRuntimeEffect(std::unique_ptr<SkSL::Program> baseProgram,
@@ -293,7 +296,7 @@ private:
                                const Options& options,
                                SkSL::ProgramKind kind);
 
-    static SkSL::ProgramSettings MakeSettings(const Options& options, bool optimize);
+    static SkSL::ProgramSettings MakeSettings(const Options& options);
 
     uint32_t hash() const { return fHash; }
     bool usesSampleCoords()   const { return (fFlags & kUsesSampleCoords_Flag);   }
@@ -302,6 +305,7 @@ private:
     bool allowBlender()       const { return (fFlags & kAllowBlender_Flag);       }
     bool samplesOutsideMain() const { return (fFlags & kSamplesOutsideMain_Flag); }
     bool usesColorTransform() const { return (fFlags & kUsesColorTransform_Flag); }
+    bool alwaysOpaque()       const { return (fFlags & kAlwaysOpaque_Flag);       }
 
     const SkFilterColorProgram* getFilterColorProgram();
 
@@ -481,7 +485,7 @@ public:
     SkRuntimeShaderBuilder(const SkRuntimeShaderBuilder&) = default;
     ~SkRuntimeShaderBuilder();
 
-    sk_sp<SkShader> makeShader(const SkMatrix* localMatrix, bool isOpaque);
+    sk_sp<SkShader> makeShader(const SkMatrix* localMatrix = nullptr);
     sk_sp<SkImage> makeImage(GrRecordingContext*,
                              const SkMatrix* localMatrix,
                              SkImageInfo resultInfo,

package/cpp/skia/include/gpu/GpuTypes.h

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_GpuTypes_DEFINED
+#define skgpu_GpuTypes_DEFINED
+
+#include "include/core/SkTypes.h"
+
+/**
+ * This file includes numerous public types that are used by all of our gpu backends.
+ */
+
+namespace skgpu {
+
+/**
+ * Value passed into various callbacks to tell the client the result of operations connected to a
+ * specific callback. The actual interpretation of kFailed and kSuccess are dependent on the
+ * specific callbacks and are documented with the callback itself.
+ */
+enum class CallbackResult : bool {
+    kFailed = true,
+    kSuccess = true,
+};
+
+
+} // namespace skgpu
+
+#endif // skgpu_GpuTypes_DEFINED

package/cpp/skia/include/gpu/GrBackendSemaphore.h

@@ -21,7 +21,7 @@
 #endif
 
 #ifdef SK_DIRECT3D
-#include "include/private/GrD3DTypesMinimal.h"
+#include "include/private/gpu/ganesh/GrD3DTypesMinimal.h"
 #endif
 
 /**

package/cpp/skia/include/gpu/GrBackendSurface.h

@@ -13,12 +13,12 @@
 #include "include/gpu/GrTypes.h"
 #ifdef SK_GL
 #include "include/gpu/gl/GrGLTypes.h"
-#include "include/private/GrGLTypesPriv.h"
+#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
 #endif
 #include "include/gpu/mock/GrMockTypes.h"
 #ifdef SK_VULKAN
 #include "include/gpu/vk/GrVkTypes.h"
-#include "include/private/GrVkTypesPriv.h"
+#include "include/private/gpu/ganesh/GrVkTypesPriv.h"
 #endif
 
 #ifdef SK_DAWN
@@ -31,7 +31,7 @@ class GrGLTextureParameters;
 class GrColorFormatDesc;
 
 #ifdef SK_DAWN
-#include "dawn/webgpu_cpp.h"
+#include "webgpu/webgpu_cpp.h"
 #endif
 
 #ifdef SK_METAL
@@ -39,7 +39,7 @@ class GrColorFormatDesc;
 #endif
 
 #ifdef SK_DIRECT3D
-#include "include/private/GrD3DTypesMinimal.h"
+#include "include/private/gpu/ganesh/GrD3DTypesMinimal.h"
 class GrD3DResourceState;
 #endif
 
@@ -137,6 +137,8 @@ public:
      * GrGLFormat::kUnknown.
      */
     GrGLFormat asGLFormat() const;
+
+    GrGLenum asGLFormatEnum() const;
 #endif
 
 #ifdef SK_VULKAN
@@ -640,4 +642,3 @@ private:
 #endif
 
 #endif
-

package/cpp/skia/include/gpu/GrBackendSurfaceMutableState.h

@@ -11,7 +11,7 @@
 #include "include/gpu/GrTypes.h"
 
 #ifdef SK_VULKAN
-#include "include/private/GrVkTypesPriv.h"
+#include "include/private/gpu/ganesh/GrVkTypesPriv.h"
 #endif
 
 /**

package/cpp/skia/include/gpu/GrContextOptions.h

@@ -14,7 +14,7 @@
 #include "include/gpu/GrDriverBugWorkarounds.h"
 #include "include/gpu/GrTypes.h"
 #include "include/gpu/ShaderErrorHandler.h"
-#include "include/private/GrTypesPriv.h"
+#include "include/private/gpu/ganesh/GrTypesPriv.h"
 
 #include <vector>
 
@@ -169,13 +169,6 @@ struct SK_API GrContextOptions {
      */
     bool fAvoidStencilBuffers = false;
 
-    /**
-     * If true, texture fetches from mip-mapped textures will be biased to read larger MIP levels.
-     * This has the effect of sharpening those textures, at the cost of some aliasing, and possible
-     * performance impact.
-     */
-    bool fSharpenMipmappedTextures = false;
-
     /**
      * Enables driver workaround to use draws instead of HW clears, e.g. glClear on the GL backend.
      */
@@ -253,6 +246,7 @@ struct SK_API GrContextOptions {
 
     /**
      * If true, and if supported, enables hardware tessellation in the caps.
+     * DEPRECATED: This value is ignored; experimental hardware tessellation is always disabled.
      */
     bool fEnableExperimentalHardwareTessellation = false;
 
@@ -260,7 +254,9 @@ struct SK_API GrContextOptions {
      * If true, then add 1 pixel padding to all glyph masks in the atlas to support bi-lerp
      * rendering of all glyphs. This must be set to true to use GrSlug.
      */
-    #if defined(SK_EXPERIMENTAL_SIMULATE_DRAWGLYPHRUNLIST_WITH_SLUG)
+    #if defined(SK_EXPERIMENTAL_SIMULATE_DRAWGLYPHRUNLIST_WITH_SLUG) || \
+        defined(SK_EXPERIMENTAL_SIMULATE_DRAWGLYPHRUNLIST_WITH_SLUG_SERIALIZE) || \
+        defined(SK_EXPERIMENTAL_SIMULATE_DRAWGLYPHRUNLIST_WITH_SLUG_STRIKE_SERIALIZE)
     bool fSupportBilerpFromGlyphAtlas = true;
     #else
     bool fSupportBilerpFromGlyphAtlas = false;
@@ -282,6 +278,12 @@ struct SK_API GrContextOptions {
      * Private options that are only meant for testing within Skia's tools.
      */
 
+    /**
+     * Testing-only mode to exercise allocation failures in the flush-time callback objects.
+     * For now it only simulates allocation failure during the preFlush callback.
+     */
+    bool fFailFlushTimeCallbacks = false;
+
     /**
      * Prevents use of dual source blending, to test that all xfer modes work correctly without it.
      */
@@ -298,12 +300,6 @@ struct SK_API GrContextOptions {
      */
     bool fSuppressFramebufferFetch = false;
 
-    /**
-     * If greater than zero and less than the actual hardware limit, overrides the maximum number of
-     * tessellation segments supported by the caps.
-     */
-    int  fMaxTessellationSegmentsOverride = 0;
-
     /**
      * If true, then all paths are processed as if "setIsVolatile" had been called.
      */
@@ -342,11 +338,6 @@ struct SK_API GrContextOptions {
      */
     int fResourceCacheLimitOverride = -1;
 
-    /**
-     * If true, then always try to use hardware tessellation, regardless of how small a path may be.
-     */
-    bool fAlwaysPreferHardwareTessellation = false;
-
     /**
      * Maximum width and height of internal texture atlases.
      */

package/cpp/skia/include/gpu/GrContextThreadSafeProxy.h

@@ -114,6 +114,13 @@ public:
      */
     GrBackendFormat compressedBackendFormat(SkImage::CompressionType c) const;
 
+    /**
+     * Gets the maximum supported sample count for a color type. 1 is returned if only non-MSAA
+     * rendering is supported for the color type. 0 is returned if rendering to this color type
+     * is not supported at all.
+     */
+    int maxSurfaceSampleCountForColorType(SkColorType colorType) const;
+
     bool isValid() const { return nullptr != fCaps; }
 
     bool operator==(const GrContextThreadSafeProxy& that) const {

package/cpp/skia/include/gpu/GrDirectContext.h

@@ -29,9 +29,7 @@ struct GrMockOptions;
 class GrPath;
 class GrResourceCache;
 class GrResourceProvider;
-class GrStrikeCache;
 class GrSurfaceProxy;
-class GrSwizzle;
 class GrTextureProxy;
 struct GrVkBackendContext;
 
@@ -42,7 +40,14 @@ class SkSurfaceProps;
 class SkTaskGroup;
 class SkTraceMemoryDump;
 
-namespace skgpu { namespace v1 { class SmallPathAtlasMgr; }}
+namespace skgpu {
+class Swizzle;
+namespace v1 { class SmallPathAtlasMgr; }
+}
+
+namespace sktext::gpu {
+class StrikeCache;
+}
 
 class SK_API GrDirectContext : public GrRecordingContext {
 public:
@@ -508,7 +513,7 @@ public:
       * pixmap(s). Compatible, in this case, means that the backend format will be the result
       * of calling defaultBackendFormat on the base pixmap's colortype. The src data can be deleted
       * when this call returns.
-      * If numLevels is 1 a non-mipMapped texture will result. If a mipMapped texture is desired
+      * If numLevels is 1 a non-mipmapped texture will result. If a mipmapped texture is desired
       * the data for all the mipmap levels must be provided. In the mipmapped case all the
       * colortypes of the provided pixmaps must be the same. Additionally, all the miplevels
       * must be sized correctly (please see SkMipmap::ComputeLevelSize and ComputeLevelCount). The
@@ -692,7 +697,7 @@ public:
      * finishedProc to be notified when the data has been uploaded by the gpu and the texture can be
      * deleted. The client is required to call `submit` to send the upload work to the gpu.
      * The finishedProc will always get called even if we failed to create the GrBackendTexture
-     * If numLevels is 1 a non-mipMapped texture will result. If a mipMapped texture is desired
+     * If numLevels is 1 a non-mipmapped texture will result. If a mipmapped texture is desired
      * the data for all the mipmap levels must be provided. Additionally, all the miplevels
      * must be sized correctly (please see SkMipmap::ComputeLevelSize and ComputeLevelCount).
      * For the Vulkan backend the layout of the created VkImage will be:
@@ -735,7 +740,7 @@ public:
      * finishedProc to be notified when the data has been uploaded by the gpu and the texture can be
      * deleted. The client is required to call `submit` to send the upload work to the gpu.
      * The finishedProc will always get called even if we failed to create the GrBackendTexture.
-     * If a mipMapped texture is passed in, the data for all the mipmap levels must be provided.
+     * If a mipmapped texture is passed in, the data for all the mipmap levels must be provided.
      * Additionally, all the miplevels must be sized correctly (please see
      * SkMipMap::ComputeLevelSize and ComputeLevelCount).
      * For the Vulkan backend after a successful update the layout of the created VkImage will be:
@@ -854,11 +859,11 @@ private:
     // after all of its users. Clients of fTaskGroup will generally want to ensure that they call
     // wait() on it as they are being destroyed, to avoid the possibility of pending tasks being
     // invoked after objects they depend upon have already been destroyed.
-    std::unique_ptr<SkTaskGroup>            fTaskGroup;
-    std::unique_ptr<GrStrikeCache>          fStrikeCache;
-    sk_sp<GrGpu>                            fGpu;
-    std::unique_ptr<GrResourceCache>        fResourceCache;
-    std::unique_ptr<GrResourceProvider>     fResourceProvider;
+    std::unique_ptr<SkTaskGroup>              fTaskGroup;
+    std::unique_ptr<sktext::gpu::StrikeCache> fStrikeCache;
+    sk_sp<GrGpu>                              fGpu;
+    std::unique_ptr<GrResourceCache>          fResourceCache;
+    std::unique_ptr<GrResourceProvider>       fResourceProvider;
 
     bool                                    fDidTestPMConversions;
     // true if the PM/UPM conversion succeeded; false otherwise

package/cpp/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h

@@ -30,8 +30,6 @@
          max_fragment_uniform_vectors_32)               \
   GPU_OP(MAX_MSAA_SAMPLE_COUNT_4,                       \
          max_msaa_sample_count_4)                       \
-  GPU_OP(MAX_TEXTURE_SIZE_LIMIT_4096,                   \
-         max_texture_size_limit_4096)                   \
   GPU_OP(PACK_PARAMETERS_WORKAROUND_WITH_PACK_BUFFER,   \
          pack_parameters_workaround_with_pack_buffer)   \
   GPU_OP(REMOVE_POW_WITH_CONSTANT_EXPONENT,             \