diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2017-04-04 12:59:27 -0700 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2017-04-04 13:17:54 -0700 |
| commit | 164ec4ad268bf015060ab57dfa2e1750956de1ca (patch) | |
| tree | cefd04defe6d6b711d94edb6edfecc26274e3876 /libgrallocusage | |
| parent | e4b2d28b919c61ee3fdd340a22d73d99d964af2d (diff) | |
| download | system_core-164ec4ad268bf015060ab57dfa2e1750956de1ca.tar.gz system_core-164ec4ad268bf015060ab57dfa2e1750956de1ca.tar.bz2 system_core-164ec4ad268bf015060ab57dfa2e1750956de1ca.zip | |
Revert "Include vendor gralloc0 flags in gralloc1 conversion."
This reverts commit 944e5e0c5276e9149180c316a7d30ad7ef44a284.
Test: fix b/36876770
Bug: b/36876770
Change-Id: Ibbf1a5e04ff1f61061cf0bb679306324d1f543d3
Diffstat (limited to 'libgrallocusage')
| -rw-r--r-- | libgrallocusage/GrallocUsageConversion.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libgrallocusage/GrallocUsageConversion.cpp b/libgrallocusage/GrallocUsageConversion.cpp index 10e728d52..8164beb80 100644 --- a/libgrallocusage/GrallocUsageConversion.cpp +++ b/libgrallocusage/GrallocUsageConversion.cpp @@ -30,17 +30,13 @@ void android_convertGralloc0To1Usage(int32_t usage, uint64_t* producerUsage, /* ProducerUsage::CPU_WRITE_OFTEN | */ ProducerUsage::GPU_RENDER_TARGET | ProducerUsage::PROTECTED | ProducerUsage::CAMERA | ProducerUsage::VIDEO_DECODER | - ProducerUsage::SENSOR_DIRECT_DATA | - /* Private flags may be consumer or producer */ - GRALLOC_USAGE_PRIVATE_MASK; + ProducerUsage::SENSOR_DIRECT_DATA; constexpr uint64_t CONSUMER_MASK = ConsumerUsage::CPU_READ | /* ConsumerUsage::CPU_READ_OFTEN | */ ConsumerUsage::GPU_TEXTURE | ConsumerUsage::HWCOMPOSER | ConsumerUsage::CLIENT_TARGET | ConsumerUsage::CURSOR | ConsumerUsage::VIDEO_ENCODER | ConsumerUsage::CAMERA | - ConsumerUsage::RENDERSCRIPT | ConsumerUsage::GPU_DATA_BUFFER | - /* Private flags may be consumer or producer */ - GRALLOC_USAGE_PRIVATE_MASK; + ConsumerUsage::RENDERSCRIPT | ConsumerUsage::GPU_DATA_BUFFER; *producerUsage = static_cast<uint64_t>(usage) & PRODUCER_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) { |