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

Commit 1be67b36 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "IA/IM-3.0" 

* changes:
  graphics: change composer 2.1 to support allocator/mapper 3.0
  graphics: rev IAllocator and IMapper
parents 6a20bda6 e20b1127

compatibility_matrices/compatibility_matrix.current.xml

+3 −1
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ 
    <hal format="hidl" optional="false">

        <name>android.hardware.graphics.allocator</name>

        <version>2.0</version>

        <version>3.0</version>

        <interface>

            <name>IAllocator</name>

            <instance>default</instance>
@@ -218,7 +219,8 @@ 
    </hal>

    <hal format="hidl" optional="false">

        <name>android.hardware.graphics.mapper</name>

        <version>2.0</version>

        <version>2.0-1</version>

        <version>3.0</version>

        <interface>

            <name>IMapper</name>

            <instance>default</instance>

graphics/allocator/3.0/Android.bp

0 → 100644
+21 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen -Landroidbp.



hidl_interface {

    name: "android.hardware.graphics.allocator@3.0",

    root: "android.hardware",

    vndk: {

        enabled: true,

    },

    srcs: [

        "IAllocator.hal",

    ],

    interfaces: [

        "android.hardware.graphics.common@1.0",

        "android.hardware.graphics.common@1.1",

        "android.hardware.graphics.common@1.2",

        "android.hardware.graphics.mapper@3.0",

        "android.hidl.base@1.0",

    ],

    gen_java: false,

}

graphics/allocator/3.0/IAllocator.hal

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

 * Copyright 2019 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.

 */



package android.hardware.graphics.allocator@3.0;



import android.hardware.graphics.mapper@3.0;



interface IAllocator {

    /**

     * Retrieves implementation-defined debug information, which will be

     * displayed during, for example, `dumpsys SurfaceFlinger`.

     *

     * @return debugInfo is a string of debug information.

     */

    dumpDebugInfo() generates (string debugInfo);



    /**

     * Allocates buffers with the properties specified by the descriptor.

     *

     * @param descriptor Properties of the buffers to allocate. This must be

     *     obtained from IMapper::createDescriptor().

     * @param count The number of buffers to allocate.

     * @return error Error status of the call, which may be

     *     - `NONE` upon success.

     *     - `BAD_DESCRIPTOR` if the descriptor is invalid.

     *     - `NO_RESOURCES` if the allocation cannot be fulfilled at this time.

     *     - `UNSUPPORTED` if any of the properties encoded in the descriptor

     *       are not supported.

     * @return stride The number of pixels between two consecutive rows of

     *     an allocated buffer, when the concept of consecutive rows is defined.

     *     Otherwise, it has no meaning.

     * @return buffers Array of raw handles to the allocated buffers.

     */

    allocate(BufferDescriptor descriptor, uint32_t count)

        generates (Error error,

                   uint32_t stride,

                   vec<handle> buffers);

};

graphics/composer/2.1/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ cc_library_shared { 
    shared_libs: [

        "android.hardware.graphics.composer@2.1",

        "android.hardware.graphics.mapper@2.0",

        "android.hardware.graphics.mapper@3.0",

        "libbase",

        "libcutils",

        "libfmq",

graphics/composer/2.1/utils/hal/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ cc_library_headers { 
    shared_libs: [

        "android.hardware.graphics.composer@2.1",

        "android.hardware.graphics.mapper@2.0",

        "android.hardware.graphics.mapper@3.0",

        "libhardware", // TODO remove hwcomposer2.h dependency

    ],

    export_shared_lib_headers: [

        "android.hardware.graphics.composer@2.1",

        "android.hardware.graphics.mapper@2.0",

        "android.hardware.graphics.mapper@3.0",

        "libhardware",

    ],

    header_libs: [