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

Commit d380e2c4 authored by Marissa Wall's avatar Marissa Wall
Browse files

gralloc: create a common gralloc interface 

Create gralloc interface for allocator and mapper to hide the
implementation differences between Gralloc2 and Gralloc3.

Bug: 120493579
Test: manual
Change-Id: I21aa1954aa8b79f3e35616f188e15b47dae1f0e7
parent 1e77925b

libs/ui/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ cc_library_shared { 
        "Fence.cpp",

        "FenceTime.cpp",

        "FrameStats.cpp",

        "Gralloc.cpp",

        "Gralloc2.cpp",

        "GraphicBuffer.cpp",

        "GraphicBufferAllocator.cpp",

libs/ui/Gralloc.cpp

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#define LOG_TAG "Gralloc"



#include <ui/Gralloc.h>



namespace android {



GrallocMapper::~GrallocMapper() {}



GrallocAllocator::~GrallocAllocator() {}



} // namespace android

libs/ui/Gralloc2.cpp

+27 −35
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ using android::hardware::graphics::mapper::V2_0::YCbCrLayout; 


namespace android {



namespace Gralloc2 {



namespace {



static constexpr Error kTransactionError = Error::NO_RESOURCES;
@@ -65,8 +63,8 @@ uint64_t getValid11UsageBits() { 
    return valid11UsageBits;

}



static inline Gralloc2::IMapper::Rect sGralloc2Rect(const Rect& rect) {

    Gralloc2::IMapper::Rect outRect{};

static inline IMapper::Rect sGralloc2Rect(const Rect& rect) {

    IMapper::Rect outRect{};

    outRect.left = rect.left;

    outRect.top = rect.top;

    outRect.width = rect.width();
@@ -76,12 +74,11 @@ static inline Gralloc2::IMapper::Rect sGralloc2Rect(const Rect& rect) { 


}  // anonymous namespace



void Mapper::preload() {

void Gralloc2Mapper::preload() {

    android::hardware::preloadPassthroughService<hardware::graphics::mapper::V2_0::IMapper>();

}



Mapper::Mapper()

{

Gralloc2Mapper::Gralloc2Mapper() {

    mMapper = hardware::graphics::mapper::V2_0::IMapper::getService();

    if (mMapper == nullptr) {

        LOG_ALWAYS_FATAL("gralloc-mapper is missing");
@@ -94,7 +91,8 @@ Mapper::Mapper() 
    mMapperV2_1 = IMapper::castFrom(mMapper);

}



status_t Mapper::validateBufferDescriptorInfo(IMapper::BufferDescriptorInfo* descriptorInfo) const {

status_t Gralloc2Mapper::validateBufferDescriptorInfo(

        IMapper::BufferDescriptorInfo* descriptorInfo) const {

    uint64_t validUsageBits = getValid10UsageBits();

    if (mMapperV2_1 != nullptr) {

        validUsageBits = validUsageBits | getValid11UsageBits();
@@ -108,7 +106,8 @@ status_t Mapper::validateBufferDescriptorInfo(IMapper::BufferDescriptorInfo* des 
    return NO_ERROR;

}



status_t Mapper::createDescriptor(void* bufferDescriptorInfo, void* outBufferDescriptor) const {

status_t Gralloc2Mapper::createDescriptor(void* bufferDescriptorInfo,

                                          void* outBufferDescriptor) const {

    IMapper::BufferDescriptorInfo* descriptorInfo =

            static_cast<IMapper::BufferDescriptorInfo*>(bufferDescriptorInfo);

    BufferDescriptor* outDescriptor = static_cast<BufferDescriptor*>(outBufferDescriptor);
@@ -146,7 +145,7 @@ status_t Mapper::createDescriptor(void* bufferDescriptorInfo, void* outBufferDes 
    return static_cast<status_t>((ret.isOk()) ? error : kTransactionError);

}



status_t Mapper::importBuffer(const hardware::hidl_handle& rawHandle,

status_t Gralloc2Mapper::importBuffer(const hardware::hidl_handle& rawHandle,

                                      buffer_handle_t* outBufferHandle) const {

    Error error;

    auto ret = mMapper->importBuffer(rawHandle,
@@ -163,8 +162,7 @@ status_t Mapper::importBuffer(const hardware::hidl_handle& rawHandle, 
    return static_cast<status_t>((ret.isOk()) ? error : kTransactionError);

}



void Mapper::freeBuffer(buffer_handle_t bufferHandle) const

{

void Gralloc2Mapper::freeBuffer(buffer_handle_t bufferHandle) const {

    auto buffer = const_cast<native_handle_t*>(bufferHandle);

    auto ret = mMapper->freeBuffer(buffer);
@@ -173,9 +171,10 @@ void Mapper::freeBuffer(buffer_handle_t bufferHandle) const 
            buffer, error);

}



status_t Mapper::validateBufferSize(buffer_handle_t bufferHandle, uint32_t width, uint32_t height,

                                    android::PixelFormat format, uint32_t layerCount,

                                    uint64_t usage, uint32_t stride) const {

status_t Gralloc2Mapper::validateBufferSize(buffer_handle_t bufferHandle, uint32_t width,

                                            uint32_t height, android::PixelFormat format,

                                            uint32_t layerCount, uint64_t usage,

                                            uint32_t stride) const {

    if (mMapperV2_1 == nullptr) {

        return NO_ERROR;

    }
@@ -193,9 +192,8 @@ status_t Mapper::validateBufferSize(buffer_handle_t bufferHandle, uint32_t width 
    return static_cast<status_t>((ret.isOk()) ? static_cast<Error>(ret) : kTransactionError);

}



void Mapper::getTransportSize(buffer_handle_t bufferHandle,

        uint32_t* outNumFds, uint32_t* outNumInts) const

{

void Gralloc2Mapper::getTransportSize(buffer_handle_t bufferHandle, uint32_t* outNumFds,

                                      uint32_t* outNumInts) const {

    *outNumFds = uint32_t(bufferHandle->numFds);

    *outNumInts = uint32_t(bufferHandle->numInts);
@@ -221,7 +219,7 @@ void Mapper::getTransportSize(buffer_handle_t bufferHandle, 
    ALOGE_IF(error != Error::NONE, "getTransportSize(%p) failed with %d", buffer, error);

}



status_t Mapper::lock(buffer_handle_t bufferHandle, uint64_t usage, const Rect& bounds,

status_t Gralloc2Mapper::lock(buffer_handle_t bufferHandle, uint64_t usage, const Rect& bounds,

                              int acquireFence, void** outData) const {

    auto buffer = const_cast<native_handle_t*>(bufferHandle);
@@ -260,7 +258,7 @@ status_t Mapper::lock(buffer_handle_t bufferHandle, uint64_t usage, const Rect& 
    return static_cast<status_t>(error);

}



status_t Mapper::lock(buffer_handle_t bufferHandle, uint64_t usage, const Rect& bounds,

status_t Gralloc2Mapper::lock(buffer_handle_t bufferHandle, uint64_t usage, const Rect& bounds,

                              int acquireFence, android_ycbcr* ycbcr) const {

    auto buffer = const_cast<native_handle_t*>(bufferHandle);
@@ -306,8 +304,7 @@ status_t Mapper::lock(buffer_handle_t bufferHandle, uint64_t usage, const Rect& 
    return static_cast<status_t>((ret.isOk()) ? error : kTransactionError);

}



int Mapper::unlock(buffer_handle_t bufferHandle) const

{

int Gralloc2Mapper::unlock(buffer_handle_t bufferHandle) const {

    auto buffer = const_cast<native_handle_t*>(bufferHandle);



    int releaseFence = -1;
@@ -340,17 +337,14 @@ int Mapper::unlock(buffer_handle_t bufferHandle) const 
    return releaseFence;

}



Allocator::Allocator(const Mapper& mapper)

    : mMapper(mapper)

{

Gralloc2Allocator::Gralloc2Allocator(const Gralloc2Mapper& mapper) : mMapper(mapper) {

    mAllocator = IAllocator::getService();

    if (mAllocator == nullptr) {

        LOG_ALWAYS_FATAL("gralloc-alloc is missing");

    }

}



std::string Allocator::dumpDebugInfo() const

{

std::string Gralloc2Allocator::dumpDebugInfo() const {

    std::string debugInfo;



    mAllocator->dumpDebugInfo([&](const auto& tmpDebugInfo) {
@@ -360,7 +354,7 @@ std::string Allocator::dumpDebugInfo() const 
    return debugInfo;

}



status_t Allocator::allocate(uint32_t width, uint32_t height, PixelFormat format,

status_t Gralloc2Allocator::allocate(uint32_t width, uint32_t height, PixelFormat format,

                                     uint32_t layerCount, uint64_t usage, uint32_t bufferCount,

                                     uint32_t* outStride, buffer_handle_t* outBufferHandles) const {

    IMapper::BufferDescriptorInfo descriptorInfo = {};
@@ -407,6 +401,4 @@ status_t Allocator::allocate(uint32_t width, uint32_t height, PixelFormat format 
    return (ret.isOk()) ? error : static_cast<status_t>(kTransactionError);

}



} // namespace Gralloc2



} // namespace android

libs/ui/GraphicBufferAllocator.cpp

+4 −5
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <utils/Singleton.h>

#include <utils/Trace.h>



#include <ui/Gralloc.h>

#include <ui/Gralloc2.h>

#include <ui/GraphicBufferMapper.h>
@@ -45,10 +46,8 @@ KeyedVector<buffer_handle_t, 


GraphicBufferAllocator::GraphicBufferAllocator()

      : mMapper(GraphicBufferMapper::getInstance()),

    mAllocator(std::make_unique<Gralloc2::Allocator>(

                mMapper.getGrallocMapper()))

{

}

        mAllocator(std::make_unique<Gralloc2Allocator>(

                reinterpret_cast<const Gralloc2Mapper&>(mMapper.getGrallocMapper()))) {}



GraphicBufferAllocator::~GraphicBufferAllocator() {}

libs/ui/GraphicBufferMapper.cpp

+3 −5
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <utils/Log.h>

#include <utils/Trace.h>



#include <ui/Gralloc.h>

#include <ui/Gralloc2.h>

#include <ui/GraphicBuffer.h>
@@ -43,13 +44,10 @@ namespace android { 
ANDROID_SINGLETON_STATIC_INSTANCE( GraphicBufferMapper )



void GraphicBufferMapper::preloadHal() {

    Gralloc2::Mapper::preload();

    Gralloc2Mapper::preload();

}



GraphicBufferMapper::GraphicBufferMapper()

  : mMapper(std::make_unique<const Gralloc2::Mapper>())

{

}

GraphicBufferMapper::GraphicBufferMapper() : mMapper(std::make_unique<const Gralloc2Mapper>()) {}



status_t GraphicBufferMapper::importBuffer(buffer_handle_t rawHandle,

        uint32_t width, uint32_t height, uint32_t layerCount,