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

Commit 7a679002 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only use legacy_usage for legacy query" am: 0077d6d8 am: 521c3936 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2193375



Change-Id: I4df297ed33b47467d74bd0fb4093edc84c8b966c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 00878681 521c3936

vulkan/libvulkan/swapchain.cpp

+28 −4
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <android/hardware/graphics/common/1.0/types.h>

#include <grallocusage/GrallocUsageConversion.h>

#include <graphicsenv/GraphicsEnv.h>

#include <hardware/gralloc.h>

#include <hardware/gralloc1.h>

#include <log/log.h>

#include <sync/sync.h>

#include <system/window.h>
@@ -42,6 +44,26 @@ namespace driver { 


namespace {



static uint64_t convertGralloc1ToBufferUsage(uint64_t producerUsage,

                                             uint64_t consumerUsage) {

    static_assert(uint64_t(GRALLOC1_CONSUMER_USAGE_CPU_READ_OFTEN) ==

                      uint64_t(GRALLOC1_PRODUCER_USAGE_CPU_READ_OFTEN),

                  "expected ConsumerUsage and ProducerUsage CPU_READ_OFTEN "

                  "bits to match");

    uint64_t merged = producerUsage | consumerUsage;

    if ((merged & (GRALLOC1_CONSUMER_USAGE_CPU_READ_OFTEN)) ==

        GRALLOC1_CONSUMER_USAGE_CPU_READ_OFTEN) {

        merged &= ~uint64_t(GRALLOC1_CONSUMER_USAGE_CPU_READ_OFTEN);

        merged |= BufferUsage::CPU_READ_OFTEN;

    }

    if ((merged & (GRALLOC1_PRODUCER_USAGE_CPU_WRITE_OFTEN)) ==

        GRALLOC1_PRODUCER_USAGE_CPU_WRITE_OFTEN) {

        merged &= ~uint64_t(GRALLOC1_PRODUCER_USAGE_CPU_WRITE_OFTEN);

        merged |= BufferUsage::CPU_WRITE_OFTEN;

    }

    return merged;

}



const VkSurfaceTransformFlagsKHR kSupportedTransforms =

    VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR |

    VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR |
@@ -1337,7 +1359,7 @@ VkResult CreateSwapchainKHR(VkDevice device, 
        num_images = 1;

    }



    int32_t legacy_usage = 0;

    uint64_t native_usage = 0;

    if (dispatch.GetSwapchainGrallocUsage2ANDROID) {

        uint64_t consumer_usage, producer_usage;

        ATRACE_BEGIN("GetSwapchainGrallocUsage2ANDROID");
@@ -1349,10 +1371,11 @@ VkResult CreateSwapchainKHR(VkDevice device, 
            ALOGE("vkGetSwapchainGrallocUsage2ANDROID failed: %d", result);

            return VK_ERROR_SURFACE_LOST_KHR;

        }

        legacy_usage =

            android_convertGralloc1To0Usage(producer_usage, consumer_usage);

        native_usage =

            convertGralloc1ToBufferUsage(consumer_usage, producer_usage);

    } else if (dispatch.GetSwapchainGrallocUsageANDROID) {

        ATRACE_BEGIN("GetSwapchainGrallocUsageANDROID");

        int32_t legacy_usage = 0;

        result = dispatch.GetSwapchainGrallocUsageANDROID(

            device, create_info->imageFormat, create_info->imageUsage,

            &legacy_usage);
@@ -1361,8 +1384,9 @@ VkResult CreateSwapchainKHR(VkDevice device, 
            ALOGE("vkGetSwapchainGrallocUsageANDROID failed: %d", result);

            return VK_ERROR_SURFACE_LOST_KHR;

        }

        native_usage = static_cast<uint64_t>(legacy_usage);

    }

    uint64_t native_usage = static_cast<uint64_t>(legacy_usage);

    native_usage |= surface.consumer_usage;



    bool createProtectedSwapchain = false;

    if (create_info->flags & VK_SWAPCHAIN_CREATE_PROTECTED_BIT_KHR) {