@shopify/react-native-skia 0.1.213 → 0.1.214

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

@@ -13,40 +13,21 @@
 #include "include/gpu/GpuTypes.h"
 #include "include/gpu/GrTypes.h"
 #include "include/private/base/SkAPI.h"
+#include "include/private/base/SkAnySubclass.h"
 #include "include/private/gpu/ganesh/GrTypesPriv.h"
 
-#ifdef SK_GL
-#include "include/gpu/gl/GrGLTypes.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/gpu/ganesh/GrVkTypesPriv.h"
-#include "include/private/gpu/vk/SkiaVulkan.h"
-#endif
-
-#ifdef SK_DAWN
-#include "include/gpu/dawn/GrDawnTypes.h"
-#endif
-
-#include <cstdint>
-#include <string>
-#include <string_view>
-
 enum class SkTextureCompressionType;
+class GrBackendFormatData;
+class GrBackendTextureData;
+class GrBackendRenderTargetData;
 
 namespace skgpu {
 class MutableTextureState;
 class MutableTextureStateRef;
 }
 
-#ifdef SK_DAWN
-#include "webgpu/webgpu_cpp.h"
-#endif
-
 #ifdef SK_METAL
 #include "include/gpu/mtl/GrMtlTypes.h"
 #endif
@@ -56,37 +37,22 @@ class MutableTextureStateRef;
 class GrD3DResourceState;
 #endif
 
-#if defined(SK_DEBUG) || GR_TEST_UTILS
+#if defined(SK_DEBUG) || defined(GR_TEST_UTILS)
 class SkString;
 #endif
 
