Merge "libgrallocusage: use gralloc1.h usage flags" into oc-dev

#include <grallocusage/GrallocUsageConversion.h>

#include <grallocusage/GrallocUsageConversion.h>

#include <android/hardware/graphics/allocator/2.0/types.h>

#include <hardware/gralloc.h>

#include <hardware/gralloc.h>

#include <hardware/gralloc1.h>

using android::hardware::graphics::allocator::V2_0::ProducerUsage;

using android::hardware::graphics::allocator::V2_0::ConsumerUsage;

void android_convertGralloc0To1Usage(int32_t usage, uint64_t* producerUsage,

void android_convertGralloc0To1Usage(int32_t usage, uint64_t* producerUsage,

                                     uint64_t* consumerUsage) {

                                     uint64_t* consumerUsage) {

    constexpr uint64_t PRODUCER_MASK = ProducerUsage::CPU_READ |

    constexpr uint64_t PRODUCER_MASK =

                                       /* ProducerUsage::CPU_READ_OFTEN | */

        GRALLOC1_PRODUCER_USAGE_CPU_READ |

                                       ProducerUsage::CPU_WRITE |

        /* GRALLOC1_PRODUCER_USAGE_CPU_READ_OFTEN | */

                                       /* ProducerUsage::CPU_WRITE_OFTEN | */

        GRALLOC1_PRODUCER_USAGE_CPU_WRITE |

                                       ProducerUsage::GPU_RENDER_TARGET | ProducerUsage::PROTECTED |

        /* GRALLOC1_PRODUCER_USAGE_CPU_WRITE_OFTEN | */

                                       ProducerUsage::CAMERA | ProducerUsage::VIDEO_DECODER |

        GRALLOC1_PRODUCER_USAGE_GPU_RENDER_TARGET | GRALLOC1_PRODUCER_USAGE_PROTECTED |

                                       ProducerUsage::SENSOR_DIRECT_DATA;

        GRALLOC1_PRODUCER_USAGE_CAMERA | GRALLOC1_PRODUCER_USAGE_VIDEO_DECODER |

    constexpr uint64_t CONSUMER_MASK = ConsumerUsage::CPU_READ |

        GRALLOC1_PRODUCER_USAGE_SENSOR_DIRECT_DATA;

                                       /* ConsumerUsage::CPU_READ_OFTEN | */

    constexpr uint64_t CONSUMER_MASK =

                                       ConsumerUsage::GPU_TEXTURE | ConsumerUsage::HWCOMPOSER |

        GRALLOC1_CONSUMER_USAGE_CPU_READ |

                                       ConsumerUsage::CLIENT_TARGET | ConsumerUsage::CURSOR |

        /* GRALLOC1_CONSUMER_USAGE_CPU_READ_OFTEN | */

                                       ConsumerUsage::VIDEO_ENCODER | ConsumerUsage::CAMERA |

        GRALLOC1_CONSUMER_USAGE_GPU_TEXTURE | GRALLOC1_CONSUMER_USAGE_HWCOMPOSER |

                                       ConsumerUsage::RENDERSCRIPT | ConsumerUsage::GPU_DATA_BUFFER;

        GRALLOC1_CONSUMER_USAGE_CLIENT_TARGET | GRALLOC1_CONSUMER_USAGE_CURSOR |

        GRALLOC1_CONSUMER_USAGE_VIDEO_ENCODER | GRALLOC1_CONSUMER_USAGE_CAMERA |

        GRALLOC1_CONSUMER_USAGE_RENDERSCRIPT | GRALLOC1_CONSUMER_USAGE_GPU_DATA_BUFFER;

    *producerUsage = static_cast<uint64_t>(usage) & PRODUCER_MASK;

    *producerUsage = static_cast<uint64_t>(usage) & PRODUCER_MASK;

    *consumerUsage = static_cast<uint64_t>(usage) & CONSUMER_MASK;

    *consumerUsage = static_cast<uint64_t>(usage) & CONSUMER_MASK;

    if ((static_cast<uint32_t>(usage) & GRALLOC_USAGE_SW_READ_OFTEN) == GRALLOC_USAGE_SW_READ_OFTEN) {

    if ((static_cast<uint32_t>(usage) & GRALLOC_USAGE_SW_READ_OFTEN) == GRALLOC_USAGE_SW_READ_OFTEN) {

        *producerUsage |= ProducerUsage::CPU_READ_OFTEN;

        *producerUsage |= GRALLOC1_PRODUCER_USAGE_CPU_READ_OFTEN;

        *consumerUsage |= ConsumerUsage::CPU_READ_OFTEN;

        *consumerUsage |= GRALLOC1_CONSUMER_USAGE_CPU_READ_OFTEN;

    }

    }

    if ((static_cast<uint32_t>(usage) & GRALLOC_USAGE_SW_WRITE_OFTEN) ==

    if ((static_cast<uint32_t>(usage) & GRALLOC_USAGE_SW_WRITE_OFTEN) ==

        GRALLOC_USAGE_SW_WRITE_OFTEN) {

        GRALLOC_USAGE_SW_WRITE_OFTEN) {

        *producerUsage |= ProducerUsage::CPU_WRITE_OFTEN;

        *producerUsage |= GRALLOC1_PRODUCER_USAGE_CPU_WRITE_OFTEN;

    }

    }

}

}

int32_t android_convertGralloc1To0Usage(uint64_t producerUsage, uint64_t consumerUsage) {

int32_t android_convertGralloc1To0Usage(uint64_t producerUsage, uint64_t consumerUsage) {

    static_assert(uint64_t(ConsumerUsage::CPU_READ_OFTEN) == uint64_t(ProducerUsage::CPU_READ_OFTEN),

    static_assert(uint64_t(GRALLOC1_CONSUMER_USAGE_CPU_READ_OFTEN) ==

                      uint64_t(GRALLOC1_PRODUCER_USAGE_CPU_READ_OFTEN),

                  "expected ConsumerUsage and ProducerUsage CPU_READ_OFTEN bits to match");

                  "expected ConsumerUsage and ProducerUsage CPU_READ_OFTEN bits to match");

    uint64_t merged = producerUsage | consumerUsage;

    uint64_t merged = producerUsage | consumerUsage;

    if ((merged & (ConsumerUsage::CPU_READ_OFTEN)) != 0) {

    if ((merged & (GRALLOC1_CONSUMER_USAGE_CPU_READ_OFTEN)) ==

        merged &= ~uint64_t(ConsumerUsage::CPU_READ_OFTEN);

        GRALLOC1_CONSUMER_USAGE_CPU_READ_OFTEN) {

        merged &= ~uint64_t(GRALLOC1_CONSUMER_USAGE_CPU_READ_OFTEN);

        merged |= GRALLOC_USAGE_SW_READ_OFTEN;

        merged |= GRALLOC_USAGE_SW_READ_OFTEN;

    }

    }

    if ((merged & (ProducerUsage::CPU_WRITE_OFTEN)) != 0) {

    if ((merged & (GRALLOC1_PRODUCER_USAGE_CPU_WRITE_OFTEN)) ==

        merged &= ~uint64_t(ProducerUsage::CPU_WRITE_OFTEN);

        GRALLOC1_PRODUCER_USAGE_CPU_WRITE_OFTEN) {

        merged &= ~uint64_t(GRALLOC1_PRODUCER_USAGE_CPU_WRITE_OFTEN);

        merged |= GRALLOC_USAGE_SW_WRITE_OFTEN;

        merged |= GRALLOC_USAGE_SW_WRITE_OFTEN;

    }

    }

    return static_cast<int32_t>(merged);

    return static_cast<int32_t>(merged);