@shopify/react-native-skia 0.1.197 → 0.1.200

package/cpp/skia/include/private/chromium/Slug.h

@@ -8,17 +8,21 @@
 #ifndef sktext_gpu_Slug_DEFINED
 #define sktext_gpu_Slug_DEFINED
 
-#include "include/core/SkData.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+
+#include <cstddef>
+#include <cstdint>
 
 class SkCanvas;
-class SkMatrix;
+class SkData;
 class SkPaint;
-class SkTextBlob;
 class SkReadBuffer;
 class SkStrikeClient;
+class SkTextBlob;
 class SkWriteBuffer;
+struct SkPoint;
 
 namespace sktext::gpu {
 // Slug encapsulates an SkTextBlob at a specific origin, using a specific paint. It can be

package/cpp/skia/include/private/gpu/ganesh/GrContext_Base.h

@@ -9,9 +9,10 @@
 #define GrContext_Base_DEFINED
 
 #include "include/core/SkRefCnt.h"
-#include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrContextOptions.h"
 #include "include/gpu/GrTypes.h"
+#include "include/private/base/SkAPI.h"
+
+#include <cstdint>
 
 class GrBaseContextPriv;
 class GrCaps;
@@ -19,7 +20,10 @@ class GrContextThreadSafeProxy;
 class GrDirectContext;
 class GrImageContext;
 class GrRecordingContext;
+enum SkColorType : int;
 enum class SkTextureCompressionType;
+struct GrContextOptions;
+class GrBackendFormat;
 
 class GrContext_Base : public SkRefCnt {
 public:
@@ -38,7 +42,7 @@ public:
     /*
      * Retrieve the default GrBackendFormat for a given SkColorType and renderability.
      * It is guaranteed that this backend format will be the one used by the GrContext
-     * SkColorType and SkSurfaceCharacterization-based createBackendTexture methods.
+     * SkColorType and GrSurfaceCharacterization-based createBackendTexture methods.
      *
      * The caller should check that the returned format is valid.
      */

package/cpp/skia/include/private/gpu/ganesh/GrGLTypesPriv.h

@@ -87,6 +87,8 @@ public:
     void cleanup();
     void assign(const GrGLBackendTextureInfo&, bool thisIsValid);
 
+    bool isProtected() const { return fInfo.isProtected(); }
+
 private:
     GrGLTextureInfo fInfo;
     GrGLTextureParameters* fParams;

package/cpp/skia/include/private/gpu/ganesh/GrImageContext.h

@@ -8,9 +8,12 @@
 #ifndef GrImageContext_DEFINED
 #define GrImageContext_DEFINED
 
+#include "include/core/SkRefCnt.h"
 #include "include/private/base/SingleOwner.h"
+#include "include/private/base/SkAPI.h"
 #include "include/private/gpu/ganesh/GrContext_Base.h"
 
+class GrContextThreadSafeProxy;
 class GrImageContextPriv;
 
 // This is now just a view on a ThreadSafeProxy, that SkImages can attempt to
@@ -48,8 +51,6 @@ private:
     // GrSurfaceDrawContexts.  It is also passed to the GrResourceProvider and SkGpuDevice.
     // TODO: Move this down to GrRecordingContext.
     mutable skgpu::SingleOwner fSingleOwner;
-
-    using INHERITED = GrContext_Base;
 };
 
 #endif

package/cpp/skia/include/private/gpu/ganesh/GrMtlTypesPriv.h

@@ -18,7 +18,11 @@
 #include <TargetConditionals.h>
 
 #if defined(SK_BUILD_FOR_MAC)
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000
+#define GR_METAL_SDK_VERSION 300
+#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 120000
+#define GR_METAL_SDK_VERSION 240
+#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
 #define GR_METAL_SDK_VERSION 230
 #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
 #define GR_METAL_SDK_VERSION 220
@@ -28,7 +32,11 @@
 #error Must use at least 10.14 SDK to build Metal backend for MacOS
 #endif
 #else
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 || __TV_OS_VERSION_MAX_ALLOWED >= 140000
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 160000 || __TV_OS_VERSION_MAX_ALLOWED >= 160000
+#define GR_METAL_SDK_VERSION 300
+#elif __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000 || __TV_OS_VERSION_MAX_ALLOWED >= 150000
+#define GR_METAL_SDK_VERSION 240
+#elif __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 || __TV_OS_VERSION_MAX_ALLOWED >= 140000
 #define GR_METAL_SDK_VERSION 230
 #elif __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000
 #define GR_METAL_SDK_VERSION 220

package/cpp/skia/include/{gpu → private/gpu}/ganesh/GrTextureGenerator.h

@@ -9,16 +9,13 @@
 #define GrTextureGenerator_DEFINED
 
 #include "include/core/SkImageGenerator.h"
-#include "include/core/SkRefCnt.h"
 #include "include/gpu/GrTypes.h"
 #include "include/private/base/SkAPI.h"
 
 #include <cstdint>
-#include <memory>
 
 class GrRecordingContext;
 class GrSurfaceProxyView;
-class SkImage;
 enum class GrImageTexGenPolicy : int;
 namespace skgpu { enum class Mipmapped : bool; }
 struct SkImageInfo;
@@ -51,6 +48,8 @@ public:
                                        skgpu::Mipmapped mipmapped,
                                        GrImageTexGenPolicy);
 
