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

Commit 69ee26a3 authored by Valerie Hau's avatar Valerie Hau
Browse files

Call into validateBufferSize and getTransportSize 

After adding validateBufferSize and getTransportSize,
call into these functions if they have been implemented

Bug: 130669566
Test: build, boot
Change-Id: I445cb6122107a514bc0bf433a9e140dbe3122573
parent 3f99e1db

graphics/mapper/2.1/utils/passthrough/include/mapper-passthrough/2.1/Gralloc0Hal.h

+31 −17
Original line number Original line Diff line number Diff line
@@ -34,27 +34,40 @@ using V2_0::Error; 
template <typename Hal>

template <typename Hal>

class Gralloc0HalImpl : public V2_0::passthrough::detail::Gralloc0HalImpl<Hal> {

class Gralloc0HalImpl : public V2_0::passthrough::detail::Gralloc0HalImpl<Hal> {

   public:

   public:

    Error validateBufferSize(const native_handle_t* /*bufferHandle*/,

     Error validateBufferSize(const native_handle_t* bufferHandle,

                             const IMapper::BufferDescriptorInfo& /*descriptorInfo*/,

                              const IMapper::BufferDescriptorInfo& descriptorInfo,

                             uint32_t /*stride*/) override {

                              uint32_t stride) override {

        // need a gralloc0 extension to really validate

         if (!mModule->validateBufferSize) {

             return Error::NONE;

             return Error::NONE;

         }

         }





         int32_t ret = mModule->validateBufferSize(

                 mModule, bufferHandle, descriptorInfo.width, descriptorInfo.height,

                 static_cast<int32_t>(descriptorInfo.format),

                 static_cast<uint64_t>(descriptorInfo.usage), stride);

         return static_cast<Error>(ret);

     }

     Error getTransportSize(const native_handle_t* bufferHandle, uint32_t* outNumFds,

     Error getTransportSize(const native_handle_t* bufferHandle, uint32_t* outNumFds,

                            uint32_t* outNumInts) override {

                            uint32_t* outNumInts) override {

        // need a gralloc0 extension to get the transport size

         if (!mModule->getTransportSize) {

             *outNumFds = bufferHandle->numFds;

             *outNumFds = bufferHandle->numFds;

             *outNumInts = bufferHandle->numInts;

             *outNumInts = bufferHandle->numInts;

             return Error::NONE;

             return Error::NONE;

         }

         }





         int32_t ret = mModule->getTransportSize(mModule, bufferHandle, outNumFds, outNumInts);

         return static_cast<Error>(ret);

    }



    Error createDescriptor_2_1(const IMapper::BufferDescriptorInfo& descriptorInfo,

    Error createDescriptor_2_1(const IMapper::BufferDescriptorInfo& descriptorInfo,

                               BufferDescriptor* outDescriptor) override {

                               BufferDescriptor* outDescriptor) override {

        return createDescriptor(

        return createDescriptor(

                V2_0::IMapper::BufferDescriptorInfo{

                V2_0::IMapper::BufferDescriptorInfo{

                descriptorInfo.width, descriptorInfo.height, descriptorInfo.layerCount,

                        descriptorInfo.width,

                static_cast<common::V1_0::PixelFormat>(descriptorInfo.format), descriptorInfo.usage,

                        descriptorInfo.height,

                        descriptorInfo.layerCount,

                        static_cast<common::V1_0::PixelFormat>(descriptorInfo.format),

                        descriptorInfo.usage,

                },

                },

                outDescriptor);

                outDescriptor);

    }

    }
@@ -62,6 +75,7 @@ class Gralloc0HalImpl : public V2_0::passthrough::detail::Gralloc0HalImpl<Hal> { 
   private:

   private:

    using BaseType2_0 = V2_0::passthrough::detail::Gralloc0HalImpl<Hal>;

    using BaseType2_0 = V2_0::passthrough::detail::Gralloc0HalImpl<Hal>;

    using BaseType2_0::createDescriptor;

    using BaseType2_0::createDescriptor;

    using BaseType2_0::mModule;

};

};





}  // namespace detail

}  // namespace detail