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

Commit c22c97d0 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty Committed by Kyle Harrison
Browse files

libui: Allow extension of valid gralloc 1.0 buffer usage bits 

* Change I7f4174581e24e361577640b9263514a168ed482d implemented
  validation of the buffer description info prior to creating
  the descriptor. Some of our legacy devices need to whitelist
  additional usage bits to support various functionality.

libui: Extend adb95ae5 to Gralloc3
libui: Extend adb95ae5 to Gralloc4

This commit squashes:
  libui: Convert lineage product variables to soong config variables
  Change-Id: Ib687c966d4eafcc1128611b95ebed00fd0a8bfaf

Change-Id: Ie369e78f78e9ac0b18ab3dfea520d4f123005d92
parent 64db2be3

libs/ui/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ cc_library_shared { 


    defaults: [

        "libui-defaults",

        "gralloc_10_usage_bits_defaults",

        // Uncomment the following line to enable VALIDATE_REGIONS traces

        //defaults: ["libui-validate-regions-defaults"],

    ],

libs/ui/Gralloc2.cpp

+7 −0
Original line number Diff line number Diff line
@@ -48,6 +48,13 @@ uint64_t getValid10UsageBits() { 
        for (const auto bit : hardware::hidl_enum_range<BufferUsage>()) {

            bits = bits | bit;

        }



#ifdef ADDNL_GRALLOC_10_USAGE_BITS

        uint64_t addnl_bits = static_cast<uint64_t>(ADDNL_GRALLOC_10_USAGE_BITS);

        ALOGI("Adding additional valid usage bits: 0x%" PRIx64, addnl_bits);

        bits = bits | addnl_bits;

#endif



        return bits;

    }();

    return valid10UsageBits;

libs/ui/Gralloc3.cpp

+7 −0
Original line number Diff line number Diff line
@@ -47,6 +47,13 @@ uint64_t getValidUsageBits() { 
             hardware::hidl_enum_range<hardware::graphics::common::V1_2::BufferUsage>()) {

            bits = bits | bit;

        }



#ifdef ADDNL_GRALLOC_10_USAGE_BITS

        uint64_t addnl_bits = static_cast<uint64_t>(ADDNL_GRALLOC_10_USAGE_BITS);

        ALOGI("Adding additional valid usage bits: 0x%" PRIx64, addnl_bits);

        bits = bits | addnl_bits;

#endif



        return bits;

    }();

    return validUsageBits;

libs/ui/Gralloc4.cpp

+7 −0
Original line number Diff line number Diff line
@@ -56,6 +56,13 @@ uint64_t getValidUsageBits() { 
             hardware::hidl_enum_range<hardware::graphics::common::V1_2::BufferUsage>()) {

            bits = bits | bit;

        }



#ifdef ADDNL_GRALLOC_10_USAGE_BITS

        uint64_t addnl_bits = static_cast<uint64_t>(ADDNL_GRALLOC_10_USAGE_BITS);

        ALOGI("Adding additional valid usage bits: 0x%" PRIx64, addnl_bits);

        bits = bits | addnl_bits;

#endif



        return bits;

    }();

    return validUsageBits;