Merge "Minor clean up/fixes of VulkanManager api version checks." (8937427b) · Commits · e / os / android_frameworks_base

libs/hwui/renderthread/VulkanManager.cpp

+9 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ bool VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFe
		0, // applicationVersion
		"android framework", // pEngineName
		0, // engineVerison
		VK_MAKE_VERSION(1, 0, 0), // apiVersion
		VK_MAKE_VERSION(1, 1, 0), // apiVersion
		};

		std::vector<const char*> instanceExtensions;
		@@ -133,6 +133,7 @@ bool VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFe

		GET_INST_PROC(DestroyInstance);
		GET_INST_PROC(EnumeratePhysicalDevices);
		GET_INST_PROC(GetPhysicalDeviceProperties);
		GET_INST_PROC(GetPhysicalDeviceQueueFamilyProperties);
		GET_INST_PROC(GetPhysicalDeviceFeatures2);
		GET_INST_PROC(CreateDevice);
		@@ -164,6 +165,13 @@ bool VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFe
		return false;
		}

		VkPhysicalDeviceProperties physDeviceProperties;
		mGetPhysicalDeviceProperties(mPhysicalDevice, &physDeviceProperties);
		if (physDeviceProperties.apiVersion < VK_MAKE_VERSION(1, 1, 0)) {
		this->destroy();
		return false;
		}

		// query to get the initial queue props size
		uint32_t queueCount;
		mGetPhysicalDeviceQueueFamilyProperties(mPhysicalDevice, &queueCount, nullptr);

+1 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,7 @@ private:

		VkPtr<PFN_vkDestroyInstance> mDestroyInstance;
		VkPtr<PFN_vkEnumeratePhysicalDevices> mEnumeratePhysicalDevices;
		VkPtr<PFN_vkGetPhysicalDeviceProperties> mGetPhysicalDeviceProperties;
		VkPtr<PFN_vkGetPhysicalDeviceQueueFamilyProperties> mGetPhysicalDeviceQueueFamilyProperties;
		VkPtr<PFN_vkGetPhysicalDeviceFeatures2> mGetPhysicalDeviceFeatures2;
		VkPtr<PFN_vkCreateDevice> mCreateDevice;