@shopify/react-native-skia 1.3.13 → 1.4.0

package/cpp/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h

@@ -8,24 +8,28 @@
 #ifndef GrVkBackendSurface_DEFINED
 #define GrVkBackendSurface_DEFINED
 
-#include "include/gpu/vk/GrVkTypes.h"
 #include "include/private/base/SkAPI.h"
+#include "include/private/gpu/vk/SkiaVulkan.h"
 
 #include <string_view>
 
 class GrBackendFormat;
 class GrBackendTexture;
 class GrBackendRenderTarget;
+struct GrVkImageInfo;
 
+namespace skgpu {
+struct VulkanYcbcrConversionInfo;
+}
 
 namespace GrBackendFormats {
 
 SK_API GrBackendFormat MakeVk(VkFormat format, bool willUseDRMFormatModifiers = false);
-SK_API GrBackendFormat MakeVk(const GrVkYcbcrConversionInfo& ycbcrInfo,
+SK_API GrBackendFormat MakeVk(const skgpu::VulkanYcbcrConversionInfo& ycbcrInfo,
                               bool willUseDRMFormatModifiers = false);
 
 SK_API bool AsVkFormat(const GrBackendFormat&, VkFormat*);
-SK_API const GrVkYcbcrConversionInfo* GetVkYcbcrConversionInfo(const GrBackendFormat&);
+SK_API const skgpu::VulkanYcbcrConversionInfo* GetVkYcbcrConversionInfo(const GrBackendFormat&);
 
 }  // namespace GrBackendFormats
 

package/cpp/skia/include/gpu/ganesh/vk/GrVkDirectContext.h

@@ -13,7 +13,9 @@
 
 class GrDirectContext;
 struct GrContextOptions;
-struct GrVkBackendContext;
+namespace skgpu {
+struct VulkanBackendContext;
+}
 
 namespace GrDirectContexts {
 /**
@@ -23,8 +25,9 @@ namespace GrDirectContexts {
  * refs on the GrDirectContext. Once all these objects and the GrDirectContext are released,
  * then it is safe to delete the vulkan objects.
  */
-SK_API sk_sp<GrDirectContext> MakeVulkan(const GrVkBackendContext&, const GrContextOptions&);
-SK_API sk_sp<GrDirectContext> MakeVulkan(const GrVkBackendContext&);
+SK_API sk_sp<GrDirectContext> MakeVulkan(const skgpu::VulkanBackendContext&,
+                                         const GrContextOptions&);
+SK_API sk_sp<GrDirectContext> MakeVulkan(const skgpu::VulkanBackendContext&);
 }
 
 #endif

package/cpp/skia/include/gpu/ganesh/vk/GrVkTypes.h

@@ -0,0 +1,101 @@
+
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrVkTypes_DEFINED
+#define GrVkTypes_DEFINED
+
+#include "include/gpu/GpuTypes.h"
+#include "include/gpu/vk/VulkanTypes.h"
+
+/*
+ * When wrapping a GrBackendTexture or GrBackendRendenderTarget, the fCurrentQueueFamily should
+ * either be VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_EXTERNAL, or VK_QUEUE_FAMILY_FOREIGN_EXT. If
+ * fSharingMode is VK_SHARING_MODE_EXCLUSIVE then fCurrentQueueFamily can also be the graphics
+ * queue index passed into Skia.
+ */
+struct GrVkImageInfo {
+    VkImage                           fImage = VK_NULL_HANDLE;
+    skgpu::VulkanAlloc                fAlloc;
+    VkImageTiling                     fImageTiling = VK_IMAGE_TILING_OPTIMAL;
+    VkImageLayout                     fImageLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+    VkFormat                          fFormat = VK_FORMAT_UNDEFINED;
+    VkImageUsageFlags                 fImageUsageFlags = 0;
+    uint32_t                          fSampleCount = 1;
+    uint32_t                          fLevelCount = 0;
+    uint32_t                          fCurrentQueueFamily = VK_QUEUE_FAMILY_IGNORED;
+    skgpu::Protected                  fProtected = skgpu::Protected::kNo;
+    skgpu::VulkanYcbcrConversionInfo  fYcbcrConversionInfo;
+    VkSharingMode                     fSharingMode = VK_SHARING_MODE_EXCLUSIVE;
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    bool                              fPartOfSwapchainOrAndroidWindow = false;
+#endif
+
+    bool operator==(const GrVkImageInfo& that) const {
+        bool equal = fImage == that.fImage && fAlloc == that.fAlloc &&
+                     fImageTiling == that.fImageTiling &&
+                     fImageLayout == that.fImageLayout &&
+                     fFormat == that.fFormat &&
+                     fImageUsageFlags == that.fImageUsageFlags &&
+                     fSampleCount == that.fSampleCount &&
+                     fLevelCount == that.fLevelCount &&
+                     fCurrentQueueFamily == that.fCurrentQueueFamily &&
+                     fProtected == that.fProtected &&
+                     fYcbcrConversionInfo == that.fYcbcrConversionInfo &&
+                     fSharingMode == that.fSharingMode;
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+        equal = equal && (fPartOfSwapchainOrAndroidWindow == that.fPartOfSwapchainOrAndroidWindow);
+#endif
+        return equal;
+    }
+};
+
+/**
+ * This object is wrapped in a GrBackendDrawableInfo and passed in as an argument to
+ * drawBackendGpu() calls on an SkDrawable. The drawable will use this info to inject direct
+ * Vulkan calls into our stream of GPU draws.
+ *
+ * The SkDrawable is given a secondary VkCommandBuffer in which to record draws. The GPU backend
+ * will then execute that command buffer within a render pass it is using for its own draws. The
+ * drawable is also given the attachment of the color index, a compatible VkRenderPass, and the
+ * VkFormat of the color attachment so that it can make VkPipeline objects for the draws. The
+ * SkDrawable must not alter the state of the VkRenderpass or sub pass.
+ *
+ * Additionally, the SkDrawable may fill in the passed in fDrawBounds with the bounds of the draws
+ * that it submits to the command buffer. This will be used by the GPU backend for setting the
+ * bounds in vkCmdBeginRenderPass. If fDrawBounds is not updated, we will assume that the entire
+ * attachment may have been written to.
+ *
+ * The SkDrawable is always allowed to create its own command buffers and submit them to the queue
+ * to render offscreen textures which will be sampled in draws added to the passed in
+ * VkCommandBuffer. If this is done the SkDrawable is in charge of adding the required memory
+ * barriers to the queue for the sampled images since the Skia backend will not do this.
+ */
+struct GrVkDrawableInfo {
+    VkCommandBuffer fSecondaryCommandBuffer;
+    uint32_t        fColorAttachmentIndex;
+    VkRenderPass    fCompatibleRenderPass;
+    VkFormat        fFormat;
+    VkRect2D*       fDrawBounds;
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    bool            fFromSwapchainOrAndroidWindow;
+#endif
+};
+
+struct GrVkSurfaceInfo {
+    uint32_t fSampleCount = 1;
+    uint32_t fLevelCount = 0;
+    skgpu::Protected fProtected = skgpu::Protected::kNo;
+
+    VkImageTiling fImageTiling = VK_IMAGE_TILING_OPTIMAL;
+    VkFormat fFormat = VK_FORMAT_UNDEFINED;
+    VkImageUsageFlags fImageUsageFlags = 0;
+    skgpu::VulkanYcbcrConversionInfo fYcbcrConversionInfo;
+    VkSharingMode fSharingMode = VK_SHARING_MODE_EXCLUSIVE;
+};
+
+#endif

package/cpp/skia/include/gpu/gl/GrGLAssembleHelpers.h

@@ -4,12 +4,5 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef GrGLAssembleHelpers_DEFINED
-#define GrGLAssembleHelpers_DEFINED
-
-#include "include/gpu/gl/GrGLAssembleInterface.h"
-
-void GrGetEGLQueryAndDisplay(GrEGLQueryStringFn** queryString, GrEGLDisplay* display,
-                             void* ctx, GrGLGetProc get);
-
-#endif  // GrGLAssembleHelpers_DEFINED
+// TODO(kjlubick, egdaniel) Delete this after migrating clients.
+#include "include/gpu/ganesh/gl/GrGLAssembleHelpers.h"

package/cpp/skia/include/gpu/gl/GrGLAssembleInterface.h

@@ -4,41 +4,5 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef GrGLAssembleInterface_DEFINED
-#define GrGLAssembleInterface_DEFINED
-
-#include "include/gpu/gl/GrGLInterface.h"
-#include "include/private/base/SkAPI.h"
-
-typedef GrGLFuncPtr (*GrGLGetProc)(void* ctx, const char name[]);
-
-/**
- * Generic function for creating a GrGLInterface for an either OpenGL or GLES. It calls
- * get() to get each function address. ctx is a generic ptr passed to and interpreted by get().
- */
-SK_API sk_sp<const GrGLInterface> GrGLMakeAssembledInterface(void *ctx, GrGLGetProc get);
-
-/**
- * Generic function for creating a GrGLInterface for an OpenGL (but not GLES) context. It calls
- * get() to get each function address. ctx is a generic ptr passed to and interpreted by get().
- */
-SK_API sk_sp<const GrGLInterface> GrGLMakeAssembledGLInterface(void *ctx, GrGLGetProc get);
-
-/**
- * Generic function for creating a GrGLInterface for an OpenGL ES (but not Open GL) context. It
- * calls get() to get each function address. ctx is a generic ptr passed to and interpreted by
- * get().
- */
-SK_API sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc get);
-
-/**
- * Generic function for creating a GrGLInterface for a WebGL (similar to OpenGL ES) context. It
- * calls get() to get each function address. ctx is a generic ptr passed to and interpreted by
- * get().
- */
-SK_API sk_sp<const GrGLInterface> GrGLMakeAssembledWebGLInterface(void *ctx, GrGLGetProc get);
-
-/** Deprecated version of GrGLMakeAssembledInterface() that returns a bare pointer. */
-SK_API const GrGLInterface* GrGLAssembleInterface(void *ctx, GrGLGetProc get);
-
-#endif  // GrGLAssembleInterface_DEFINED
+// TODO(kjlubick, egdaniel) Delete this after migrating clients.
+#include "include/gpu/ganesh/gl/GrGLAssembleInterface.h"

