Account for GrVkBackendContext assuming ownership of the VkInstance a…

…nd VkDevice. (flutter#3604)
agray86 · Apr 18, 2017 · ad64948 · ad64948
1 parent ab189d7
commit ad64948
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 3 deletions.
diff --git a/vulkan/vulkan_application.cc b/vulkan/vulkan_application.cc
@@ -115,10 +115,14 @@ uint32_t VulkanApplication::GetAPIVersion() const {
   return api_version_;
 }
 
-const VulkanHandle<VkInstance>& VulkanApplication::GetInstance() {
+const VulkanHandle<VkInstance>& VulkanApplication::GetInstance() const {
   return instance_;
 }
 
+void VulkanApplication::ReleaseInstanceOwnership() {
+  instance_.ReleaseOwnership();
+}
+
 std::vector<VkPhysicalDevice> VulkanApplication::GetPhysicalDevices() const {
   if (!IsValid()) {
     return {};

diff --git a/vulkan/vulkan_application.h b/vulkan/vulkan_application.h
@@ -33,7 +33,9 @@ class VulkanApplication {
 
   uint32_t GetAPIVersion() const;
 
-  const VulkanHandle<VkInstance>& GetInstance();
+  const VulkanHandle<VkInstance>& GetInstance() const;
+
+  void ReleaseInstanceOwnership();
 
   std::unique_ptr<VulkanDevice> AcquireFirstCompatibleLogicalDevice() const;
 

diff --git a/vulkan/vulkan_device.cc b/vulkan/vulkan_device.cc
@@ -148,6 +148,10 @@ const VulkanHandle<VkDevice>& VulkanDevice::GetHandle() const {
   return device_;
 }
 
+void VulkanDevice::ReleaseDeviceOwnership() {
+  device_.ReleaseOwnership();
+}
+
 const VulkanHandle<VkPhysicalDevice>& VulkanDevice::GetPhysicalDeviceHandle()
     const {
   return physical_device_;

diff --git a/vulkan/vulkan_device.h b/vulkan/vulkan_device.h
@@ -35,6 +35,8 @@ class VulkanDevice {
 
   uint32_t GetGraphicsQueueIndex() const;
 
+  void ReleaseDeviceOwnership();
+
   FTL_WARN_UNUSED_RESULT
   bool GetSurfaceCapabilities(const VulkanSurface& surface,
                               VkSurfaceCapabilitiesKHR* capabilities) const;

diff --git a/vulkan/vulkan_handle.h b/vulkan/vulkan_handle.h
@@ -50,6 +50,11 @@ class VulkanHandle {
 
   operator Handle() const { return handle_; }
 
+  /// Relinquish responsibility of collecting the underlying handle when this
+  /// object is collected. It is the responsibility of the caller to ensure that
+  /// the lifetime of the handle extends past the lifetime of this object.
+  void ReleaseOwnership() { disposer_ = nullptr; }
+
  private:
   Handle handle_;
   Disposer disposer_;

diff --git a/vulkan/vulkan_window.cc b/vulkan/vulkan_window.cc
@@ -129,6 +129,11 @@ sk_sp<GrVkBackendContext> VulkanWindow::CreateSkiaBackendContext() {
     return nullptr;
   }
 
+  // The Skia backend context takes ownership of the device and the instance.
+  // Make sure we release our ownership now.
+  logical_device_->ReleaseDeviceOwnership();
+  application_->ReleaseInstanceOwnership();
+
   auto context = sk_make_sp<GrVkBackendContext>();
   context->fInstance = application_->GetInstance();
   context->fPhysicalDevice = logical_device_->GetPhysicalDeviceHandle();

diff --git a/vulkan/vulkan_window.h b/vulkan/vulkan_window.h
@@ -47,11 +47,13 @@ class VulkanWindow {
  private:
   bool valid_;
   ftl::RefPtr<VulkanProcTable> vk;
+  // Note: The order of objects here is important because the
+  // GrVkBackendContext assumes ownership of the device and instance handles.
+  sk_sp<GrVkBackendContext> skia_vk_backend_context_;
   std::unique_ptr<VulkanApplication> application_;
   std::unique_ptr<VulkanDevice> logical_device_;
   std::unique_ptr<VulkanSurface> surface_;
   std::unique_ptr<VulkanSwapchain> swapchain_;
-  sk_sp<GrVkBackendContext> skia_vk_backend_context_;
   sk_sp<GrContext> skia_gr_context_;
 
   bool CreateSkiaGrContext();