From cdfc90231cbe44430dff6bc77a27ea31743f580e Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Tue, 14 May 2019 09:25:41 -0400 Subject: [PATCH] Remove workaround in VulkanSurface for missing vendor flag. Test: manual building and testing Bug: b/128923272 Change-Id: I6be67fddbbf06d4eb7efe316f7e6fd12157e2852 --- libs/hwui/renderthread/VulkanManager.cpp | 2 -- libs/hwui/renderthread/VulkanManager.h | 7 ------- libs/hwui/renderthread/VulkanSurface.cpp | 5 ----- 3 files changed, 14 deletions(-) diff --git a/libs/hwui/renderthread/VulkanManager.cpp b/libs/hwui/renderthread/VulkanManager.cpp index 5edf3301b2e8..7037e83fd3ca 100644 --- a/libs/hwui/renderthread/VulkanManager.cpp +++ b/libs/hwui/renderthread/VulkanManager.cpp @@ -171,8 +171,6 @@ void VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFe LOG_ALWAYS_FATAL_IF(physDeviceProperties.apiVersion < VK_MAKE_VERSION(1, 1, 0)); mDriverVersion = physDeviceProperties.driverVersion; - mIsQualcomm = physDeviceProperties.vendorID == 20803; - // query to get the initial queue props size uint32_t queueCount; mGetPhysicalDeviceQueueFamilyProperties(mPhysicalDevice, &queueCount, nullptr); diff --git a/libs/hwui/renderthread/VulkanManager.h b/libs/hwui/renderthread/VulkanManager.h index 1a3a0e485523..7099c7c34110 100644 --- a/libs/hwui/renderthread/VulkanManager.h +++ b/libs/hwui/renderthread/VulkanManager.h @@ -181,13 +181,6 @@ private: SwapBehavior mSwapBehavior = SwapBehavior::Discard; GrVkExtensions mExtensions; uint32_t mDriverVersion = 0; - - // TODO: Remove once fix has landed. Temporaryly needed for workaround for setting up AHB - // surfaces on Qualcomm. Currently if you don't use VkSwapchain Qualcomm is not setting - // reporting that we need to use one of their private vendor usage bits which greatly effects - // performance if it is not used. - bool mIsQualcomm = false; - bool isQualcomm() const { return mIsQualcomm; } }; } /* namespace renderthread */ diff --git a/libs/hwui/renderthread/VulkanSurface.cpp b/libs/hwui/renderthread/VulkanSurface.cpp index df6b9ed2cdcb..b2cc23e76b8a 100644 --- a/libs/hwui/renderthread/VulkanSurface.cpp +++ b/libs/hwui/renderthread/VulkanSurface.cpp @@ -297,11 +297,6 @@ VulkanSurface* VulkanSurface::Create(ANativeWindow* window, ColorMode colorMode, native_window_get_consumer_usage(window, &consumerUsage); windowInfo.windowUsageFlags = consumerUsage | hwbUsage.androidHardwareBufferUsage; - if (vkManager.isQualcomm()) { - windowInfo.windowUsageFlags = - windowInfo.windowUsageFlags | AHARDWAREBUFFER_USAGE_VENDOR_0; - } - /* * Now we attempt to modify the window! */ -- 2.11.0