package/cpp/skia/include/gpu/gl/GrGLConfig.h

@@ -1,79 +1,8 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-
-
-
-#ifndef GrGLConfig_DEFINED
-#define GrGLConfig_DEFINED
-
-#include "include/gpu/GrTypes.h"
-
-/**
- * Optional GL config file.
- */
-#ifdef GR_GL_CUSTOM_SETUP_HEADER
-    #include GR_GL_CUSTOM_SETUP_HEADER
-#endif
-
-#if !defined(GR_GL_FUNCTION_TYPE)
-    #if defined(SK_BUILD_FOR_WIN)
-        #define GR_GL_FUNCTION_TYPE __stdcall
-    #else
-        #define GR_GL_FUNCTION_TYPE
-    #endif
-#endif
-
-/**
- * The following are optional defines that can be enabled at the compiler
- * command line, in a IDE project, in a GrUserConfig.h file, or in a GL custom
- * file (if one is in use). If a GR_GL_CUSTOM_SETUP_HEADER is used they can
- * also be placed there.
- *
- * GR_GL_LOG_CALLS: if 1 Gr can print every GL call using SkDebugf. Defaults to
- * 0. Logging can be enabled and disabled at runtime using a debugger via to
- * global gLogCallsGL. The initial value of gLogCallsGL is controlled by
- * GR_GL_LOG_CALLS_START.
- *
- * GR_GL_LOG_CALLS_START: controls the initial value of gLogCallsGL when
- * GR_GL_LOG_CALLS is 1. Defaults to 0.
- *
- * GR_GL_CHECK_ERROR: if enabled Gr can do a glGetError() after every GL call.
- * Defaults to 1 if SK_DEBUG is set, otherwise 0. When GR_GL_CHECK_ERROR is 1
- * this can be toggled in a debugger using the gCheckErrorGL global. The initial
- * value of gCheckErrorGL is controlled by by GR_GL_CHECK_ERROR_START.
- *
- * GR_GL_CHECK_ERROR_START: controls the initial value of gCheckErrorGL
- * when GR_GL_CHECK_ERROR is 1.  Defaults to 1.
- *
- */
-
-#if !defined(GR_GL_LOG_CALLS)
-    #ifdef SK_DEBUG
-        #define GR_GL_LOG_CALLS 1
-    #else
-        #define GR_GL_LOG_CALLS 0
-    #endif
-#endif
-
-#if !defined(GR_GL_LOG_CALLS_START)
-    #define GR_GL_LOG_CALLS_START                       0
-#endif
-
-#if !defined(GR_GL_CHECK_ERROR)
-    #ifdef SK_DEBUG
-        #define GR_GL_CHECK_ERROR 1
-    #else
-        #define GR_GL_CHECK_ERROR 0
-    #endif
-#endif
-
-#if !defined(GR_GL_CHECK_ERROR_START)
-    #define GR_GL_CHECK_ERROR_START                     1
-#endif
-
-#endif
+// TODO(kjlubick, egdaniel) Delete this after migrating clients.
+#include "include/gpu/ganesh/gl/GrGLConfig.h"