+#include <cstddef>
+#include <cstdint>
+#include <string>
+#include <string_view>
+
 class SK_API GrBackendFormat {
 public:
     // Creates an invalid backend format.
-    GrBackendFormat() {}
+    GrBackendFormat();
     GrBackendFormat(const GrBackendFormat&);
     GrBackendFormat& operator=(const GrBackendFormat&);
-
-#ifdef SK_GL
-    static GrBackendFormat MakeGL(GrGLenum format, GrGLenum target) {
-        return GrBackendFormat(format, target);
-    }
-#endif
-
-#ifdef SK_VULKAN
-    static GrBackendFormat MakeVk(VkFormat format, bool willUseDRMFormatModifiers = false) {
-        return GrBackendFormat(format, GrVkYcbcrConversionInfo(), willUseDRMFormatModifiers);
-    }
-
-    static GrBackendFormat MakeVk(const GrVkYcbcrConversionInfo& ycbcrInfo,
-                                  bool willUseDRMFormatModifiers = false);
-#endif
-
-#ifdef SK_DAWN
-    static GrBackendFormat MakeDawn(wgpu::TextureFormat format) {
-        return GrBackendFormat(format);
-    }
-#endif
+    ~GrBackendFormat();
 
 #ifdef SK_METAL
     static GrBackendFormat MakeMtl(GrMTLPixelFormat format) {
@@ -118,34 +84,6 @@ public:
 
     GrColorFormatDesc desc() const;
 
-#ifdef SK_GL
-    /**
-     * If the backend API is GL this gets the format as a GrGLFormat. Otherwise, returns
-     * GrGLFormat::kUnknown.
-     */
-    GrGLFormat asGLFormat() const;
-
-    GrGLenum asGLFormatEnum() const;
-#endif
-
-#ifdef SK_VULKAN
-    /**
-     * If the backend API is Vulkan this gets the format as a VkFormat and returns true. Otherwise,
-     * returns false.
-     */
-    bool asVkFormat(VkFormat*) const;
-
-    const GrVkYcbcrConversionInfo* getVkYcbcrConversionInfo() const;
-#endif
-
-#ifdef SK_DAWN
-    /**
-     * If the backend API is Dawn this gets the format as a wgpu::TextureFormat and returns true.
-     * Otherwise, returns false.
-     */
-    bool asDawnFormat(wgpu::TextureFormat*) const;
-#endif
-
 #ifdef SK_METAL
     /**
      * If the backend API is Metal this gets the format as a GrMtlPixelFormat. Otherwise,
@@ -179,23 +117,26 @@ public:
     // Returns true if the backend format has been initialized.
     bool isValid() const { return fValid; }
 
-#if defined(SK_DEBUG) || GR_TEST_UTILS
+#if defined(SK_DEBUG) || defined(GR_TEST_UTILS)
     SkString toStr() const;
 #endif
 
 private:
-#ifdef SK_GL
-    GrBackendFormat(GrGLenum format, GrGLenum target);
-#endif
-
-#ifdef SK_VULKAN
-    GrBackendFormat(const VkFormat vkFormat, const GrVkYcbcrConversionInfo&,
-                    bool willUseDRMFormatModifiers);
-#endif
-
-#ifdef SK_DAWN
-    GrBackendFormat(wgpu::TextureFormat format);
-#endif
+    // Size determined by looking at the GrBackendFormatData subclasses, then guessing-and-checking.
+    // Compiler will complain if this is too small - in that case, just increase the number.
+    inline constexpr static size_t kMaxSubclassSize = 64;
+    using AnyFormatData = SkAnySubclass<GrBackendFormatData, kMaxSubclassSize>;
+
+    friend class GrBackendSurfacePriv;
+    friend class GrBackendFormatData;
+
+    // Used by internal factories. Should not be used externally. Use factories like
+    // GrBackendFormats::MakeGL instead.
+    template <typename FormatData>
+    GrBackendFormat(GrTextureType textureType, GrBackendApi api, const FormatData& formatData)
+            : fBackend(api), fValid(true), fTextureType(textureType) {
+        fFormatData.emplace<FormatData>(formatData);
+    }
 
 #ifdef SK_METAL
     GrBackendFormat(const GrMTLPixelFormat mtlFormat);
@@ -212,22 +153,10 @@ private:
 #endif
 
     GrBackendApi fBackend = GrBackendApi::kMock;
-    bool         fValid = false;
+    bool fValid = false;
+    AnyFormatData fFormatData;
 
     union {
-#ifdef SK_GL
-        GrGLenum fGLFormat; // the sized, internal format of the GL resource
-#endif
-#ifdef SK_VULKAN
-        struct {
-            VkFormat                 fFormat;
-            GrVkYcbcrConversionInfo  fYcbcrConversionInfo;
-        } fVk;
-#endif
-#ifdef SK_DAWN
-        wgpu::TextureFormat fDawnFormat;
-#endif
-
 #ifdef SK_METAL
         GrMTLPixelFormat fMtlFormat;
 #endif
@@ -249,26 +178,10 @@ public:
     // Creates an invalid backend texture.
     GrBackendTexture();
 
-#ifdef SK_GL
-    // The GrGLTextureInfo must have a valid fFormat.
-    GrBackendTexture(int width,
-                     int height,
-                     GrMipmapped,
-                     const GrGLTextureInfo& glInfo,
-                     std::string_view label = {});
-#endif
-
-#ifdef SK_VULKAN
-    GrBackendTexture(int width,
-                     int height,
-                     const GrVkImageInfo& vkInfo,
-                     std::string_view label = {});
-#endif
-
 #ifdef SK_METAL
     GrBackendTexture(int width,
                      int height,
-                     GrMipmapped,
+                     skgpu::Mipmapped,
                      const GrMtlTextureInfo& mtlInfo,
                      std::string_view label = {});
 #endif
@@ -280,16 +193,9 @@ public:
                      std::string_view label = {});
 #endif
 
-#ifdef SK_DAWN
     GrBackendTexture(int width,
                      int height,
-                     const GrDawnTextureInfo& dawnInfo,
-                     std::string_view label = {});
-#endif
-
-    GrBackendTexture(int width,
-                     int height,
-                     GrMipmapped,
+                     skgpu::Mipmapped,
                      const GrMockTextureInfo& mockInfo,
                      std::string_view label = {});
 
@@ -303,40 +209,13 @@ public:
     int width() const { return fWidth; }
     int height() const { return fHeight; }
     std::string_view getLabel() const { return fLabel; }
-    GrMipmapped mipmapped() const { return fMipmapped; }
-    bool hasMipmaps() const { return fMipmapped == GrMipmapped::kYes; }
+    skgpu::Mipmapped mipmapped() const { return fMipmapped; }
+    bool hasMipmaps() const { return fMipmapped == skgpu::Mipmapped::kYes; }
     /** deprecated alias of hasMipmaps(). */
     bool hasMipMaps() const { return this->hasMipmaps(); }
     GrBackendApi backend() const {return fBackend; }
     GrTextureType textureType() const { return fTextureType; }
 
-#ifdef SK_GL
-    // If the backend API is GL, copies a snapshot of the GrGLTextureInfo struct into the passed in
-    // pointer and returns true. Otherwise returns false if the backend API is not GL.
-    bool getGLTextureInfo(GrGLTextureInfo*) const;
-
-    // Call this to indicate that the texture parameters have been modified in the GL context
-    // externally to GrContext.
-    void glTextureParametersModified();
-#endif
-
-#ifdef SK_DAWN
-    // If the backend API is Dawn, copies a snapshot of the GrDawnTextureInfo struct into the passed
-    // in pointer and returns true. Otherwise returns false if the backend API is not Dawn.
-    bool getDawnTextureInfo(GrDawnTextureInfo*) const;
-#endif
-
-#ifdef SK_VULKAN
-    // If the backend API is Vulkan, copies a snapshot of the GrVkImageInfo struct into the passed
-    // in pointer and returns true. This snapshot will set the fImageLayout to the current layout
-    // state. Otherwise returns false if the backend API is not Vulkan.
-    bool getVkImageInfo(GrVkImageInfo*) const;
-
-    // Anytime the client changes the VkImageLayout of the VkImage captured by this
-    // GrBackendTexture, they must call this function to notify Skia of the changed layout.
-    void setVkImageLayout(VkImageLayout);
-#endif
-
 #ifdef SK_METAL
     // If the backend API is Metal, copies a snapshot of the GrMtlTextureInfo struct into the passed
     // in pointer and returns true. Otherwise returns false if the backend API is not Metal.
@@ -377,34 +256,41 @@ public:
     // Returns true if both textures are valid and refer to the same API texture.
     bool isSameTexture(const GrBackendTexture&);
 
-#if GR_TEST_UTILS
-    static bool TestingOnly_Equals(const GrBackendTexture& , const GrBackendTexture&);
+#if defined(GR_TEST_UTILS)
+    static bool TestingOnly_Equals(const GrBackendTexture&, const GrBackendTexture&);
 #endif
 
 private:
-    friend class GrVkGpu;  // for getMutableState
-    sk_sp<skgpu::MutableTextureStateRef> getMutableState() const;
+    // Size determined by looking at the GrBackendTextureData subclasses, then guessing-and-checking.
+    // Compiler will complain if this is too small - in that case, just increase the number.
+    inline constexpr static size_t kMaxSubclassSize = 160;
+    using AnyTextureData = SkAnySubclass<GrBackendTextureData, kMaxSubclassSize>;
 
-#ifdef SK_GL
-    friend class GrGLTexture;
-    friend class GrGLGpu;    // for getGLTextureParams
-    GrBackendTexture(int width,
-                     int height,
-                     GrMipmapped,
-                     const GrGLTextureInfo,
-                     sk_sp<GrGLTextureParameters>,
-                     std::string_view label = {});
-    sk_sp<GrGLTextureParameters> getGLTextureParams() const;
-#endif
+    friend class GrBackendSurfacePriv;
+    friend class GrBackendTextureData;
 
-#ifdef SK_VULKAN
-    friend class GrVkTexture;
+    // Used by internal factories. Should not be used externally. Use factories like
+    // GrBackendTextures::MakeGL instead.
+    template <typename TextureData>
     GrBackendTexture(int width,
                      int height,
-                     const GrVkImageInfo& vkInfo,
-                     sk_sp<skgpu::MutableTextureStateRef> mutableState,
-                     std::string_view label = {});
-#endif
+                     std::string_view label,
+                     skgpu::Mipmapped mipped,
+                     GrBackendApi backend,
+                     GrTextureType texture,
+                     const TextureData& textureData)
+            : fIsValid(true)
+            , fWidth(width)
+            , fHeight(height)
+            , fLabel(label)
+            , fMipmapped(mipped)
+            , fBackend(backend)
+            , fTextureType(texture) {
+        fTextureData.emplace<TextureData>(textureData);
+    }
+
+    friend class GrVkGpu;  // for getMutableState
+    sk_sp<skgpu::MutableTextureStateRef> getMutableState() const;
 
 #ifdef SK_DIRECT3D
     friend class GrD3DTexture;
@@ -424,17 +310,12 @@ private:
     int fWidth;         //<! width in pixels
     int fHeight;        //<! height in pixels
     const std::string fLabel;
-    GrMipmapped fMipmapped;
+    skgpu::Mipmapped fMipmapped;
     GrBackendApi fBackend;
     GrTextureType fTextureType;
+    AnyTextureData fTextureData;
 
     union {
-#ifdef SK_GL
-        GrGLBackendTextureInfo fGLInfo;
-#endif
-#ifdef SK_VULKAN
-        GrVkBackendSurfaceInfo fVkInfo;
-#endif
         GrMockTextureInfo fMockInfo;
 #ifdef SK_DIRECT3D
         GrD3DBackendSurfaceInfo fD3DInfo;
@@ -443,11 +324,6 @@ private:
 #ifdef SK_METAL
     GrMtlTextureInfo fMtlInfo;
 #endif
-#ifdef SK_DAWN
-    GrDawnTextureInfo fDawnInfo;
-#endif
-
-    sk_sp<skgpu::MutableTextureStateRef> fMutableState;
 };
 
 class SK_API GrBackendRenderTarget {
@@ -455,41 +331,10 @@ public:
     // Creates an invalid backend texture.
     GrBackendRenderTarget();
 
-#ifdef SK_GL
-    // The GrGLTextureInfo must have a valid fFormat. If wrapping in an SkSurface we require the
-    // stencil bits to be either 0, 8 or 16.
-    GrBackendRenderTarget(int width,
-                          int height,
-                          int sampleCnt,
-                          int stencilBits,
-                          const GrGLFramebufferInfo& glInfo);
-#endif
-
-#ifdef SK_DAWN
-    // If wrapping in an SkSurface we require the stencil bits to be either 0, 8 or 16.
-    GrBackendRenderTarget(int width,
-                          int height,
-                          int sampleCnt,
-                          int stencilBits,
-                          const GrDawnRenderTargetInfo& dawnInfo);
-#endif
-
-#ifdef SK_VULKAN
-    /** Deprecated. Sample count is now part of GrVkImageInfo. */
-    GrBackendRenderTarget(int width, int height, int sampleCnt, const GrVkImageInfo& vkInfo);
-
-    GrBackendRenderTarget(int width, int height, const GrVkImageInfo& vkInfo);
-#endif
-
 #ifdef SK_METAL
     GrBackendRenderTarget(int width,
                           int height,
                           const GrMtlTextureInfo& mtlInfo);
-    /** Deprecated. Sample count is ignored and is instead retrieved from the MtlTexture. */
-    GrBackendRenderTarget(int width,
-                          int height,
-                          int sampleCnt,
-                          const GrMtlTextureInfo& mtlInfo);
 #endif
 
 #ifdef SK_DIRECT3D
@@ -517,29 +362,6 @@ public:
     GrBackendApi backend() const {return fBackend; }
     bool isFramebufferOnly() const { return fFramebufferOnly; }
 
-#ifdef SK_GL
-    // If the backend API is GL, copies a snapshot of the GrGLFramebufferInfo struct into the passed
-    // in pointer and returns true. Otherwise returns false if the backend API is not GL.
-    bool getGLFramebufferInfo(GrGLFramebufferInfo*) const;
-#endif
-
-#ifdef SK_DAWN
-    // If the backend API is Dawn, copies a snapshot of the GrDawnRenderTargetInfo struct into the
-    // passed-in pointer and returns true. Otherwise returns false if the backend API is not Dawn.
-    bool getDawnRenderTargetInfo(GrDawnRenderTargetInfo*) const;
-#endif
-
-#ifdef SK_VULKAN
-    // If the backend API is Vulkan, copies a snapshot of the GrVkImageInfo struct into the passed
-    // in pointer and returns true. This snapshot will set the fImageLayout to the current layout
-    // state. Otherwise returns false if the backend API is not Vulkan.
-    bool getVkImageInfo(GrVkImageInfo*) const;
-
-    // Anytime the client changes the VkImageLayout of the VkImage captured by this
-    // GrBackendRenderTarget, they must call this function to notify Skia of the changed layout.
-    void setVkImageLayout(VkImageLayout);
-#endif
-
 #ifdef SK_METAL
     // If the backend API is Metal, copies a snapshot of the GrMtlTextureInfo struct into the passed
     // in pointer and returns true. Otherwise returns false if the backend API is not Metal.
@@ -576,22 +398,42 @@ public:
     // Returns true if the backend texture has been initialized.
     bool isValid() const { return fIsValid; }
 
-
-#if GR_TEST_UTILS
+#if defined(GR_TEST_UTILS)
     static bool TestingOnly_Equals(const GrBackendRenderTarget&, const GrBackendRenderTarget&);
 #endif
 
 private:
-    friend class GrVkGpu; // for getMutableState
-    sk_sp<skgpu::MutableTextureStateRef> getMutableState() const;
-
-#ifdef SK_VULKAN
-    friend class GrVkRenderTarget;
+    // Size determined by looking at the GrBackendRenderTargetData subclasses, then
+    // guessing-and-checking. Compiler will complain if this is too small - in that case, just
+    // increase the number.
+    inline constexpr static size_t kMaxSubclassSize = 160;
+    using AnyRenderTargetData = SkAnySubclass<GrBackendRenderTargetData, kMaxSubclassSize>;
+
+    friend class GrBackendSurfacePriv;
+    friend class GrBackendRenderTargetData;
+
+    // Used by internal factories. Should not be used externally. Use factories like
+    // GrBackendRenderTargets::MakeGL instead.
+    template <typename RenderTargetData>
     GrBackendRenderTarget(int width,
                           int height,
-                          const GrVkImageInfo& vkInfo,
-                          sk_sp<skgpu::MutableTextureStateRef> mutableState);
-#endif
+                          int sampleCnt,
+                          int stencilBits,
+                          GrBackendApi backend,
+                          bool framebufferOnly,
+                          const RenderTargetData& rtData)
+            : fIsValid(true)
+            , fFramebufferOnly(framebufferOnly)
+            , fWidth(width)
+            , fHeight(height)
+            , fSampleCnt(sampleCnt)
+            , fStencilBits(stencilBits)
+            , fBackend(backend) {
+        fRTData.emplace<RenderTargetData>(rtData);
+    }
+
+    friend class GrVkGpu; // for getMutableState
+    sk_sp<skgpu::MutableTextureStateRef> getMutableState() const;
 
 #ifdef SK_DIRECT3D
     friend class GrD3DGpu;
@@ -615,14 +457,9 @@ private:
     int fStencilBits;
 
     GrBackendApi fBackend;
+    AnyRenderTargetData fRTData;
 
     union {
-#ifdef SK_GL
-        GrGLFramebufferInfo fGLInfo;
-#endif
-#ifdef SK_VULKAN
-        GrVkBackendSurfaceInfo fVkInfo;
-#endif
         GrMockRenderTargetInfo fMockInfo;
 #ifdef SK_DIRECT3D
         GrD3DBackendSurfaceInfo fD3DInfo;
@@ -631,10 +468,6 @@ private:
 #ifdef SK_METAL
     GrMtlTextureInfo fMtlInfo;
 #endif
-#ifdef SK_DAWN
-    GrDawnRenderTargetInfo  fDawnInfo;
-#endif
-    sk_sp<skgpu::MutableTextureStateRef> fMutableState;
 };
 
 #endif

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

@@ -97,6 +97,12 @@ struct SK_API GrContextOptions {
         deduce the optimal value for this platform. */
     int  fBufferMapThreshold = -1;
 
+    /** Default minimum size to use when allocating buffers for uploading data to textures. The
+        larger the value the more uploads can be packed into one buffer, but at the cost of
+        more gpu memory allocated that may not be used. Uploads larger than the minimum will still
+        work by allocating a dedicated buffer. */
+    size_t fMinimumStagingBufferSize = 64 * 1024;
+
     /**
      * Executor to handle threaded work within Ganesh. If this is nullptr, then all work will be
      * done serially on the main thread. To have worker threads assist with various tasks, set this
@@ -292,7 +298,7 @@ struct SK_API GrContextOptions {
     GrDirectContextDestroyedContext fContextDeleteContext = nullptr;
     GrDirectContextDestroyedProc fContextDeleteProc = nullptr;
 
-#if GR_TEST_UTILS
+#if defined(GR_TEST_UTILS)
     /**
      * Private options that are only meant for testing within Skia's tools.
      */