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

Commit cbe51356 authored by Jesse Hall's avatar Jesse Hall Committed by Gerrit Code Review
Browse files

Merge "Remove support for legacy HWC version encoding"

parents fdd8551f 72960519

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+1 −11
Original line number Diff line number Diff line
@@ -48,25 +48,15 @@ 


namespace android {



#define MIN_HWC_HEADER_VERSION 0

#define MIN_HWC_HEADER_VERSION HWC_HEADER_VERSION



static uint32_t hwcApiVersion(const hwc_composer_device_1_t* hwc) {

    uint32_t hwcVersion = hwc->common.version;

    if (MIN_HWC_HEADER_VERSION == 0 &&

            (hwcVersion & HARDWARE_API_VERSION_2_MAJ_MIN_MASK) == 0) {

        // legacy version encoding

        hwcVersion <<= 16;

    }

    return hwcVersion & HARDWARE_API_VERSION_2_MAJ_MIN_MASK;

}



static uint32_t hwcHeaderVersion(const hwc_composer_device_1_t* hwc) {

    uint32_t hwcVersion = hwc->common.version;

    if (MIN_HWC_HEADER_VERSION == 0 &&

            (hwcVersion & HARDWARE_API_VERSION_2_MAJ_MIN_MASK) == 0) {

        // legacy version encoding

        hwcVersion <<= 16;

    }

    return hwcVersion & HARDWARE_API_VERSION_2_HEADER_MASK;

}