Remove workaround in VulkanSurface for missing vendor flag.

Test: manual building and testing
Bug: b/128923272
Change-Id: I6be67fddbbf06d4eb7efe316f7e6fd12157e2852
This commit is contained in:
Greg Daniel
2019-05-14 09:25:41 -04:00
parent 9aa53da1be
commit cdfc90231c
3 changed files with 0 additions and 14 deletions

View File

@@ -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);

View File

@@ -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 */

View File

@@ -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!
*/