+    // External clients should override GrExternalTextureGenerator instead of trying to implement
+    // this (which uses private Skia types)
     virtual GrSurfaceProxyView onGenerateTexture(GrRecordingContext*, const SkImageInfo&,
                                                  skgpu::Mipmapped, GrImageTexGenPolicy) = 0;
 
@@ -64,14 +63,4 @@ protected:
     GrTextureGenerator(const SkImageInfo& info, uint32_t uniqueId = kNeedNewImageUniqueID);
 };
 
-namespace SkImages {
-/**
- *   Like SkImages::DeferredFromGenerator except allows for the use of SkGaneshTextureGenerator.
- *
- *   @param gen producer of textures
- *   @return    created SkImage, or nullptr
- */
-SK_API sk_sp<SkImage> DeferredFromTextureGenerator(std::unique_ptr<GrTextureGenerator> gen);
-}
-
 #endif  // GrTextureGenerator_DEFINED

package/cpp/skia/include/private/gpu/ganesh/GrTypesPriv.h

@@ -465,7 +465,7 @@ constexpr static int kGrInternalTextureFlagsMask = static_cast<int>(
 // require that both the surface and proxy have matching values for this flag. Instead we require
 // if the proxy has it set then the surface must also have it set. All other flags listed here must
 // match on the proxy and surface.
-// TODO: Add back kFramebufferOnly flag here once we update SkSurfaceCharacterization to take it
+// TODO: Add back kFramebufferOnly flag here once we update GrSurfaceCharacterization to take it
 // as a flag. skbug.com/10672
 constexpr static int kGrInternalRenderTargetFlagsMask = static_cast<int>(
         GrInternalSurfaceFlags::kGLRTFBOIDIs0 |

package/cpp/skia/include/private/gpu/graphite/DawnTypesPriv.h

@@ -8,6 +8,7 @@
 #ifndef skgpu_graphite_DawnTypesPriv_DEFINED
 #define skgpu_graphite_DawnTypesPriv_DEFINED
 
+#include "include/core/SkString.h"
 #include "include/gpu/graphite/dawn/DawnTypes.h"
 
 namespace skgpu::graphite {
@@ -25,6 +26,12 @@ struct DawnTextureSpec {
                fFormat == that.fFormat;
     }
 
+    SkString toString() const {
+        return SkStringPrintf("format=0x%08X,usage=0x%08X",
+                              static_cast<unsigned int>(fFormat),
+                              static_cast<unsigned int>(fUsage));
+    }
+
     wgpu::TextureFormat fFormat;
     wgpu::TextureUsage fUsage;
 };

package/cpp/skia/include/private/gpu/graphite/MtlGraphiteTypesPriv.h

@@ -8,6 +8,7 @@
 #ifndef skgpu_graphite_MtlGraphiteTypesPriv_DEFINED
 #define skgpu_graphite_MtlGraphiteTypesPriv_DEFINED
 
+#include "include/core/SkString.h"
 #include "include/gpu/graphite/GraphiteTypes.h"
 #include "include/gpu/graphite/mtl/MtlGraphiteTypes.h"
 
@@ -19,18 +20,22 @@
 
 // We're using the MSL version as shorthand for the Metal SDK version here
 #if defined(SK_BUILD_FOR_MAC)
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
-#define GR_METAL_SDK_VERSION 230
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000
+#define SKGPU_GRAPHITE_METAL_SDK_VERSION 300
 #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 120000
-#define GR_METAL_SDK_VERSION 240
+#define SKGPU_GRAPHITE_METAL_SDK_VERSION 240
+#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
+#define SKGPU_GRAPHITE_METAL_SDK_VERSION 230
 #else
 #error Must use at least 11.00 SDK to build Metal backend for MacOS
 #endif
 #else
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 || __TV_OS_VERSION_MAX_ALLOWED >= 140000
-#define GR_METAL_SDK_VERSION 230
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 160000 || __TV_OS_VERSION_MAX_ALLOWED >= 160000
+#define SKGPU_GRAPHITE_METAL_SDK_VERSION 300
 #elif __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000 || __TV_OS_VERSION_MAX_ALLOWED >= 150000
-#define GR_METAL_SDK_VERSION 240
+#define SKGPU_GRAPHITE_METAL_SDK_VERSION 240
+#elif __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 || __TV_OS_VERSION_MAX_ALLOWED >= 140000
+#define SKGPU_GRAPHITE_METAL_SDK_VERSION 230
 #else
 #error Must use at least 14.00 SDK to build Metal backend for iOS
 #endif
@@ -59,6 +64,14 @@ struct MtlTextureSpec {
                fFramebufferOnly == that.fFramebufferOnly;
     }
 
+    SkString toString() const {
+        return SkStringPrintf("format=%u,usage=0x%04X,storageMode=%d,framebufferOnly=%d",
+                              fFormat,
+                              fUsage,
+                              fStorageMode,
+                              fFramebufferOnly);
+    }
+
     MtlPixelFormat fFormat;
     MtlTextureUsage fUsage;
     MtlStorageMode fStorageMode;

package/cpp/skia/include/private/gpu/graphite/VulkanGraphiteTypesPriv.h

@@ -8,6 +8,7 @@
 #ifndef skgpu_graphite_VulkanGraphiteTypesPriv_DEFINED
 #define skgpu_graphite_VulkanGraphiteTypesPriv_DEFINED
 
+#include "include/core/SkString.h"
 #include "include/gpu/graphite/vk/VulkanGraphiteTypes.h"
 
 namespace skgpu::graphite {
@@ -37,6 +38,18 @@ struct VulkanTextureSpec {
                fAspectMask == that.fAspectMask;
     }
 
+    SkString toString() const {
+        return SkStringPrintf(
+                "flags=0x%08X,format=%d,imageTiling=%d,imageUsageFlags=0x%08X,sharingMode=%d,"
+                "aspectMask=%d",
+                fFlags,
+                fFormat,
+                fImageTiling,
+                fImageUsageFlags,
+                fSharingMode,
+                fAspectMask);
+    }
+
     VkImageCreateFlags       fFlags;
     VkFormat                 fFormat;
     VkImageTiling            fImageTiling;

package/cpp/skia/include/third_party/vulkan/vulkan/vulkan.h

@@ -85,7 +85,6 @@
 #include "vulkan_screen.h"
 #endif
 
-
 #ifdef VK_ENABLE_BETA_EXTENSIONS
 #include "vulkan_beta.h"
 #endif

package/cpp/skia/include/third_party/vulkan/vulkan/vulkan_android.h

@@ -44,7 +44,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateAndroidSurfaceKHR(
 
 #define VK_ANDROID_external_memory_android_hardware_buffer 1
 struct AHardwareBuffer;
-#define VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_SPEC_VERSION 3
+#define VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_SPEC_VERSION 4
 #define VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME "VK_ANDROID_external_memory_android_hardware_buffer"
 typedef struct VkAndroidHardwareBufferUsageANDROID {
     VkStructureType    sType;
@@ -90,6 +90,19 @@ typedef struct VkExternalFormatANDROID {
     uint64_t           externalFormat;
 } VkExternalFormatANDROID;
 
+typedef struct VkAndroidHardwareBufferFormatProperties2ANDROID {
+    VkStructureType                  sType;
+    void*                            pNext;
+    VkFormat                         format;
+    uint64_t                         externalFormat;
+    VkFormatFeatureFlags2KHR         formatFeatures;
+    VkComponentMapping               samplerYcbcrConversionComponents;
+    VkSamplerYcbcrModelConversion    suggestedYcbcrModel;
+    VkSamplerYcbcrRange              suggestedYcbcrRange;
+    VkChromaLocation                 suggestedXChromaOffset;
+    VkChromaLocation                 suggestedYChromaOffset;
+} VkAndroidHardwareBufferFormatProperties2ANDROID;
+
 typedef VkResult (VKAPI_PTR *PFN_vkGetAndroidHardwareBufferPropertiesANDROID)(VkDevice device, const struct AHardwareBuffer* buffer, VkAndroidHardwareBufferPropertiesANDROID* pProperties);
 typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryAndroidHardwareBufferANDROID)(VkDevice device, const VkMemoryGetAndroidHardwareBufferInfoANDROID* pInfo, struct AHardwareBuffer** pBuffer);