package/cpp/skia/include/gpu/gl/GrGLExtensions.h

@@ -4,75 +4,5 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-
-#ifndef GrGLExtensions_DEFINED
-#define GrGLExtensions_DEFINED
-
-#include "include/core/SkString.h"
-#include "include/gpu/gl/GrGLFunctions.h"
-#include "include/private/base/SkTArray.h"
-
-#include <utility>
-
-struct GrGLInterface;
-class SkJSONWriter;
-
-/**
- * This helper queries the current GL context for its extensions, remembers them, and can be
- * queried. It supports both glGetString- and glGetStringi-style extension string APIs and will
- * use the latter if it is available. It also will query for EGL extensions if a eglQueryString
- * implementation is provided.
- */
-class SK_API GrGLExtensions {
-public:
-    GrGLExtensions() {}
-
-    GrGLExtensions(const GrGLExtensions&);
-
-    GrGLExtensions& operator=(const GrGLExtensions&);
-
-    void swap(GrGLExtensions* that) {
-        using std::swap;
-        swap(fStrings, that->fStrings);
-        swap(fInitialized, that->fInitialized);
-    }
-
-    /**
-     * We sometimes need to use this class without having yet created a GrGLInterface. This version
-     * of init expects that getString is always non-NULL while getIntegerv and getStringi are non-
-     * NULL if on desktop GL with version 3.0 or higher. Otherwise it will fail.
-     */
-    bool init(GrGLStandard standard,
-              GrGLFunction<GrGLGetStringFn> getString,
-              GrGLFunction<GrGLGetStringiFn> getStringi,
-              GrGLFunction<GrGLGetIntegervFn> getIntegerv,
-              GrGLFunction<GrEGLQueryStringFn> queryString = nullptr,
-              GrEGLDisplay eglDisplay = nullptr);
-
-    bool isInitialized() const { return fInitialized; }
-
-    /**
-     * Queries whether an extension is present. This will fail if init() has not been called.
-     */
-    bool has(const char[]) const;
-
-    /**
-     * Removes an extension if present. Returns true if the extension was present before the call.
-     */
-    bool remove(const char[]);
-
-    /**
-     * Adds an extension to list
-     */
-    void add(const char[]);
-
-    void reset() { fStrings.clear(); }
-
-    void dumpJSON(SkJSONWriter*) const;
-
-private:
-    bool fInitialized = false;
-    skia_private::TArray<SkString> fStrings;
-};
-
-#endif
+// TODO(kjlubick, egdaniel) Delete this after migrating clients.
+#include "include/gpu/ganesh/gl/GrGLExtensions.h"