1 files changed, 47 insertions, 8 deletions

diff --git a/include/gpu/vk/GrVkBackendContext.h b/include/gpu/vk/GrVkBackendContext.h
index fe018e494f..e68e27988a 100644
--- a/include/gpu/vk/GrVkBackendContext.h
+++ b/include/gpu/vk/GrVkBackendContext.h
@@ -34,11 +34,9 @@ enum GrVkFeatureFlags {
 // is that the client will set these up and pass them to the GrVkGpu constructor. The VkDevice
 // created must support at least one graphics queue, which is passed in as well.
 // The QueueFamilyIndex must match the family of the given queue. It is needed for CommandPool
-// creation, and any GrBackendObjects handed to us (e.g., for wrapped textures) needs to be created
-// in or transitioned to that family. The refs held by members of this struct must be released
-// (either by deleting the struct or manually releasing the refs) before the underlying vulkan
-// device and instance are destroyed.
-struct SK_API GrVkBackendContext {
+// creation, and any GrBackendObjects handed to us (e.g., for wrapped textures) need to be created
+// in or transitioned to that family.
+struct SK_API GrVkBackendContext : public SkRefCnt {
     VkInstance                 fInstance;
     VkPhysicalDevice           fPhysicalDevice;
     VkDevice                   fDevice;
@@ -50,9 +48,50 @@ struct SK_API GrVkBackendContext {
     sk_sp<const GrVkInterface> fInterface;
     sk_sp<GrVkMemoryAllocator> fMemoryAllocator;
 
-    // This is deprecated and should be set to false. The client is responsible for managing the
-    // lifetime of the VkInstance and VkDevice objects.
-    bool                       fOwnsInstanceAndDevice = false;
+    /**
+     * Controls whether this object destroys the instance and device upon destruction. The default
+     * is temporarily 'true' to avoid breaking existing clients but will be changed to 'false'.
+     */
+    bool                       fOwnsInstanceAndDevice = true;
+
+#if GR_TEST_UTILS || defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+    using CanPresentFn = std::function<bool(VkInstance, VkPhysicalDevice,
+                                            uint32_t queueFamilyIndex)>;
+
+    /**
+     * Helper function to create the Vulkan objects needed for a Vulkan-backed GrContext.
+     * Note that the version that uses the unified "GetProc" instead of separate "GetInstanceProc"
+     * and "GetDeviceProc" functions will be removed.
+     *
+     * If presentQueueIndex is non-NULL, will try to set up presentQueue as part of device
+     * creation using the platform-specific canPresent() function.
+     *
+     * This will set fOwnsInstanceAndDevice to 'true'. If it is subsequently set to 'false' then
+     * the client owns the lifetime of the created VkDevice and VkInstance.
+     */
+    static const GrVkBackendContext* Create(uint32_t* presentQueueIndex = nullptr,
+                                            CanPresentFn = CanPresentFn(),
+                                            GrVkInterface::GetProc getProc = nullptr);
+
+    static const GrVkBackendContext* Create(const GrVkInterface::GetInstanceProc& getInstanceProc,
+                                            const GrVkInterface::GetDeviceProc& getDeviceProc,
+                                            uint32_t* presentQueueIndex = nullptr,
+                                            CanPresentFn canPresent = CanPresentFn()) {
+        if (!getInstanceProc || !getDeviceProc) {
+            return nullptr;
+        }
+        auto getProc = [&getInstanceProc, &getDeviceProc](const char* proc_name,
+                                                          VkInstance instance, VkDevice device) {
+            if (device != VK_NULL_HANDLE) {
+                return getDeviceProc(device, proc_name);
+            }
+            return getInstanceProc(instance, proc_name);
+        };
+        return Create(presentQueueIndex, canPresent, getProc);
+    }
+#endif // GR_TEST_UTILS || defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+
+    ~GrVkBackendContext() override;
 };
 
 #endif