Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13a31b26 authored by Greg Daniel's avatar Greg Daniel Committed by Android (Google) Code Review
Browse files

Merge "Remove workaround in VulkanSurface for missing vendor flag." into qt-dev

parents cf65007b cdfc9023

libs/hwui/renderthread/VulkanManager.cpp

+0 −2
Original line number Diff line number Diff line
@@ -167,8 +167,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);

libs/hwui/renderthread/VulkanManager.h

+0 −7
Original line number Diff line number Diff line
@@ -179,13 +179,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 */

libs/hwui/renderthread/VulkanSurface.cpp

+0 −5
Original line number Diff line number Diff line
@@ -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!

     */