diff --git a/libs/hwui/renderthread/VulkanManager.cpp b/libs/hwui/renderthread/VulkanManager.cpp index d4c6eae37630e..6dacc7a0ea073 100644 --- a/libs/hwui/renderthread/VulkanManager.cpp +++ b/libs/hwui/renderthread/VulkanManager.cpp @@ -81,7 +81,9 @@ void VulkanManager::destroy() { mDevice = VK_NULL_HANDLE; mPhysicalDevice = VK_NULL_HANDLE; mInstance = VK_NULL_HANDLE; + mInstanceExtensionsOwner.clear(); mInstanceExtensions.clear(); + mDeviceExtensionsOwner.clear(); mDeviceExtensions.clear(); free_features_extensions_structs(mPhysicalDeviceFeatures2); mPhysicalDeviceFeatures2 = {}; @@ -106,18 +108,18 @@ void VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFe uint32_t extensionCount = 0; err = mEnumerateInstanceExtensionProperties(nullptr, &extensionCount, nullptr); LOG_ALWAYS_FATAL_IF(VK_SUCCESS != err); - std::unique_ptr extensions( - new VkExtensionProperties[extensionCount]); - err = mEnumerateInstanceExtensionProperties(nullptr, &extensionCount, extensions.get()); + mInstanceExtensionsOwner.resize(extensionCount); + err = mEnumerateInstanceExtensionProperties(nullptr, &extensionCount, + mInstanceExtensionsOwner.data()); LOG_ALWAYS_FATAL_IF(VK_SUCCESS != err); bool hasKHRSurfaceExtension = false; bool hasKHRAndroidSurfaceExtension = false; - for (uint32_t i = 0; i < extensionCount; ++i) { - mInstanceExtensions.push_back(extensions[i].extensionName); - if (!strcmp(extensions[i].extensionName, VK_KHR_SURFACE_EXTENSION_NAME)) { + for (const VkExtensionProperties& extension : mInstanceExtensionsOwner) { + mInstanceExtensions.push_back(extension.extensionName); + if (!strcmp(extension.extensionName, VK_KHR_SURFACE_EXTENSION_NAME)) { hasKHRSurfaceExtension = true; } - if (!strcmp(extensions[i].extensionName,VK_KHR_ANDROID_SURFACE_EXTENSION_NAME)) { + if (!strcmp(extension.extensionName, VK_KHR_ANDROID_SURFACE_EXTENSION_NAME)) { hasKHRAndroidSurfaceExtension = true; } } @@ -196,15 +198,14 @@ void VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFe err = mEnumerateDeviceExtensionProperties(mPhysicalDevice, nullptr, &extensionCount, nullptr); LOG_ALWAYS_FATAL_IF(VK_SUCCESS != err); - std::unique_ptr extensions( - new VkExtensionProperties[extensionCount]); + mDeviceExtensionsOwner.resize(extensionCount); err = mEnumerateDeviceExtensionProperties(mPhysicalDevice, nullptr, &extensionCount, - extensions.get()); + mDeviceExtensionsOwner.data()); LOG_ALWAYS_FATAL_IF(VK_SUCCESS != err); bool hasKHRSwapchainExtension = false; - for (uint32_t i = 0; i < extensionCount; ++i) { - mDeviceExtensions.push_back(extensions[i].extensionName); - if (!strcmp(extensions[i].extensionName, VK_KHR_SWAPCHAIN_EXTENSION_NAME)) { + for (const VkExtensionProperties& extension : mDeviceExtensionsOwner) { + mDeviceExtensions.push_back(extension.extensionName); + if (!strcmp(extension.extensionName, VK_KHR_SWAPCHAIN_EXTENSION_NAME)) { hasKHRSwapchainExtension = true; } } @@ -217,6 +218,7 @@ void VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFe } return vkGetInstanceProcAddr(instance, proc_name); }; + grExtensions.init(getProc, mInstance, mPhysicalDevice, mInstanceExtensions.size(), mInstanceExtensions.data(), mDeviceExtensions.size(), mDeviceExtensions.data()); diff --git a/libs/hwui/renderthread/VulkanManager.h b/libs/hwui/renderthread/VulkanManager.h index c3d2891765769..c2d18029c7311 100644 --- a/libs/hwui/renderthread/VulkanManager.h +++ b/libs/hwui/renderthread/VulkanManager.h @@ -76,6 +76,8 @@ public: status_t createReleaseFence(sp& nativeFence); // Returned pointers are owned by VulkanManager. + // An instance of VkFunctorInitParams returned from getVkFunctorInitParams refers to + // the internal state of VulkanManager: VulkanManager must be alive to use the returned value. VkFunctorInitParams getVkFunctorInitParams() const; sk_sp createContext(const GrContextOptions& options); @@ -164,7 +166,9 @@ private: // Variables saved to populate VkFunctorInitParams. static const uint32_t mAPIVersion = VK_MAKE_VERSION(1, 1, 0); + std::vector mInstanceExtensionsOwner; std::vector mInstanceExtensions; + std::vector mDeviceExtensionsOwner; std::vector mDeviceExtensions; VkPhysicalDeviceFeatures2 mPhysicalDeviceFeatures2{};